Source: xfsprogs Version: 6.5.0-1 Severity: normal Tags: patch User: [email protected] Usertags: dep17m2
Please find a relatively trivial patch attached to install into /usr, for the currently ongoing UsrMerge effort [1]. It has been build-tested and checked by dumat. Please review it and upload to unstable during the trixie cycle. Note: this should not be backported to bookworm. If you intend to backport, please use dh_movetousr instead. If your package will change for the t64 transition or otherwise rename/split/move its binaries (packages) during trixie, please then upload to experimental and get in touch with the UsrMerge driver, please see the wiki [1]. Chris [1] https://wiki.debian.org/UsrMerge
diff -Nru xfsprogs-6.5.0/debian/changelog xfsprogs-6.5.0/debian/changelog --- xfsprogs-6.5.0/debian/changelog 2023-10-12 14:00:00.000000000 +0200 +++ xfsprogs-6.5.0/debian/changelog 2024-01-09 22:28:11.000000000 +0100 @@ -1,3 +1,11 @@ +xfsprogs (6.5.0-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install files into /usr (DEP17 M2). (Closes: #-1) + Update paths in initramfs.hook. + + -- Chris Hofstaedtler <[email protected]> Tue, 09 Jan 2024 22:28:11 +0100 + xfsprogs (6.5.0-1) unstable; urgency=low * New upstream release diff -Nru xfsprogs-6.5.0/debian/local/initramfs.hook xfsprogs-6.5.0/debian/local/initramfs.hook --- xfsprogs-6.5.0/debian/local/initramfs.hook 2023-08-15 21:15:28.000000000 +0200 +++ xfsprogs-6.5.0/debian/local/initramfs.hook 2024-01-09 22:28:11.000000000 +0100 @@ -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.5.0/debian/patches/series xfsprogs-6.5.0/debian/patches/series --- xfsprogs-6.5.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ xfsprogs-6.5.0/debian/patches/series 2024-01-09 22:27:05.000000000 +0100 @@ -0,0 +1 @@ +usrmerged-install-layout.patch diff -Nru xfsprogs-6.5.0/debian/patches/usrmerged-install-layout.patch xfsprogs-6.5.0/debian/patches/usrmerged-install-layout.patch --- xfsprogs-6.5.0/debian/patches/usrmerged-install-layout.patch 1970-01-01 01:00:00.000000000 +0100 +++ xfsprogs-6.5.0/debian/patches/usrmerged-install-layout.patch 2024-01-09 22:27:52.000000000 +0100 @@ -0,0 +1,33 @@ +Assume UsrMerged install layout, so honor prefix even for +root_sbindir, root_libdir. + +Index: xfsprogs-6.5.0/configure.ac +=================================================================== +--- xfsprogs-6.5.0.orig/configure.ac ++++ xfsprogs-6.5.0/configure.ac +@@ -119,23 +119,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])
