[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1052993: marked as done (fwupd FTBFS when systemd.pc changes systemdsystemunitdir)

Your message dated Mon, 20 Nov 2023 21:04:47 +0000
with message-id <E1r5BRn-00BQsC-Px@fasolo.debian.org>
and subject line Bug#1052993: fixed in fwupd 1.9.9-1
has caused the Debian Bug report #1052993,
regarding fwupd FTBFS when systemd.pc changes systemdsystemunitdir
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1052993: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1052993
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: fwupd
Version: 1.9.5-1
Tags: ftbfs patch
User: helmutg@debian.org
Usertags: dep17m2

We want to change the value of systemdsystemunitdir in systemd.pc to
point below /usr. fwupd's upstream build system consumes this variable
while the packaging hard codes its current value. As we change the
value, fwupd will FTBFS. Consider applying the attached patch to avoid
this failure.

Helmut

diff -Nru fwupd-1.9.5/debian/changelog fwupd-1.9.5/debian/changelog
--- fwupd-1.9.5/debian/changelog	2023-09-06 03:36:39.000000000 +0200
+++ fwupd-1.9.5/debian/changelog	2023-09-26 19:13:49.000000000 +0200
@@ -1,3 +1,10 @@
+fwupd (1.9.5-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Tue, 26 Sep 2023 19:13:49 +0200
+
 fwupd (1.9.5-1) unstable; urgency=medium
 
   * New upstream version (1.9.5)
diff -Nru fwupd-1.9.5/debian/control fwupd-1.9.5/debian/control
--- fwupd-1.9.5/debian/control	2023-09-06 03:36:39.000000000 +0200
+++ fwupd-1.9.5/debian/control	2023-09-26 19:13:49.000000000 +0200
@@ -66,6 +66,7 @@
 	python3-typogrify,
 	shared-mime-info,
 	systemd (>= 231),
+        systemd-dev,
 	udev,
 	umockdev,
 	valac,
diff -Nru fwupd-1.9.5/debian/fwupd.install fwupd-1.9.5/debian/fwupd.install
--- fwupd-1.9.5/debian/fwupd.install	2023-09-05 02:58:31.000000000 +0200
+++ fwupd-1.9.5/debian/fwupd.install	2023-09-26 19:13:49.000000000 +0200
@@ -12,9 +12,7 @@
 usr/share/metainfo/*
 usr/libexec/fwupd/*
 usr/share/man/*
-lib/systemd/system/*
 lib/systemd/system-shutdown/*
-lib/udev/rules.d/*
 data/fwupd.conf etc/fwupd
 debian/fwupd.pkla /var/lib/polkit-1/localauthority/10-vendor.d
 usr/lib/*/fwupd-*/*.so
diff -Nru fwupd-1.9.5/debian/rules fwupd-1.9.5/debian/rules
--- fwupd-1.9.5/debian/rules	2023-09-06 03:36:11.000000000 +0200
+++ fwupd-1.9.5/debian/rules	2023-09-26 19:13:49.000000000 +0200
@@ -58,6 +58,8 @@
 	find debian/tmp/usr -type f -name "*a" -print | xargs rm -f
 	sed -i 's,wheel,sudo,' debian/tmp/usr/share/polkit-1/rules.d/org.freedesktop.fwupd.rules
 	dh_install
+	dh_install -pfwupd $$(pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
+	dh_install -pfwupd $$(pkg-config --variable=udevdir udev | sed s,^/,,)/rules.d
 	#install MSR conf if needed (depending on distro)
 	[ ! -d debian/tmp/usr/lib/modules-load.d ] || dh_install -pfwupd usr/lib/modules-load.d
 	[ ! -d debian/tmp/lib/modules-load.d ] || dh_install -pfwupd lib/modules-load.d
@@ -78,6 +80,7 @@
 
 	# avoid shipping an empty directory
 	[ ! -d debian/fwupd/lib/systemd ] || find debian/fwupd/lib/systemd -type d -empty -delete
+	[ ! -d debian/fwupd/usr/lib/systemd ] || find debian/fwupd/usr/lib/systemd -type d -empty -delete
 
 override_dh_strip_nondeterminism:
 	dh_strip_nondeterminism -Xfirmware-example.xml.gz

--- End Message ---
--- Begin Message --- 
Source: fwupd
Source-Version: 1.9.9-1
Done: Mario Limonciello <superm1@gmail.com>

We believe that the bug you reported is fixed in the latest version of
fwupd, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1052993@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Mario Limonciello <superm1@gmail.com> (supplier of updated fwupd package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Mon, 20 Nov 2023 14:53:56 -0600
Source: fwupd
Built-For-Profiles: noudeb
Architecture: source
Version: 1.9.9-1
Distribution: unstable
Urgency: medium
Maintainer: Debian EFI <debian-efi@lists.debian.org>
Changed-By: Mario Limonciello <superm1@gmail.com>
Closes: 1052993
Changes:
 fwupd (1.9.9-1) unstable; urgency=medium
 .
   * New upstream version (1.9.9)
   * Handle /usr merge (Closes: #1052993)
Checksums-Sha1:
 96210c7c853ccce2b647274ea1fdb499cecb56b1 3559 fwupd_1.9.9-1.dsc
 9cf487d555a7e451daff1a13ba44751606a3123d 5208008 fwupd_1.9.9.orig.tar.gz
 ee804fba3cbfb2859d522203b254dafca147b326 26252 fwupd_1.9.9-1.debian.tar.xz
 130da40547be2d012db973cdab73dcc80c6cc135 20378 fwupd_1.9.9-1_source.buildinfo
Checksums-Sha256:
 1853e489013b4fe112a988d4eb79b9001a6fd759c690af745fa3d60b923c7178 3559 fwupd_1.9.9-1.dsc
 66e5534031fd2dffe9ccf20f44ad6b2d624bb65e9aa128fd7164177946ca7a48 5208008 fwupd_1.9.9.orig.tar.gz
 287fd49bdb7aeea807b47e7ce4043ee3bd4b42b944f0b3222f96c60dc6502816 26252 fwupd_1.9.9-1.debian.tar.xz
 a3e442a91cf7be2d0100a6be7e5c16ce6106e45236ce64f19cdc1c12a3c5b46a 20378 fwupd_1.9.9-1_source.buildinfo
Files:
 20c859cb9a6bb69a21908d7cef1c3177 3559 admin optional fwupd_1.9.9-1.dsc
 ead512b63aa71b3a00f919fef7a6a73a 5208008 admin optional fwupd_1.9.9.orig.tar.gz
 e098ae30563fd52c74c788dd24557dee 26252 admin optional fwupd_1.9.9-1.debian.tar.xz
 847f1e6881924b25fdff636f7abb659a 20378 admin optional fwupd_1.9.9-1_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQJGBAEBCgAwFiEECwtuSU6dXvs5GA2aLRkspiR3AnYFAmVbx68SHHN1cGVybTFA
Z21haWwuY29tAAoJEC0ZLKYkdwJ2ASYP/i51t6FJyUaASD/NuCnjojZJ3R6qVlQZ
erFBJ0/sujOwAx2uXiri/EsJoxe17hq31Jz/rI5lU8h6GdG3Jg4NWQhVmOr2S+VL
CfK9N9OT4nAimERH8KwME587tDjbq6FUyx0A1+1yzA0fdltO353/I1aF1xW0R6v0
7P0n9MTTxsddF8CSyqLThbjvnToFKhO83t5EIRYLxQmIVMKoRi1sOzgnnYRPh123
0MKXl9Olyf4kEPGwoX45XTU86Wr4gF+y2/kpsqsekMMe4z8TlIJImyZkI9MxFyaE
w4U3DAZoBbxsQKOd88FD3BDK3lhEOp3q7V/GzHPh8aq/y7PDgjqap/M36LKfsPQg
HZmVyV7LU1aupd3c4IrHke9Dor26MnQcKaa0EjnEyDB2IRB9RjG8XhzEVKtl+SAO
pR8pCxmmzIOr9VFeGW2sw62szo4jDBFTwC/bZAel+eq1NabSpANfNw84+7SaPOg0
D78wIzfA2P8O5d3MyM9iaUBgV0ZpPgwGx/66qtLGgxnak6T/YOMu0MnQrYw3xEix
04syymX0XQXB3hXxnnij91ZncyH+yQol1QKeR5Ciz/VSm0nFrZ8KpkLt6+pGMX2p
HzLlNgS88yk5T4u24JPIzRci1wzOC9++vB25L0SIbCIiajvj0yV4BFxCIm+xPJ05
I/kB1Dg1b5ul
=aUZc
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: