debianpkg: strip ancient/unused cruft

The SNMP MIB directory is unneeded, --enable-poll has been long gone,
the "build" target is straight up wrong (causing FRR to be built in the
install step) and we haven't needed /proc for configure in ages either.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/debianpkg/frr.dirs b/debianpkg/frr.dirs
index 56699b2daa261c39d5e82d9f840beee7f7df4b6e..f3fff264411b67198aeaf4df539647da252d7e4b 100644 (file)
--- a/debianpkg/frr.dirs
+++ b/debianpkg/frr.dirs
@@ -4,5 +4,4 @@ etc/iproute2/rt_protos.d/
 usr/share/doc/frr/
 usr/share/doc/frr/examples/
 usr/share/lintian/overrides/
-usr/share/snmp/mibs/
 var/log/frr/

diff --git a/debianpkg/frr.install b/debianpkg/frr.install
index 20a58bb0e91619d0290fd307d8d4db3e3b510459..e430868fe34541672f9f37de35068b2dcd8a62e9 100644 (file)
--- a/debianpkg/frr.install
+++ b/debianpkg/frr.install
@@ -5,7 +5,6 @@ usr/include/frr/
 usr/lib/
 tools/frr usr/lib/frr
 usr/share/doc/frr/
-usr/share/snmp/mibs/
 tools/etc/* etc/
 tools/*.service lib/systemd/system
 tools/frr-reload usr/lib/frr/

diff --git a/debianpkg/rules b/debianpkg/rules
index 811d45bc0b065432c616c8b9577fca6997d1e563..f4d28bb306fc212d39d6054827660085d38ea9ee 100755 (executable)
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -127,14 +127,6 @@ else
 endif
 
 override_dh_auto_configure:
-       # Frr needs /proc to check some BSD vs Linux specific stuff.
-       # Else it fails with an obscure error message pointing out that
-       # IPCTL_FORWARDING is an undefined symbol which is not very helpful.
-       @if ! [ -d /proc/1 ]; then \
-               echo "./configure needs a mounted /proc"; \
-               exit 1; \
-       fi
-
        if ! [ -e config.status ]; then \
        dh_auto_configure -- \
                --enable-exampledir=/usr/share/doc/frr/examples/ \
@@ -153,7 +145,6 @@ override_dh_auto_configure:
                --enable-werror \
                --with-libpam \
                --enable-systemd=yes \
-               --enable-poll=yes \
                $(USE_CUMULUS) \
                $(USE_PIM) \
                --enable-dependency-tracking \
@@ -164,12 +155,7 @@ override_dh_auto_configure:
        fi
 
 override_dh_auto_build:
-       # doc/ is a bit crazy
-ifeq ($(GENERATE_PDF), 1)
-       dh_auto_build -- -C doc pdf
-endif
-       rm -vf doc/user/_build/texinfo/frr.info
-       dh_auto_build -- -C doc info
+       dh_auto_build
 
 override_dh_auto_test:
 
@@ -186,12 +172,9 @@ override_dh_auto_install:
        mkdir -p debian/tmp/etc/frr/
        perl -pi -e 's#^!log file #!log file /var/log/frr/#' debian/tmp/usr/share/doc/frr/examples/*sample*
 
-       # leftover from previously shipping SMUX client OID MIB
-       mkdir -p debian/tmp/usr/share/snmp/mibs/
-
-       # cleaning .la files
-       sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/*.la
-       sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/frr/modules/*.la
+       # we don't need .la files
+       rm debian/tmp/usr/lib/*.la
+       rm debian/tmp/usr/lib/frr/modules/*.la
 
 override_dh_systemd_start:
        dh_systemd_start frr.service