[docker-frr]: Move FRR from 4.0 to 6.0.2 and make the new frr version…

… and debian package compile (#2454)

Signed-off-by: nikos <ntriantafillis@gmail.com>

dockers/docker-fpm-frr/Dockerfile.j2

@@ -13,7 +13,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
 
 # Install required packages
-RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4 libc-ares2 iproute libpython2.7
+RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4 libc-ares2 iproute libpython2.7 libjson-c2 logrotate
 
 {% if docker_fpm_frr_debs.strip() -%}
 # Copy locally-built Debian package dependencies

rules/config

@@ -82,5 +82,5 @@ DEFAULT_KERNEL_PROCURE_METHOD = build
 # host, then either the appropriate account and group will need to be created on the host
 # manually or changes need to be made when the image is built to create the account and
 # group during installation.
-FRR_USER_UID = 1000
-FRR_USER_GID = 1000
+FRR_USER_UID = 300
+FRR_USER_GID = 300

rules/frr.mk

@@ -1,6 +1,6 @@
 # FRRouting (frr) package
 
-FRR_VERSION = 4.0
+FRR_VERSION = 6.0.2
 export FRR_VERSION
 
 FRR = frr_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb

src/sonic-frr/Makefile

@@ -9,32 +9,13 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Build the package
 	pushd ./frr
 
-	# clean up the previous build
-	rm -rf debian
-	rm -f frr*.tar.gz
-	rm -f frr*.tar.xz
-	rm -f frr*.dsc
-
-	# make a dist tarball
-	./bootstrap.sh
-	./configure
-	make dist
-
-	# Create backports debian sources
-	cp -a debianpkg debian
-	make -f debian/rules backports
-
-	# new directory to build the package 
-	rm -rf frrpkg
-	mkdir frrpkg
-	cd frrpkg
-	tar xf ../frr_*.orig.tar.gz
-	cd frr*
-	tar xf ../../frr_*sonic.debian8*.debian.tar.xz
-
-	# build package
-	dpkg-buildpackage -rfakeroot -b -us -uc
+	# This could very well be tools/tarsource.sh -V -e sonic
+	tools/tarsource.sh -V
+	# This is a no-op but here in case the changelog stops being a symlink
+	debchange -b -v $(FRR_VERSION)-1~sonic.debian8+1 'SONiC FRR debian package build'
+	dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib
 	cd ..
+	mv frr_$(FRR_VERSION)-*_amd64.deb frr_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb
 	mv $* $(DEST)/
 
 	popd