On Thu, Jan 04, 2024 at 03:24:01PM +0100, Helmut Grohne wrote:
> [..] If you
> rather prefer a patch that is not backportable, please let me know.
Attached is a patch of that form, that I was working on yesterday.
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 2024-01-04 22:42:48.000000000 +0100
@@ -1,3 +1,10 @@
+e2fsprogs (1.47.0-2.2) UNRELEASED; urgency=medium
+
+ * Install files into /usr instead of aliased locations.
+ Not backportable to bookworm or earlier.
+
+ -- Chris Hofstaedtler <z...@debian.org> Thu, 04 Jan 2024 22:42:48 +0100
+
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/e2fsck-static.install e2fsprogs-1.47.0/debian/e2fsck-static.install
--- e2fsprogs-1.47.0/debian/e2fsck-static.install 2023-03-05 04:16:08.000000000 +0100
+++ e2fsprogs-1.47.0/debian/e2fsck-static.install 2024-01-03 13:26:38.000000000 +0100
@@ -1,2 +1,2 @@
-/sbin/e2fsck.static
+/usr/sbin/e2fsck.static
/usr/share/man/man8/e2fsck.static*
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 2024-01-04 22:42:48.000000000 +0100
@@ -1,19 +1,19 @@
#!/usr/bin/dh-exec
-sbin/badblocks
-sbin/debugfs
-sbin/dumpe2fs
-sbin/e2fsck
-sbin/e2image
-sbin/e2label
-sbin/e2mmpstatus
-[linux-any] sbin/e2scrub
-[linux-any] sbin/e2scrub_all
-sbin/e2undo
-sbin/fsck.ext?
-sbin/mke2fs
-sbin/mkfs.ext?
-sbin/resize2fs
-sbin/tune2fs
+usr/sbin/badblocks
+usr/sbin/debugfs
+usr/sbin/dumpe2fs
+usr/sbin/e2fsck
+usr/sbin/e2image
+usr/sbin/e2label
+usr/sbin/e2mmpstatus
+[linux-any] usr/sbin/e2scrub
+[linux-any] usr/sbin/e2scrub_all
+usr/sbin/e2undo
+usr/sbin/fsck.ext?
+usr/sbin/mke2fs
+usr/sbin/mkfs.ext?
+usr/sbin/resize2fs
+usr/sbin/tune2fs
usr/bin/chattr
usr/bin/lsattr
[linux-any] usr/lib/*/e2fsprogs/e2scrub_all_cron
@@ -49,5 +49,5 @@
usr/share/man/man8/resize2fs.8
usr/share/man/man8/tune2fs.8
etc
-[linux-any] lib/udev/rules.d
-[linux-any] lib/systemd/system
+[linux-any] usr/lib/udev/rules.d
+[linux-any] usr/lib/systemd/system
diff -Nru e2fsprogs-1.47.0/debian/e2fsprogs-udeb.install e2fsprogs-1.47.0/debian/e2fsprogs-udeb.install
--- e2fsprogs-1.47.0/debian/e2fsprogs-udeb.install 2023-03-05 04:16:08.000000000 +0100
+++ e2fsprogs-1.47.0/debian/e2fsprogs-udeb.install 2024-01-03 13:33:29.000000000 +0100
@@ -1,11 +1,11 @@
etc/mke2fs.conf
-lib/*/lib*.so.*
-sbin/badblocks
-sbin/e2fsck
-sbin/mke2fs
-sbin/resize2fs
-sbin/tune2fs
-sbin/e2label
-sbin/e2mmpstatus
-sbin/fsck.ext?
-sbin/mkfs.ext?
+usr/lib/*/lib*.so.*
+usr/sbin/badblocks
+usr/sbin/e2fsck
+usr/sbin/mke2fs
+usr/sbin/resize2fs
+usr/sbin/tune2fs
+usr/sbin/e2label
+usr/sbin/e2mmpstatus
+usr/sbin/fsck.ext?
+usr/sbin/mkfs.ext?
diff -Nru e2fsprogs-1.47.0/debian/.gitignore e2fsprogs-1.47.0/debian/.gitignore
--- e2fsprogs-1.47.0/debian/.gitignore 2023-03-05 04:16:08.000000000 +0100
+++ e2fsprogs-1.47.0/debian/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-!patches
diff -Nru e2fsprogs-1.47.0/debian/libblkid1.install e2fsprogs-1.47.0/debian/libblkid1.install
--- e2fsprogs-1.47.0/debian/libblkid1.install 2023-03-05 04:16:08.000000000 +0100
+++ e2fsprogs-1.47.0/debian/libblkid1.install 2024-01-03 13:26:43.000000000 +0100
@@ -1 +1 @@
-lib/*/libblkid*.so.*
+usr/lib/*/libblkid*.so.*
diff -Nru e2fsprogs-1.47.0/debian/libcom-err2.install e2fsprogs-1.47.0/debian/libcom-err2.install
--- e2fsprogs-1.47.0/debian/libcom-err2.install 2023-03-05 04:16:08.000000000 +0100
+++ e2fsprogs-1.47.0/debian/libcom-err2.install 2024-01-03 13:28:30.000000000 +0100
@@ -1 +1 @@
-lib/*/libcom_err*.so.*
+usr/lib/*/libcom_err*.so.*
diff -Nru e2fsprogs-1.47.0/debian/libext2fs2.install e2fsprogs-1.47.0/debian/libext2fs2.install
--- e2fsprogs-1.47.0/debian/libext2fs2.install 2023-03-05 04:16:08.000000000 +0100
+++ e2fsprogs-1.47.0/debian/libext2fs2.install 2024-01-03 13:26:50.000000000 +0100
@@ -1,2 +1,2 @@
-lib/*/libext2fs*.so.*
-lib/*/libe2p*.so.*
+usr/lib/*/libext2fs*.so.*
+usr/lib/*/libe2p*.so.*
diff -Nru e2fsprogs-1.47.0/debian/libss2.install e2fsprogs-1.47.0/debian/libss2.install
--- e2fsprogs-1.47.0/debian/libss2.install 2023-03-05 04:16:08.000000000 +0100
+++ e2fsprogs-1.47.0/debian/libss2.install 2024-01-03 13:26:55.000000000 +0100
@@ -1 +1 @@
-lib/*/libss*.so.*
+usr/lib/*/libss*.so.*
diff -Nru e2fsprogs-1.47.0/debian/libuuid1.install e2fsprogs-1.47.0/debian/libuuid1.install
--- e2fsprogs-1.47.0/debian/libuuid1.install 2023-03-05 04:16:08.000000000 +0100
+++ e2fsprogs-1.47.0/debian/libuuid1.install 2024-01-03 13:26:58.000000000 +0100
@@ -1 +1 @@
-lib/*/libuuid*.so.*
+usr/lib/*/libuuid*.so.*
diff -Nru e2fsprogs-1.47.0/debian/logsave.install e2fsprogs-1.47.0/debian/logsave.install
--- e2fsprogs-1.47.0/debian/logsave.install 2023-03-05 04:16:08.000000000 +0100
+++ e2fsprogs-1.47.0/debian/logsave.install 2024-01-03 13:27:04.000000000 +0100
@@ -1,2 +1,2 @@
-sbin/logsave
+usr/sbin/logsave
usr/share/man/man8/logsave.8
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 2024-01-04 22:42:48.000000000 +0100
@@ -44,7 +44,7 @@
--disable-addrsan --disable-threadsan --disable-e2initrd-helper \
--disable-fsck --disable-libblkid --disable-libuuid --disable-uuidd \
--infodir=/usr/share/info --enable-symlink-install \
- --with-multiarch=$(DEB_HOST_MULTIARCH) \
+ --with-multiarch=$(DEB_HOST_MULTIARCH) --with-root-prefix=/usr \
$(BACKTRACE_CONF_FLAGS) ${EXTRA_CONF_FLAGS}
ifneq ($(SKIP_FUSE2FS),)
@@ -92,7 +92,7 @@
rm -rf ${stdbuilddir}
override_dh_auto_install:
- mkdir -p ${tmpdir}/sbin
+ mkdir -p ${tmpdir}/usr/sbin
$(MAKE) -C ${stdbuilddir} V=1 install DESTDIR=${tmpdir} \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
# static libs and .h files
@@ -100,12 +100,14 @@
ifeq (,$(filter pkg.e2fsprogs.no-static,$(DEB_BUILD_PROFILES)))
# statically-linked fsck
- ${INSTALL_PROGRAM} ${stdbuilddir}/e2fsck/e2fsck.static ${tmpdir}/sbin
+ ${INSTALL_PROGRAM} ${stdbuilddir}/e2fsck/e2fsck.static ${tmpdir}/usr/sbin
(cd debian/tmp/usr/share/man/man8 ; cp e2fsck.8 e2fsck.static.8)
endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
${INSTALL} -m 0644 misc/mke2fs-hurd.conf ${tmpdir}/etc/mke2fs.conf
+else
+ mv ${tmpdir}/usr/etc/* ${tmpdir}/etc/
endif
override_dh_install:
diff -Nru e2fsprogs-1.47.0/debian/tests/smoke e2fsprogs-1.47.0/debian/tests/smoke
--- e2fsprogs-1.47.0/debian/tests/smoke 2023-03-05 04:16:08.000000000 +0100
+++ e2fsprogs-1.47.0/debian/tests/smoke 2024-01-03 13:27:58.000000000 +0100
@@ -10,23 +10,23 @@
mkdir -p $LOGDIR $TDIR
-/sbin/mke2fs -q -t ext4 -d e2fsck $IMG 8M
-/sbin/e2label $IMG test
-/sbin/e2fsck -fy $IMG > $LOGDIR/e2fsck.1.log 2>&1
+/usr/sbin/mke2fs -q -t ext4 -d e2fsck $IMG 8M
+/usr/sbin/e2label $IMG test
+/usr/sbin/e2fsck -fy $IMG > $LOGDIR/e2fsck.1.log 2>&1
if test $? -ne 0 ; then
echo "First e2fsck failed; see $LOGDIR/e2fsck.1.log"
exit 1
fi
-/sbin/resize2fs $IMG 16M > $LOGDIR/resize2fs.log 2>&1
+/usr/sbin/resize2fs $IMG 16M > $LOGDIR/resize2fs.log 2>&1
if test $? -ne 0 ; then
echo "Resize2fs failed; see $LOGDIR/e2fsck.1.log"
exit 1
fi
-/sbin/e2fsck -fy $IMG > $LOGDIR/e2fsck.2.log 2>&1
+/usr/sbin/e2fsck -fy $IMG > $LOGDIR/e2fsck.2.log 2>&1
if test $? -ne 0 ; then
echo "Second e2fsck failed; see $LOGDIR/e2fsck.2.log"
exit 1
fi
-/sbin/debugfs -R "dump pass1.c $TDIR/pass1.c" $IMG > $LOGDIR/debugfs.log 2>&1
+/usr/sbin/debugfs -R "dump pass1.c $TDIR/pass1.c" $IMG > $LOGDIR/debugfs.log 2>&1
diff $TDIR/pass1.c e2fsck/pass1.c
