From 5d91b4705637087402c3bbfefb6f8b3f0a781b8a Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 25 Oct 2018 15:09:32 +0200 Subject: [PATCH] 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 --- debianpkg/frr-dbg.lintian-overrides | 1 - debianpkg/frr.lintian-overrides | 2 +- debianpkg/rules | 3 ++- debianpkg/subdir.am | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 debianpkg/frr-dbg.lintian-overrides diff --git a/debianpkg/frr-dbg.lintian-overrides b/debianpkg/frr-dbg.lintian-overrides deleted file mode 100644 index 7880bba29a..0000000000 --- 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 30a3caf376..4050c01693 100644 --- 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 cc12ffb2dc..d8c9b24e99 100755 --- 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 0cd1bca007..1a3f43db35 100644 --- 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 \ -- 2.39.5