Package: aoetools
Version: 36-5
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Christoph,
your package aoetools installs some files into /lib and /sbin. I
understand this was to support split-/usr installs in the past.
For the ongoing UsrMerge effort [1], these directories should become
"empty", IOW packages should not install into these directories, but
instead into /usr.
I think aoetools could move these files now. I am guessing that aoetools
would not see backports; if it did, please note that such changes must be
reverted for bookworm (or earlier).
Attached you will find a patch implementing this. Please apply it at
your earliest convenience.
Thanks,
Chris
diff -Nru aoetools-36/debian/aoetools.aoe-discover.service
aoetools-36/debian/aoetools.aoe-discover.service
--- aoetools-36/debian/aoetools.aoe-discover.service 2019-02-26
07:49:20.000000000 +0100
+++ aoetools-36/debian/aoetools.aoe-discover.service 2023-11-27
10:01:26.000000000 +0100
@@ -8,4 +8,4 @@
[Service]
Type=oneshot
-ExecStart=/sbin/aoe-discover
+ExecStart=/usr/sbin/aoe-discover
diff -Nru aoetools-36/debian/aoetools.install
aoetools-36/debian/aoetools.install
--- aoetools-36/debian/aoetools.install 2016-12-26 19:11:13.000000000 +0100
+++ aoetools-36/debian/aoetools.install 2023-11-27 09:59:58.000000000 +0100
@@ -1,2 +1,2 @@
-debian/60-aoe.rules lib/udev/rules.d/
+debian/60-aoe.rules usr/lib/udev/rules.d/
debian/modules-load.d/aoetools.conf usr/lib/modules-load.d/
diff -Nru aoetools-36/debian/aoetools.links aoetools-36/debian/aoetools.links
--- aoetools-36/debian/aoetools.links 2016-12-26 20:46:59.000000000 +0100
+++ aoetools-36/debian/aoetools.links 2023-11-27 10:00:35.000000000 +0100
@@ -1,2 +1,2 @@
-sbin/aoe-discover etc/network/if-up.d/aoe-discover
-dev/null lib/systemd/system/aoetools.service
+usr/sbin/aoe-discover etc/network/if-up.d/aoe-discover
+dev/null usr/lib/systemd/system/aoetools.service
diff -Nru aoetools-36/debian/changelog aoetools-36/debian/changelog
--- aoetools-36/debian/changelog 2021-05-24 12:40:31.000000000 +0200
+++ aoetools-36/debian/changelog 2023-11-27 10:02:03.000000000 +0100
@@ -1,3 +1,11 @@
+aoetools (36-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install everything into /usr, removing overrides for /sbin, /lib,
+ for the current UsrMerge effort (DEP17 M2).
+
+ -- Chris Hofstaedtler <z...@debian.org> Mon, 27 Nov 2023 10:02:03 +0100
+
aoetools (36-5) unstable; urgency=medium
* postinst: Don't abort from failing module load
diff -Nru aoetools-36/debian/hooks_aoe aoetools-36/debian/hooks_aoe
--- aoetools-36/debian/hooks_aoe 2014-01-15 11:48:24.000000000 +0100
+++ aoetools-36/debian/hooks_aoe 2023-11-27 10:01:41.000000000 +0100
@@ -18,5 +18,5 @@
. /usr/share/initramfs-tools/hook-functions
-[ -x /sbin/aoe-discover ] && copy_exec /sbin/aoe-discover /sbin
+[ -x /usr/sbin/aoe-discover ] && copy_exec /usr/sbin/aoe-discover /usr/sbin
manual_add_modules aoe
diff -Nru aoetools-36/debian/local-top_aoe aoetools-36/debian/local-top_aoe
--- aoetools-36/debian/local-top_aoe 2021-05-24 12:08:20.000000000 +0200
+++ aoetools-36/debian/local-top_aoe 2023-11-27 10:01:48.000000000 +0100
@@ -34,4 +34,4 @@
# Wait until aoe device files have been generated.
wait_for_udev 10
-[ -x /sbin/aoe-discover ] && aoe-discover
+[ -x /usr/sbin/aoe-discover ] && aoe-discover
diff -Nru aoetools-36/debian/rules aoetools-36/debian/rules
--- aoetools-36/debian/rules 2021-05-24 12:08:20.000000000 +0200
+++ aoetools-36/debian/rules 2023-11-27 10:00:54.000000000 +0100
@@ -6,7 +6,7 @@
dh $@ --with systemd
override_dh_auto_install:
- $(MAKE) install PREFIX=debian/aoetools SBINDIR=debian/aoetools/sbin
+ $(MAKE) install PREFIX=debian/aoetools
install -D debian/hooks_aoe
debian/aoetools/usr/share/initramfs-tools/hooks/aoe
install -D debian/local-top_aoe
debian/aoetools/usr/share/initramfs-tools/scripts/local-top/aoe
