Control: tags 1060352 + pending
Dear maintainer,
I've prepared an NMU for xfsprogs (versioned as 6.8.0-2.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru xfsprogs-6.8.0/debian/changelog xfsprogs-6.8.0/debian/changelog
--- xfsprogs-6.8.0/debian/changelog 2024-05-23 00:44:14.000000000 +0200
+++ xfsprogs-6.8.0/debian/changelog 2024-06-12 17:50:50.000000000 +0200
@@ -1,3 +1,10 @@
+xfsprogs (6.8.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Install all files into UsrMerged layout. (Closes: #1060352)
+
+ -- Chris Hofstaedtler <z...@debian.org> Wed, 12 Jun 2024 17:50:50 +0200
+
xfsprogs (6.8.0-2) unstable; urgency=medium
* Fix build on mips64el
diff -Nru xfsprogs-6.8.0/debian/local/initramfs.hook xfsprogs-6.8.0/debian/local/initramfs.hook
--- xfsprogs-6.8.0/debian/local/initramfs.hook 2024-05-07 22:18:44.000000000 +0200
+++ xfsprogs-6.8.0/debian/local/initramfs.hook 2024-06-12 17:47:46.000000000 +0200
@@ -45,7 +45,7 @@
. /usr/share/initramfs-tools/hook-functions
if [ "$(rootfs_type)" = "xfs" ]; then
- copy_exec /sbin/xfs_repair
+ copy_exec /usr/sbin/xfs_repair
copy_exec /usr/sbin/xfs_db
copy_exec /usr/sbin/xfs_metadump
fi
diff -Nru xfsprogs-6.8.0/debian/patches/configure-usrmerge.patch xfsprogs-6.8.0/debian/patches/configure-usrmerge.patch
--- xfsprogs-6.8.0/debian/patches/configure-usrmerge.patch 1970-01-01 01:00:00.000000000 +0100
+++ xfsprogs-6.8.0/debian/patches/configure-usrmerge.patch 2024-06-12 17:50:20.000000000 +0200
@@ -0,0 +1,35 @@
+From: Chris Hofstaedtler <z...@debian.org>
+Subject: Install files into UsrMerged layout.
+
+Signed-off-by: Chris Hofstaedtler <z...@debian.org>
+
+Index: xfsprogs-6.8.0/configure.ac
+===================================================================
+--- xfsprogs-6.8.0.orig/configure.ac
++++ xfsprogs-6.8.0/configure.ac
+@@ -113,23 +113,8 @@ esac
+ #
+ test -n "$multiarch" && enable_lib64=no
+
+-#
+-# Some important tools should be installed into the root partitions.
+-#
+-# Check whether exec_prefix=/usr: and install them to /sbin in that
+-# case. If the user chooses a different prefix assume they just want
+-# a local install for testing and not a system install.
+-#
+-case $exec_prefix:$prefix in
+-NONE:NONE | NONE:/usr | /usr:*)
+- root_sbindir='/sbin'
+- root_libdir="/${base_libdir}"
+- ;;
+-*)
+- root_sbindir="${sbindir}"
+- root_libdir="${libdir}"
+- ;;
+-esac
++root_sbindir="${sbindir}"
++root_libdir="${libdir}"
+
+ AC_SUBST([root_sbindir])
+ AC_SUBST([root_libdir])
diff -Nru xfsprogs-6.8.0/debian/patches/series xfsprogs-6.8.0/debian/patches/series
--- xfsprogs-6.8.0/debian/patches/series 2024-05-23 00:43:16.000000000 +0200
+++ xfsprogs-6.8.0/debian/patches/series 2024-06-12 17:49:11.000000000 +0200
@@ -1 +1,2 @@
make-MADV_SOFT_OFFLINE-conditional.patch
+configure-usrmerge.patch
