From: David Lamparter <equinox@diac24.net>
Date: Mon, 10 Dec 2018 21:15:22 +0000 (+0100)
Subject: debianpkg: enable rtrlib by default
X-Git-Tag: frr-7.0~5^2~39
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7b81f161af169aa72d3093e8571a6df1e7abbb56;p=mirror%2Ffrr.git

debianpkg: enable rtrlib by default

librtr is in Debian unstable now, so this should default on.

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

diff --git a/debianpkg/README.Debian b/debianpkg/README.Debian
index 99003b7d08..6d6c60bef1 100644
--- a/debianpkg/README.Debian
+++ b/debianpkg/README.Debian
@@ -27,11 +27,11 @@ Zebra was developed by Kunihiro Ishiguro.
 
 The following Build Profiles have been added:
 
-- pkg.frr.rtrlib (pkg.frr.nortrlib)
+- pkg.frr.nortrlib (pkg.frr.rtrlib)
   controls whether the RPKI module is built.
   Will be enabled by default at some point, adds some extra dependencies.
 
-- pkg.frr.snmp (pkg.frr.nosnmp)
+- pkg.frr.nosnmp (pkg.frr.snmp)
   controls whether the SNMP module is built, see below for license issues.
   Will remain default-off as long as the license issue persists.
 
diff --git a/debianpkg/control b/debianpkg/control
index 9fa1d6b699..d706665754 100644
--- a/debianpkg/control
+++ b/debianpkg/control
@@ -21,9 +21,9 @@ Build-Depends:
  libpcre3-dev,
  libpython3-dev,
  libreadline-dev,
- librtr-dev <pkg.frr.rtrlib>,
+ librtr-dev <!pkg.frr.nortrlib>,
  libsnmp-dev,
- libssh-dev <pkg.frr.rtrlib>,
+ libssh-dev <!pkg.frr.nortrlib>,
  libsystemd-dev <!pkg.frr.nosystemd>,
  pkg-config,
  python3,
@@ -85,7 +85,7 @@ Description: FRRouting suite - BGP RPKI support (rtrlib)
  used to prevent hijacking of networks on the wider internet.  It is only
  relevant to internet service providers using their own autonomous system
  number.
-Build-Profiles: <pkg.frr.rtrlib>
+Build-Profiles: <!pkg.frr.nortrlib>
 
 Package: frr-doc
 Section: doc
diff --git a/debianpkg/rules b/debianpkg/rules
index 16587f110b..f46041834a 100755
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -15,10 +15,10 @@ endif
 
 # package-specific build profiles
 
-ifeq ($(filter pkg.frr.rtrlib,$(DEB_BUILD_PROFILES)),)
-  CONF_RPKI=--disable-rpki
-else
+ifeq ($(filter pkg.frr.nortrlib,$(DEB_BUILD_PROFILES)),)
   CONF_RPKI=--enable-rpki
+else
+  CONF_RPKI=--disable-rpki
 endif
 
 ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),)