Merge pull request #8508 from opensourcerouting/systemd-no-lib

3 files changed, 1 insertions, 21 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index a23a0efca..53fb6c9d0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -31,10 +31,6 @@ The following Build Profiles have been added:
   controls whether the RPKI module is built.
   Will be enabled by default at some point, adds some extra dependencies.
 
-- pkg.frr.nosystemd
-  Disables both systemd unit file installation as well as watchfrr sd_notify
-  support at startup.  Removes libsystemd dependency.
-
 Note that all options have a "no" form;  if you want to have your decision
 be sticky regardless of changes to what it defaults to, then always use one
 of the two.  For example, all occurrences of <pkg.frr.rtrlib> will at some
@@ -43,10 +39,6 @@ point be replaced with <!pkg.frr.nortrlib>.
 The main frr package has the exact same contents regardless of rtrlib or snmp
 choices.  The options only control frr-snmp and frr-rpki-rtrlib packages.
 
-The main frr package does NOT have the same contents if pkg.frr.nosystemd is
-used.  This option should only be used for systems that do not have systemd,
-e.g. Ubuntu 14.04.
-
 
 * Debian Policy compliance notes
 ================================
diff --git a/debian/control b/debian/control
index 0bbe99b31..0e67ff373 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Build-Depends: bison,
                librtr-dev <!pkg.frr.nortrlib>,
                libsnmp-dev,
                libssh-dev <!pkg.frr.nortrlib>,
-               libsystemd-dev <!pkg.frr.nosystemd>,
                libyang2-dev,
                lsb-base,
                pkg-config,
diff --git a/debian/rules b/debian/rules
index 93d0cdb2a..0fa9c3a3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,14 +21,6 @@ else
   CONF_RPKI=--disable-rpki
 endif
 
-ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),)
-  DH_WITHOUT_SYSTEMD=
-  CONF_SYSTEMD=--enable-systemd=yes
-else
-  DH_WITHOUT_SYSTEMD=--without=systemd
-  CONF_SYSTEMD=--enable-systemd=no
-endif
-
 ifeq ($(filter pkg.frr.lua,$(DEB_BUILD_PROFILES)),)
   CONF_LUA=--disable-scripting
 else
@@ -38,7 +30,7 @@ endif
 export PYTHON=python3
 
 %:
-	dh $@ $(DH_WITHOUT_SYSTEMD)
+	dh $@
 
 override_dh_auto_configure:
 	$(shell dpkg-buildflags --export=sh); \
@@ -52,7 +44,6 @@ override_dh_auto_configure:
 		LIBTOOLFLAGS="-rpath /usr/lib/$(DEB_HOST_MULTIARCH)/frr" \
 		--disable-dependency-tracking \
 		\
-		$(CONF_SYSTEMD) \
 		$(CONF_RPKI) \
 		$(CONF_LUA) \
 		--with-libpam \
@@ -80,9 +71,7 @@ override_dh_auto_install:
 	sed -e '1c #!/usr/bin/python3' -i debian/tmp/usr/lib/frr/generate_support_bundle.py
 
 # let dh_systemd_* and dh_installinit do their thing automatically
-ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),)
 	cp tools/frr.service debian/frr.service
-endif
 	cp tools/frrinit.sh debian/frr.init
 	-rm -f debian/tmp/usr/lib/frr/frr