From f0dfe369537845b40f2495ae136376405e3f7247 Mon Sep 17 00:00:00 2001 From: joyas-joseph <51463120+joyas-joseph@users.noreply.github.com> Date: Wed, 29 Jul 2020 14:19:03 -0700 Subject: [PATCH] [docker-fpm-frr]: Upgrade docker-fpm-frr to buster (#4920) Verify that /etc/apt/sources.list points to buster using docker exec bgp cat /etc/apt/sources.list BGP neighborship is established. root@sonic:~# show ip bgp summary IPv4 Unicast Summary: BGP router identifier 10.1.0.1, local AS number 65100 vrf-id 0 BGP table version 1 RIB entries 1, using 184 bytes of memory Peers 1, using 20 KiB of memory Neighbor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd 6.1.1.1 4 100 96 96 0 0 0 01:32:04 0 Total number of neighbors 1 root@sonic:~# Signed-off-by: Joyas Joseph --- dockers/docker-fpm-frr/Dockerfile.j2 | 2 +- rules/docker-fpm-frr.mk | 8 +++----- rules/libyang.mk | 1 - rules/swig.dep | 10 ---------- rules/swig.mk | 21 --------------------- rules/swss-common.mk | 2 +- sonic-slave-buster/Dockerfile.j2 | 2 ++ sonic-slave-stretch/Dockerfile.j2 | 2 ++ 8 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 rules/swig.dep delete mode 100644 rules/swig.mk diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2 index 38bef392e5..ab8b585899 100644 --- a/dockers/docker-fpm-frr/Dockerfile.j2 +++ b/dockers/docker-fpm-frr/Dockerfile.j2 @@ -1,5 +1,5 @@ {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %} -FROM docker-config-engine-stretch +FROM docker-config-engine-buster ARG docker_container_name ARG frr_user_uid diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk index ad6613a685..833d510245 100644 --- a/rules/docker-fpm-frr.mk +++ b/rules/docker-fpm-frr.mk @@ -8,19 +8,17 @@ $(DOCKER_FPM_FRR)_PATH = $(DOCKERS_PATH)/$(DOCKER_FPM_FRR_STEM) $(DOCKER_FPM_FRR)_PYTHON_WHEELS += $(SONIC_BGPCFGD) $(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(FRR_SNMP) $(SWSS) $(LIBYANG) -$(DOCKER_FPM_FRR)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS) +$(DOCKER_FPM_FRR)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS) $(DOCKER_FPM_FRR)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG) \ $(FRR_DBG) $(FRR_SNMP_DBG) $(LIBYANG_DBG) -$(DOCKER_FPM_FRR)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES) +$(DOCKER_FPM_FRR)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES) -$(DOCKER_FPM_FRR)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH) +$(DOCKER_FPM_FRR)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER) SONIC_DOCKER_IMAGES += $(DOCKER_FPM_FRR) -SONIC_STRETCH_DOCKERS += $(DOCKER_FPM_FRR) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_FPM_FRR_DBG) -SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_FPM_FRR_DBG) $(DOCKER_FPM_FRR)_CONTAINER_NAME = bgp $(DOCKER_FPM_FRR)_RUN_OPT += --privileged -t diff --git a/rules/libyang.mk b/rules/libyang.mk index fc739a30bc..5a5000d7c4 100644 --- a/rules/libyang.mk +++ b/rules/libyang.mk @@ -10,7 +10,6 @@ export LIBYANG_SUBVERSION LIBYANG = libyang_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb $(LIBYANG)_SRC_PATH = $(SRC_PATH)/libyang -$(LIBYANG)_DEPENDS += $(SWIG_BASE) $(SWIG) SONIC_MAKE_DEBS += $(LIBYANG) LIBYANG_DEV = libyang-dev_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb diff --git a/rules/swig.dep b/rules/swig.dep deleted file mode 100644 index 603dc5587a..0000000000 --- a/rules/swig.dep +++ /dev/null @@ -1,10 +0,0 @@ - -SPATH := $($(SWIG_BASE)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/swig.mk rules/swig.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(SPATH)) - -$(SWIG_BASE)_CACHE_MODE := GIT_CONTENT_SHA -$(SWIG_BASE)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(SWIG_BASE)_DEP_FILES := $(DEP_FILES) - diff --git a/rules/swig.mk b/rules/swig.mk deleted file mode 100644 index cb964bb49b..0000000000 --- a/rules/swig.mk +++ /dev/null @@ -1,21 +0,0 @@ -# swig - -SWIG_VERSION_BASE = 3.0 -SWIG_VERSION = $(SWIG_VERSION_BASE).12 -SWIG_SUBVERSION = 2 - -export SWIG_VERSION_BASE -export SWIG_VERSION -export SWIG_SUBVERSION - -SWIG_BASE = swig$(SWIG_VERSION_BASE)_$(SWIG_VERSION)-$(SWIG_SUBVERSION)_$(CONFIGURED_ARCH).deb -$(SWIG_BASE)_SRC_PATH = $(SRC_PATH)/swig -SONIC_MAKE_DEBS += $(SWIG_BASE) - -SWIG = swig_$(SWIG_VERSION)-$(SWIG_SUBVERSION)_$(CONFIGURED_ARCH).deb -$(eval $(call add_derived_package,$(SWIG_BASE),$(SWIG))) - -SWIG_DBG = swig$(SWIG_VERSION_BASE)-dbgsym_$(SWIG_VERSION)-$(SWIG_SUBVERSION)_$(CONFIGURED_ARCH).deb -$(eval $(call add_derived_package,$(SWIG_BASE),$(SWIG_DBG))) - -export SWIG_BASE SWIG SWIG_DBG diff --git a/rules/swss-common.mk b/rules/swss-common.mk index 12d91e73fb..3e1c0b0576 100644 --- a/rules/swss-common.mk +++ b/rules/swss-common.mk @@ -4,7 +4,7 @@ LIBSWSSCOMMON = libswsscommon_1.0.0_$(CONFIGURED_ARCH).deb $(LIBSWSSCOMMON)_SRC_PATH = $(SRC_PATH)/sonic-swss-common $(LIBSWSSCOMMON)_DEPENDS += $(LIBHIREDIS_DEV) $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) \ $(LIBNL_ROUTE3_DEV) $(LIBNL_NF3_DEV) \ - $(LIBNL_CLI_DEV) $(SWIG) + $(LIBNL_CLI_DEV) $(LIBSWSSCOMMON)_RDEPENDS += $(LIBHIREDIS) $(LIBNL3) $(LIBNL_GENL3) \ $(LIBNL_ROUTE3) $(LIBNL_NF3) $(LIBNL_CLI) SONIC_DPKG_DEBS += $(LIBSWSSCOMMON) diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index 08c7aaac4b..d1a0435484 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -305,6 +305,8 @@ RUN apt-get update && apt-get install -y \ # For DHCP Monitor tool libexplain-dev \ libevent-dev \ +# For libyang + swig \ # For SWI Tools python-m2crypto diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index c145465bb1..d372450f01 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -301,6 +301,8 @@ RUN apt-get update && apt-get install -y \ # For DHCP Monitor tool libexplain-dev \ libevent-dev \ +# For libyang + swig \ # For SWI Tools python-m2crypto