debianpkg: disable zeromq and FPM

The ZeroMQ is just straight up useless for now, and the FPM module needs
to be properly encapsulated with protobuf deps.

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

diff --git a/debianpkg/frr-dbg.lintian-overrides b/debianpkg/frr-dbg.lintian-overrides
deleted file mode 100644 (file)
index 7880bba..0000000
--- a/debianpkg/frr-dbg.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-frr-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/lib/libfrrfpm_pb.so.0.0.0

diff --git a/debianpkg/frr.lintian-overrides b/debianpkg/frr.lintian-overrides
index 30a3caf376c261be91fd0041c91baefdcf9acaac..4050c01693e9b6da31e6212f4661f25874b0bce1 100644 (file)
--- a/debianpkg/frr.lintian-overrides
+++ b/debianpkg/frr.lintian-overrides
@@ -1,2 +1,2 @@
-frr: package-name-doesnt-match-sonames libfrr0 libfrrfpm-pb0 libfrrospfapiclient0
+frr: package-name-doesnt-match-sonames libfrr0 libfrrospfapiclient0
 frr: systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/frr.service network-online.target

diff --git a/debianpkg/rules b/debianpkg/rules
index cc12ffb2dc1377face33522e717700cc2c3fed7a..d8c9b24e99494b7cde3190c1daad5c73f0ed9900 100755 (executable)
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -135,7 +135,8 @@ override_dh_auto_configure:
                $(USE_SNMP) \
                $(USE_OSPFAPI) \
                $(USE_MULTIPATH) \
-               --enable-fpm \
+               --disable-fpm \
+               --disable-zeromq \
                $(USE_FRR_USER) $(USE_FRR_GROUP) \
                $(USE_FRR_VTY_GROUP) \
                --enable-configfile-mask=0640 \

diff --git a/debianpkg/subdir.am b/debianpkg/subdir.am
index 0cd1bca0071a9cd79987c874b5a4bc40a324fb8e..1a3f43db358f05751e66b5faa9d006e887f67606 100644 (file)
--- a/debianpkg/subdir.am
+++ b/debianpkg/subdir.am
@@ -15,7 +15,6 @@ EXTRA_DIST += \
        debianpkg/tests/daemons \
        debianpkg/watchfrr.rc \
        \
-       debianpkg/frr-dbg.lintian-overrides \
        debianpkg/frr-doc.docs \
        debianpkg/frr-doc.info \
        debianpkg/frr-doc.install \