Source: kmod
Version: 30+20230601-2.1
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Hi,
We want to finalize the /usr-merge transition via DEP17 by moving all
the files to /usr. kmod is involved now, because it is installed by
debootstrap. Hence, I'm sending you a patch for the move. I don't think
this is going to cause any flags from dumat, but the patch is
non-trivial nonetheless, so I recommend doing an experimental upload in
order to have other QA systems and volunteer testers try it. I also note
that this patch should not be uploaded to bookworm-backports. If you
want to support backporting, please use dh_movetousr instead.
Helmut
diff --minimal -Nru kmod-30+20230601/debian/changelog
kmod-30+20230601/debian/changelog
--- kmod-30+20230601/debian/changelog 2023-12-24 00:08:19.000000000 +0100
+++ kmod-30+20230601/debian/changelog 2024-01-03 17:06:56.000000000 +0100
@@ -1,3 +1,10 @@
+kmod (30+20230601-2.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * DEP17: Move all files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Wed, 03 Jan 2024 17:06:56 +0100
+
kmod (30+20230601-2.1) unstable; urgency=medium
* Non-maintainer upload with maintainer approval.
diff --minimal -Nru kmod-30+20230601/debian/kmod-udeb.links
kmod-30+20230601/debian/kmod-udeb.links
--- kmod-30+20230601/debian/kmod-udeb.links 2023-12-23 18:48:14.000000000
+0100
+++ kmod-30+20230601/debian/kmod-udeb.links 2024-01-03 17:04:29.000000000
+0100
@@ -1,7 +1,7 @@
-/bin/kmod /sbin/depmod
-/bin/kmod /sbin/insmod
-/bin/kmod /sbin/lsmod
-/bin/kmod /sbin/modinfo
-/bin/kmod /sbin/modprobe
-/bin/kmod /sbin/rmmod
-/bin/kmod /bin/lsmod
+/usr/bin/kmod /usr/sbin/depmod
+/usr/bin/kmod /usr/sbin/insmod
+/usr/bin/kmod /usr/sbin/lsmod
+/usr/bin/kmod /usr/sbin/modinfo
+/usr/bin/kmod /usr/sbin/modprobe
+/usr/bin/kmod /usr/sbin/rmmod
+/usr/bin/kmod /usr/bin/lsmod
diff --minimal -Nru kmod-30+20230601/debian/kmod.dirs
kmod-30+20230601/debian/kmod.dirs
--- kmod-30+20230601/debian/kmod.dirs 2023-12-23 18:48:14.000000000 +0100
+++ kmod-30+20230601/debian/kmod.dirs 2024-01-03 17:06:56.000000000 +0100
@@ -1,5 +1,4 @@
/etc/modprobe.d/
-/lib/modprobe.d/
-/sbin/
+/usr/lib/modprobe.d/
/usr/share/doc/libkmod2/
/usr/share/initramfs-tools/hooks/
diff --minimal -Nru kmod-30+20230601/debian/kmod.initramfs-hook
kmod-30+20230601/debian/kmod.initramfs-hook
--- kmod-30+20230601/debian/kmod.initramfs-hook 2023-12-23 18:48:14.000000000
+0100
+++ kmod-30+20230601/debian/kmod.initramfs-hook 2024-01-03 17:05:20.000000000
+0100
@@ -6,11 +6,11 @@
. /usr/share/initramfs-tools/hook-functions
-copy_exec /bin/kmod
-cp -aZ /sbin/modprobe /sbin/rmmod "$DESTDIR/sbin/"
+copy_exec /usr/bin/kmod
+cp -aZ /usr/sbin/modprobe /usr/sbin/rmmod "$DESTDIR/usr/sbin/"
-mkdir -p "$DESTDIR/lib/modprobe.d/"
-if [ "$(echo /lib/modprobe.d/*)" != "/lib/modprobe.d/*" ]; then
- cp -aZ /lib/modprobe.d/* "$DESTDIR/lib/modprobe.d/"
+mkdir -p "$DESTDIR/usr/lib/modprobe.d/"
+if [ "$(echo /usr/lib/modprobe.d/*)" != "/usr/lib/modprobe.d/*" ]; then
+ cp -aZ /usr/lib/modprobe.d/* "$DESTDIR/usr/lib/modprobe.d/"
fi
diff --minimal -Nru kmod-30+20230601/debian/kmod.links
kmod-30+20230601/debian/kmod.links
--- kmod-30+20230601/debian/kmod.links 2023-12-23 18:48:14.000000000 +0100
+++ kmod-30+20230601/debian/kmod.links 2024-01-03 17:05:52.000000000 +0100
@@ -1,7 +1,7 @@
-/bin/kmod /sbin/depmod
-/bin/kmod /sbin/insmod
-/bin/kmod /sbin/lsmod
-/bin/kmod /sbin/modinfo
-/bin/kmod /sbin/modprobe
-/bin/kmod /sbin/rmmod
-/bin/kmod /bin/lsmod
+/usr/bin/kmod /usr/sbin/depmod
+/usr/bin/kmod /usr/sbin/insmod
+/usr/bin/kmod /usr/sbin/lsmod
+/usr/bin/kmod /usr/sbin/modinfo
+/usr/bin/kmod /usr/sbin/modprobe
+/usr/bin/kmod /usr/sbin/rmmod
+/usr/bin/kmod /usr/bin/lsmod
diff --minimal -Nru kmod-30+20230601/debian/rules kmod-30+20230601/debian/rules
--- kmod-30+20230601/debian/rules 2023-12-24 00:08:19.000000000 +0100
+++ kmod-30+20230601/debian/rules 2024-01-03 17:06:56.000000000 +0100
@@ -12,7 +12,6 @@
CONFFLAGS = \
--sysconfdir=/etc \
- --bindir=/bin \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--with-rootlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
CONFFLAGS_deb = $(CONFFLAGS) \
@@ -82,10 +81,10 @@
override_dh_install:
rm $D/usr/lib/*/*.la
dh_movefiles --sourcedir=debian/kmod
- cp debian/extra/aliases.conf $D/lib/modprobe.d/
+ cp debian/extra/aliases.conf $D/usr/lib/modprobe.d/
install --mode=755 debian/kmod.initramfs-hook \
$D/usr/share/initramfs-tools/hooks/kmod
- rmdir --parents --ignore-fail-on-non-empty $D/sbin/ $$(find $D/usr/
-type d -empty)
+ find $D/usr -type d -empty -empty -delete
ifdef BUILD_UDEB
mv $(DU)/usr/lib/*/libkmod.so.* $(DKU)/usr/lib/
rm -r $(DU)/usr/
