From 1ad48ecad87921ea8f4b84e2821e3dd41c9c71c8 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 17 Sep 2025 14:19:22 -0700 Subject: [PATCH] d/rules: Drop a workaround for dh_installsytemd needed for /usr/lib Since debhelper 13.11.6, we don't need this hack as dh_installsystemd recognizes the files in /usr/lib/systemd/ directory in addition to /lib/systemd/. Tests: - After build package with gbp. Notice that postinst script has code inserted by dh_installsystemd for starting/restarting the service. - Install the deb package starts service. Reinstalling the package restarts the service. Signed-off-by: Sunil Mohan Adapa Reviewed-by: Veiko Aasa --- debian/rules | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index 50a2cc0c1..de56899b6 100755 --- a/debian/rules +++ b/debian/rules @@ -29,10 +29,6 @@ ifneq ($(FBX_VERSION),$(DEB_VERSION)) endif override_dh_installsystemd: - # Do not enable or start any service other than FreedomBox service. Use - # of --tmpdir is a hack to workaround an issue with dh_installsystemd - # (as of debhelper 13.5.2) that still has hardcoded search path of - # /lib/systemd/system for searching systemd services. See #987989 and - # reversion of its changes. - dh_installsystemd --tmpdir=debian/tmp/usr --package=freedombox \ - plinth.service freedombox-privileged.socket + # Do not enable or start any service other than FreedomBox service. + dh_installsystemd --package=freedombox plinth.service \ + freedombox-privileged.socket