From c7e8a1e9c5bcffeb10bc4f0633996df707fad377 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 10 Nov 2016 08:18:18 +0100 Subject: [PATCH] debian/rules: Drop check for linking to libs in /usr This was just an approximation, as booting without an initrd could still be broken by library updates (e. g. #828991). With merged /usr now being the default this is now completely moot. --- debian/rules | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/debian/rules b/debian/rules index b2bb2b424..5c735da87 100755 --- a/debian/rules +++ b/debian/rules @@ -319,20 +319,6 @@ ifeq ($(DEB_VENDOR),Ubuntu) install --mode=755 debian/extra/set-cpufreq debian/systemd/lib/systemd/ endif -ifeq ($(TEST_UPSTREAM),) -ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS))) - echo "Checking that executables don't link to libraries in /usr..." - set -e; for e in $(patsubst %,debian/systemd/lib/systemd/%,systemd systemd-cgroups-agent systemd-cryptsetup systemd-journald systemd-shutdown) \ - debian/systemd/lib/systemd/system-generators/* \ - debian/udev/lib/systemd/systemd*; do \ - echo " $$e"; \ - OUT=`env -u LD_PRELOAD ldd $$e` || continue; if echo "$$OUT" | grep -q /usr; then \ - echo "ERROR: $$e links to /usr"; echo "$$OUT"; exit 1; \ - fi; \ - done -endif -endif - override_dh_installinit: dh_installinit --no-start # the following are only upstart jobs