From c988b501e01b9ce3b02a649fa224977514c2e29a Mon Sep 17 00:00:00 2001 From: nikos Date: Tue, 23 Apr 2019 19:11:48 -0700 Subject: [PATCH 1/2] frr: Move docker to stretch and add pythontools --- dockers/docker-fpm-frr/Dockerfile.j2 | 4 ++-- rules/docker-fpm-frr.mk | 6 ++++-- rules/frr.mk | 8 +++++++- src/sonic-frr/Makefile | 13 +++++++++---- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2 index 6a11deed385..df1de8ee82b 100644 --- a/dockers/docker-fpm-frr/Dockerfile.j2 +++ b/dockers/docker-fpm-frr/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM docker-config-engine +FROM docker-config-engine-stretch ARG docker_container_name ARG frr_user_uid @@ -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 iproute2 libpython2.7 libjson-c2 logrotate +RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4 libc-ares2 iproute2 libpython2.7 libjson-c3 logrotate {% if docker_fpm_frr_debs.strip() -%} # Copy locally-built Debian package dependencies diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk index f9a858611fa..22da11f29c5 100644 --- a/rules/docker-fpm-frr.mk +++ b/rules/docker-fpm-frr.mk @@ -2,8 +2,8 @@ DOCKER_FPM_FRR = docker-fpm-frr.gz $(DOCKER_FPM_FRR)_PATH = $(DOCKERS_PATH)/docker-fpm-frr -$(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(SWSS) -$(DOCKER_FPM_FRR)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE) +$(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(FRR_PYTHONTOOLS) $(SWSS) +$(DOCKER_FPM_FRR)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH) SONIC_DOCKER_IMAGES += $(DOCKER_FPM_FRR) $(DOCKER_FPM_FRR)_CONTAINER_NAME = bgp @@ -12,3 +12,5 @@ $(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/sonic/frr:/etc/frr:rw $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += vtysh:/usr/bin/vtysh + +SONIC_STRETCH_DOCKERS += $(DOCKER_FPM_FRR) diff --git a/rules/frr.mk b/rules/frr.mk index a5736452b1a..3d077c4b055 100644 --- a/rules/frr.mk +++ b/rules/frr.mk @@ -3,7 +3,13 @@ FRR_VERSION = 6.0.2 export FRR_VERSION -FRR = frr_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb +FRR = frr_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb $(FRR)_DEPENDS += $(LIBSNMP_DEV) $(FRR)_SRC_PATH = $(SRC_PATH)/sonic-frr SONIC_MAKE_DEBS += $(FRR) + +# FRRouting pythontools +FRR_PYTHONTOOLS = frr-pythontools_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb +$(FRR_PYTHONTOOLS)_DEPENDS += $(LIBSNMP_DEV) +$(FRR_PYTHONTOOLS)_SRC_PATH = $(SRC_PATH)/sonic-frr +SONIC_MAKE_DEBS += $(FRR_PYTHONTOOLS) diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile index 22cd1897a1f..10ca10dc10c 100644 --- a/src/sonic-frr/Makefile +++ b/src/sonic-frr/Makefile @@ -2,7 +2,8 @@ SHELL = /bin/bash .SHELLFLAGS += -e -MAIN_TARGET = frr_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb +MAIN_TARGET = frr_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb +DERIVED_TARGET = frr-pythontools_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : @@ -12,11 +13,15 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # 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' + debchange -b -v $(FRR_VERSION)-1~sonic.debian9+1 'SONiC FRR debian package build' + sudo apt-get -y install install-info 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)/ + mv frr_$(FRR_VERSION)-*_amd64.deb frr_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb + mv frr-pythontools_$(FRR_VERSION)-*_all.deb frr-pythontools_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb + mv $(DERIVED_TARGET) $* $(DEST)/ popd +$(addprefix $(DEST)/, $(DERIVED_TARGET)): $(DEST)/% : $(DEST)/$(MAIN_TARGET) + From 3160c76558b710bfc4f4a84b2f2ab9249b3929cd Mon Sep 17 00:00:00 2001 From: nikos Date: Thu, 25 Apr 2019 00:13:08 -0700 Subject: [PATCH 2/2] frr: Move docker to stretch and add pythontools --- src/sonic-frr/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile index 10ca10dc10c..c2ccffbbebd 100644 --- a/src/sonic-frr/Makefile +++ b/src/sonic-frr/Makefile @@ -3,7 +3,9 @@ SHELL = /bin/bash .SHELLFLAGS += -e MAIN_TARGET = frr_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb -DERIVED_TARGET = frr-pythontools_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb +TOOLS_TARGET = frr-pythontools_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb +MAIN_TARGET_DBG = frr-dbgsym_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb +DERIVED_TARGET = $(TOOLS_TARGET) $(MAIN_TARGET_DBG) $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : @@ -17,8 +19,9 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : sudo apt-get -y install install-info dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib cd .. - mv frr_$(FRR_VERSION)-*_amd64.deb frr_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb - mv frr-pythontools_$(FRR_VERSION)-*_all.deb frr-pythontools_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb + mv frr_$(FRR_VERSION)-*_amd64.deb $(MAIN_TARGET) + mv frr-pythontools_$(FRR_VERSION)-*_all.deb $(TOOLS_TARGET) + mv frr-dbgsym_$(FRR_VERSION)-*_amd64.deb $(MAIN_TARGET_DBG) mv $(DERIVED_TARGET) $* $(DEST)/ popd