Am 24.06.26 um 01:17 schrieb Michael Biebl:
Control: tags -1 + patchSeeing 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.The package would benefit from some simplification and unification.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)
Seems there were more spots: E: ceph-common: aliased-location [sbin/] E: ceph-common: aliased-location [sbin/mount.ceph] E: ceph-fuse: aliased-location [sbin/] E: ceph-fuse: aliased-location [sbin/mount.fuse.ceph]I also noticed a usage of an aliased location in ceph-fs-common.install. But it appears this file is no longer needed and should be removed (the corresponding binary package has been folded into ceph-common a long time ago).
Fixed/updated patch attach Michael
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 22:00:59.000000000 +0200 +++ ceph-20.2.2+ds/debian/ceph-common.install 2026-06-24 19:56:45.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 @@ -25,7 +25,7 @@ usr/bin/rbdmap usr/bin/rbd-replay* usr/bin/ceph-post-file -usr/sbin/mount.ceph sbin +usr/sbin/mount.ceph usr/lib/*/ceph/compressor/* usr/lib/*/ceph/crypto/* [amd64] usr/share/man/man8/ceph-authtool.8 @@ -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-fs-common.install ceph-20.2.2+ds/debian/ceph-fs-common.install --- ceph-20.2.2+ds/debian/ceph-fs-common.install 2026-06-23 22:00:59.000000000 +0200 +++ ceph-20.2.2+ds/debian/ceph-fs-common.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -usr/bin/cephfs -usr/sbin/mount.ceph sbin -usr/share/man/man8/cephfs.8 -usr/share/man/man8/mount.ceph.8 diff -Nru ceph-20.2.2+ds/debian/ceph-fuse.install ceph-20.2.2+ds/debian/ceph-fuse.install --- ceph-20.2.2+ds/debian/ceph-fuse.install 2026-06-23 22:00:59.000000000 +0200 +++ ceph-20.2.2+ds/debian/ceph-fuse.install 2026-06-24 19:56:45.000000000 +0200 @@ -1,4 +1,4 @@ usr/bin/ceph-fuse -usr/sbin/mount.fuse.ceph sbin +usr/sbin/mount.fuse.ceph usr/share/man/man8/ceph-fuse.8 usr/share/man/man8/mount.fuse.ceph.8 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 22:00:59.000000000 +0200 +++ ceph-20.2.2+ds/debian/ceph-osd.install 2026-06-24 19:56:40.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 22:00:59.000000000 +0200 +++ ceph-20.2.2+ds/debian/changelog 2026-06-24 19:56:45.000000000 +0200 @@ -1,3 +1,11 @@ +ceph (20.2.2+ds-4.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Avoid usaged of dh_movetousr + * Remove no longer needed ceph-fs-common.install file + + -- Michael Biebl <[email protected]> Wed, 24 Jun 2026 19:56:45 +0200 + ceph (20.2.2+ds-4) experimental; urgency=medium * Add -DCEPHADM_BUNDLED_DEPENDENCIES=deb to avoid pip install in cephadm 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 22:00:59.000000000 +0200 +++ ceph-20.2.2+ds/debian/rules 2026-06-24 19:56:40.000000000 +0200 @@ -189,7 +189,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 @@ -350,5 +350,3 @@ fi ; \ done -execute_before_dh_installdeb: - if command -v dh_movetousr > /dev/null 2>&1; then dh_movetousr; fi
OpenPGP_signature.asc
Description: OpenPGP digital signature
