Source: buildbot Version: 3.9.2-1 Tags: ftbfs patch User: [email protected] Usertags: dep17m2
We want to change dh_installsystemd such that it places units inside the /usr hierarchy. When doing so, buildbot FTBFS, because it expects dh_installsystemd to create the relevant directories in / and places masking symlinks inside. I'm proposeing a patch that makes buildbot work both before and after the change to dh_installsystemd. Please consider applying it. Helmut
diff -Nru buildbot-3.9.2/debian/changelog buildbot-3.9.2/debian/changelog --- buildbot-3.9.2/debian/changelog 2023-09-05 09:20:16.000000000 +0200 +++ buildbot-3.9.2/debian/changelog 2023-09-26 17:29:29.000000000 +0200 @@ -1,3 +1,10 @@ +buildbot (3.9.2-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS when dh_installsystemd puts units to /usr. (Closes: #-1) + + -- Helmut Grohne <[email protected]> Tue, 26 Sep 2023 17:29:29 +0200 + buildbot (3.9.2-1) unstable; urgency=medium * New upstream version 3.9.2 diff -Nru buildbot-3.9.2/debian/rules buildbot-3.9.2/debian/rules --- buildbot-3.9.2/debian/rules 2023-08-29 16:27:37.000000000 +0200 +++ buildbot-3.9.2/debian/rules 2023-09-26 17:01:42.000000000 +0200 @@ -63,8 +63,13 @@ override_dh_installsystemd: dh_installsystemd --no-enable --no-start -r --no-restart-after-upgrade - ln -s /dev/null debian/buildbot/lib/systemd/system/buildbot.service - ln -s /dev/null debian/buildbot-worker/lib/systemd/system/buildbot-worker.service + set -e; if test -d debian/buildbot/lib/systemd/system; then \ + ln -s /dev/null debian/buildbot/lib/systemd/system/buildbot.service; \ + ln -s /dev/null debian/buildbot-worker/lib/systemd/system/buildbot-worker.service; \ + else \ + ln -s /dev/null debian/buildbot/usr/lib/systemd/system/buildbot.service; \ + ln -s /dev/null debian/buildbot-worker/usr/lib/systemd/system/buildbot-worker.service; \ + fi %: dh $@ --with python3,bash-completion,sphinxdoc
