From: Martin Winter <mwinter@opensourcerouting.org>
Date: Tue, 6 Mar 2018 16:44:09 +0000 (-0800)
Subject: debianpkg: No RPKI support for Ubuntu 12.04
X-Git-Tag: frr-4.0~2^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3c5c2a6077d180519f9f72b9c39ac6024ef3cad1;p=mirror%2Ffrr.git

debianpkg: No RPKI support for Ubuntu 12.04

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
---

diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules
index e5941d8bd9..5c3e1363ce 100755
--- a/debianpkg/backports/ubuntu12.04/debian/rules
+++ b/debianpkg/backports/ubuntu12.04/debian/rules
@@ -14,15 +14,6 @@
 #   export WANT_BGP_VNC=0
 #   export WANT_CUMULUS_MODE=0
 #   export WANT_MULTIPATH=1
-#   export WANT_RPKI=0
-#
-# NOTE: If you use WANT_RPKI, then there is a new dependency for librtr0 package
-#    and a build dependency of the librtr-dev package.
-#    While the librtr0 is added to the depenencies automatically, the build dependency
-#    can't be changed dynamically and building will fail if the librtr-dev isn't
-#    installed during package build
-#    Tested versions of both packages can be found at
-#    https://ci1.netdef.org/browse/RPKI-RTRLIB/latestSuccessful/artifact
 #
 # If multipath is enabled (WANT_MULTIPATH=1), then set number of multipaths here
 # Please be aware that 0 is NOT disabled, but treated as unlimited
@@ -104,12 +95,6 @@ else
   USE_CUMULUS=--enable-cumulus=no
 endif
 
-ifeq ($(WANT_RPKI), 1)
-  USE_RPKI=--enable-rpki
-else
-  USE_RPKI=--disable-rpki
-endif
-
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
   DEBIAN_JOBS := $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
@@ -121,11 +106,6 @@ endif
 %:
 	dh $@ --with=autoreconf --parallel --dbg-package=frr-dbg --list-missing
 
-override_dh_gencontrol:
-ifeq ($(WANT_RPKI), 1)
-	dh_gencontrol -- -Vdist:Depends="librtr0 (>= 0.5)"
-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
@@ -158,7 +138,6 @@ override_dh_auto_configure:
 		$(USE_PIM) \
 		--enable-dependency-tracking \
 		$(USE_BGP_VNC) \
-		$(USE_RPKI) \
 		$(shell dpkg-buildflags --export=configure); \
 	fi