Source: e2fsprogs Version: 1.47.0-2 Tags: ftbfs patch User: helm...@debian.org Usertags: dep17m2
We want to change the value of systemdsystemunitdir in systemd.pc to point below /usr. e2fsprogs' upstream build system consumes this variable while the packaging hard codes its current value. When we change it, e2fsprogs will FTBFS. Consider applying the attached patch to avoid this failure. Helmut
diff -Nru e2fsprogs-1.47.0/debian/changelog e2fsprogs-1.47.0/debian/changelog --- e2fsprogs-1.47.0/debian/changelog 2023-03-05 04:16:08.000000000 +0100 +++ e2fsprogs-1.47.0/debian/changelog 2023-09-26 20:57:57.000000000 +0200 @@ -1,3 +1,10 @@ +e2fsprogs (1.47.0-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Tue, 26 Sep 2023 20:57:57 +0200 + e2fsprogs (1.47.0-2) unstable; urgency=medium * Don't enable metadata_csum_seed and orhpan_file by default (Closes: diff -Nru e2fsprogs-1.47.0/debian/control e2fsprogs-1.47.0/debian/control --- e2fsprogs-1.47.0/debian/control 2023-03-05 04:16:08.000000000 +0100 +++ e2fsprogs-1.47.0/debian/control 2023-09-26 20:57:54.000000000 +0200 @@ -2,7 +2,7 @@ Section: admin Priority: required Maintainer: Theodore Y. Ts'o <ty...@mit.edu> -Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] <!pkg.e2fsprogs.no-fuse2fs>, debhelper-compat (= 12), dh-exec, libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], cron [linux-any] +Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] <!pkg.e2fsprogs.no-fuse2fs>, debhelper-compat (= 12), dh-exec, libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], systemd-dev [linux-any], cron [linux-any] Rules-Requires-Root: no Standards-Version: 4.6.2 Homepage: http://e2fsprogs.sourceforge.net diff -Nru e2fsprogs-1.47.0/debian/e2fsprogs.install e2fsprogs-1.47.0/debian/e2fsprogs.install --- e2fsprogs-1.47.0/debian/e2fsprogs.install 2023-03-05 04:16:08.000000000 +0100 +++ e2fsprogs-1.47.0/debian/e2fsprogs.install 2023-09-26 20:57:57.000000000 +0200 @@ -50,4 +50,4 @@ usr/share/man/man8/tune2fs.8 etc [linux-any] lib/udev/rules.d -[linux-any] lib/systemd/system +[linux-any] ${deb_systemdsystemunitdir} diff -Nru e2fsprogs-1.47.0/debian/rules e2fsprogs-1.47.0/debian/rules --- e2fsprogs-1.47.0/debian/rules 2023-03-05 04:16:08.000000000 +0100 +++ e2fsprogs-1.47.0/debian/rules 2023-09-26 20:57:57.000000000 +0200 @@ -14,6 +14,10 @@ SKIP_FUSE2FS=yes endif +ifeq ($(DEB_HOST_ARCH_OS), linux) +export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,) +endif + ifneq ($(filter pkg.e2fsprogs.no-fuse2fs,$(DEB_BUILD_PROFILES)),) SKIP_FUSE2FS=yes endif
