Bug#1122748: Info received (Bug#1122748 closed by Thomas Goirand (Re: ceph: Please remove/replace usage of dh_movetousr))

[Michael Biebl]

Control: tags -1 + patch


The package would benefit from some simplification and unification.





Regards,
Michael



[1] https://buildd.debian.org/status/package.php?p=ceph&suite=experimental

diff -Nru ceph-20.2.2+ds/debian/ceph-common.install 
ceph-20.2.2+ds/debian/ceph-common.install
--- ceph-20.2.2+ds/debian/ceph-common.install   2026-06-23 17:16:45.000000000 
+0200
+++ ceph-20.2.2+ds/debian/ceph-common.install   2026-06-24 00:52:59.000000000 
+0200
@@ -3,7 +3,7 @@
 usr/share/bash-completion/completions/rados
 usr/share/bash-completion/completions/radosgw-admin
 usr/share/bash-completion/completions/rbd
-systemd/ceph.target /lib/systemd/system
+systemd/ceph.target usr/lib/systemd/system/
 etc/default/ceph
 usr/bin/ceph
 usr/bin/ceph-authtool
@@ -47,4 +47,4 @@
 usr/share/ceph/id_rsa_drop.ceph.com
 usr/share/ceph/id_rsa_drop.ceph.com.pub
 etc/ceph/rbdmap
-lib/udev/rules.d/50-rbd.rules
+usr/lib/udev/rules.d/50-rbd.rules
diff -Nru ceph-20.2.2+ds/debian/ceph-osd.install 
ceph-20.2.2+ds/debian/ceph-osd.install
--- ceph-20.2.2+ds/debian/ceph-osd.install      2026-06-23 17:16:45.000000000 
+0200
+++ ceph-20.2.2+ds/debian/ceph-osd.install      2026-06-24 00:54:44.000000000 
+0200
@@ -1,4 +1,4 @@
-debian/udev/* lib/udev/rules.d
+debian/udev/* usr/lib/udev/rules.d/
 etc/sysctl.d/30-ceph-osd.conf
 src/ceph-osd-prestart.sh /usr/lib/ceph/
 usr/bin/ceph-bluestore-tool
diff -Nru ceph-20.2.2+ds/debian/changelog ceph-20.2.2+ds/debian/changelog
--- ceph-20.2.2+ds/debian/changelog     2026-06-23 17:16:45.000000000 +0200
+++ ceph-20.2.2+ds/debian/changelog     2026-06-24 00:54:44.000000000 +0200
@@ -1,3 +1,10 @@
+ceph (20.2.2+ds-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Avoid usage of dh_movetousr (Closes: #1122748)
+
+ -- Michael Biebl <bi...@debian.org>  Wed, 24 Jun 2026 00:54:44 +0200
+
 ceph (20.2.2+ds-3) experimental; urgency=medium
 
   * Also fix src/cephadm/build.py so it accepts MarkupSafe 3, and doesn't
diff -Nru ceph-20.2.2+ds/debian/rules ceph-20.2.2+ds/debian/rules
--- ceph-20.2.2+ds/debian/rules 2026-06-23 17:16:45.000000000 +0200
+++ ceph-20.2.2+ds/debian/rules 2026-06-24 00:54:40.000000000 +0200
@@ -187,7 +187,7 @@
        if [ ! -f $(DESTDIR)/usr/bin/ceph-dencoder ]; then \
            cp debian/workarounds/ceph-dencoder-oom 
$(DESTDIR)/usr/bin/ceph-dencoder ;\
        fi
-       install -D -m 644 udev/50-rbd.rules 
$(DESTDIR)/lib/udev/rules.d/50-rbd.rules
+       install -D -m 644 udev/50-rbd.rules 
$(DESTDIR)/usr/lib/udev/rules.d/50-rbd.rules
        install -D -m 644 src/etc-rbdmap $(DESTDIR)/etc/ceph/rbdmap
        install -D -m 644 etc/sysctl/90-ceph-osd.conf 
$(DESTDIR)/etc/sysctl.d/30-ceph-osd.conf
        install -D -m 440 sudoers.d/ceph-smartctl 
$(DESTDIR)/etc/sudoers.d/ceph-smartctl
@@ -348,5 +348,3 @@
                fi ; \
        done
 
-execute_before_dh_installdeb:
-       if command -v dh_movetousr > /dev/null 2>&1; then dh_movetousr; fi

Seeing that the package in experimental already changed some of the paths in debian/rules, the remaining bits should be fixed by the attached debdiff. Unfortunately I could not test build it, as the package currently FTBFS [1]. Btw, I found it a bit odd, that some of the udev and systemd files are installed via debian/rules and some via .install. But in the interest of keeping the debdiff minimal I kept the current approach. Would be great if you can apply the patch with one of your next uploads (and as said, please check with lintian before you upload. If we missed a spot it would trigger the aliased-location error)

OpenPGP_signature.asc
Description: OpenPGP digital signature