diff --git a/debianpkg/README.deb_build.md b/debianpkg/README.deb_build.md index 889e831744..8ccce93f55 100644 --- a/debianpkg/README.deb_build.md +++ b/debianpkg/README.deb_build.md @@ -71,10 +71,15 @@ adding a new backport. Or change some options: (see `rules` file for available options) - export WANT_BGP_VNC=1 - export WANT_CUMULUS_MODE=1 - debuild -b -uc -us + debuild --set-envvar=WANT_BGP_VNC=1 --set-envvar=WANT_CUMULUS_MODE=1 -b -uc -us + To build with RPKI, download the librtr packages from + https://ci1.netdef.org/browse/RPKI-RTRLIB/latestSuccessful/artifact + install librtr-dev on the build server and build the packages as + debuild --set-envvar=WANT_RPKI=1 -b -uc -us + RPKI packages have an additonal dependency of librtr0 which can be + found at the same URL + DONE. If all works correctly, then you should end up with the Debian packages under diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules index 9a3ea1ffbd..01ad81d371 100755 --- a/debianpkg/backports/ubuntu12.04/debian/rules +++ b/debianpkg/backports/ubuntu12.04/debian/rules @@ -16,8 +16,10 @@ WANT_CUMULUS_MODE ?= 0 WANT_MULTIPATH ?= 1 WANT_SNMP ?= 0 +# NOTES: +# # 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 +# Please be aware that 0 is NOT disabled, but treated as unlimited MULTIPATH ?= 256 diff --git a/debianpkg/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules index 20b821ead7..721327c0d2 100755 --- a/debianpkg/backports/ubuntu14.04/debian/rules +++ b/debianpkg/backports/ubuntu14.04/debian/rules @@ -15,9 +15,20 @@ WANT_BGP_VNC ?= 1 WANT_CUMULUS_MODE ?= 0 WANT_MULTIPATH ?= 1 WANT_SNMP ?= 0 +WANT_RPKI ?= 0 +# NOTES: +# +# 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 +# Please be aware that 0 is NOT disabled, but treated as unlimited MULTIPATH ?= 256 @@ -91,6 +102,12 @@ 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 @@ -102,6 +119,11 @@ 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 @@ -134,6 +156,7 @@ override_dh_auto_configure: $(USE_PIM) \ --enable-dependency-tracking \ $(USE_BGP_VNC) \ + $(USE_RPKI) \ $(shell dpkg-buildflags --export=configure); \ fi diff --git a/debianpkg/rules b/debianpkg/rules index 82a5148039..c0fca96d79 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -15,9 +15,20 @@ WANT_BGP_VNC ?= 1 WANT_CUMULUS_MODE ?= 0 WANT_MULTIPATH ?= 1 WANT_SNMP ?= 0 +WANT_RPKI ?= 0 +# NOTES: +# +# 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 +# Please be aware that 0 is NOT disabled, but treated as unlimited MULTIPATH ?= 256 @@ -91,6 +102,12 @@ 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 @@ -102,6 +119,11 @@ endif %: dh $@ --with=systemd,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 @@ -135,6 +157,7 @@ override_dh_auto_configure: $(USE_PIM) \ --enable-dependency-tracking \ $(USE_BGP_VNC) \ + $(USE_RPKI) \ $(shell dpkg-buildflags --export=configure); \ fi