From 0b568b6462029b2de76a66086a246a38dc3c4310 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Tue, 14 May 2019 12:57:42 -0700 Subject: [PATCH 1/7] Update frr to frr-7.0.1 --- .gitmodules | 1 + dockers/docker-fpm-frr/Dockerfile.j2 | 2 +- dockers/docker-fpm-frr/start.sh | 1 + dockers/docker-fpm-frr/supervisord.conf | 9 +++++++++ rules/docker-fpm-frr.mk | 2 +- rules/frr.mk | 24 +++++++++++++++--------- rules/libyang.mk | 20 ++++++++++++++++++++ rules/swig.mk | 22 ++++++++++++++++++++++ sonic-slave-stretch/Dockerfile | 6 +++++- src/libyang/Makefile | 23 +++++++++++++++++++++++ src/lldpd/Makefile | 2 +- src/python3/Makefile | 1 + src/sonic-frr/Makefile | 22 ++++------------------ src/sonic-frr/frr | 2 +- src/swig/Makefile | 21 +++++++++++++++++++++ 15 files changed, 126 insertions(+), 32 deletions(-) create mode 100644 rules/libyang.mk create mode 100644 rules/swig.mk create mode 100644 src/libyang/Makefile create mode 100644 src/swig/Makefile diff --git a/.gitmodules b/.gitmodules index 4e230df90d61..3d2a8e3f7a1d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -47,6 +47,7 @@ [submodule "src/sonic-frr/frr"] path = src/sonic-frr/frr url = https://github.com/Azure/sonic-frr.git + branch = frr/7.0 [submodule "platform/p4/p4-hlir/p4-hlir-v1.1"] path = platform/p4/p4-hlir/p4-hlir-v1.1 url = https://github.com/p4lang/p4-hlir.git diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2 index fc57b7c0ef3c..111ebe850228 100644 --- a/dockers/docker-fpm-frr/Dockerfile.j2 +++ b/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 iproute2 libpython2.7 libjson-c3 logrotate +RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4 libc-ares2 iproute2 libpython2.7 libjson-c3 logrotate libunwind8 {% if docker_fpm_frr_debs.strip() -%} # Copy locally-built Debian package dependencies diff --git a/dockers/docker-fpm-frr/start.sh b/dockers/docker-fpm-frr/start.sh index 03bb71d4fc56..238d26783ace 100755 --- a/dockers/docker-fpm-frr/start.sh +++ b/dockers/docker-fpm-frr/start.sh @@ -32,6 +32,7 @@ supervisorctl start bgpcfgd # Start Quagga processes supervisorctl start zebra +supervisorctl start staticd supervisorctl start bgpd if [ "$CONFIG_TYPE" == "unified" ]; then diff --git a/dockers/docker-fpm-frr/supervisord.conf b/dockers/docker-fpm-frr/supervisord.conf index f8aa3297195a..0b1c813847b6 100644 --- a/dockers/docker-fpm-frr/supervisord.conf +++ b/dockers/docker-fpm-frr/supervisord.conf @@ -39,6 +39,15 @@ startsecs=0 stdout_logfile=syslog stderr_logfile=syslog +[program:staticd] +command=/usr/lib/frr/staticd -A 127.0.0.1 +priority=4 +autostart=false +autorestart=false +startsecs=0 +stdout_logfile=syslog +stderr_logfile=syslog + [program:bgpd] command=/usr/lib/frr/bgpd -A 127.0.0.1 priority=5 diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk index 22da11f29c50..fd593c5cb92a 100644 --- a/rules/docker-fpm-frr.mk +++ b/rules/docker-fpm-frr.mk @@ -2,7 +2,7 @@ DOCKER_FPM_FRR = docker-fpm-frr.gz $(DOCKER_FPM_FRR)_PATH = $(DOCKERS_PATH)/docker-fpm-frr -$(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(FRR_PYTHONTOOLS) $(SWSS) +$(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(SWSS) $(LIBYANG) $(DOCKER_FPM_FRR)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH) SONIC_DOCKER_IMAGES += $(DOCKER_FPM_FRR) diff --git a/rules/frr.mk b/rules/frr.mk index 3d077c4b055f..ac110d03f54d 100644 --- a/rules/frr.mk +++ b/rules/frr.mk @@ -1,15 +1,21 @@ # FRRouting (frr) package -FRR_VERSION = 6.0.2 -export FRR_VERSION +FRR_VERSION = 7.0.1 +FRR_SUBVERSION = 0 +export FRR_VERSION FRR_SUBVERSION -FRR = frr_$(FRR_VERSION)-1~sonic.debian9+1_amd64.deb -$(FRR)_DEPENDS += $(LIBSNMP_DEV) + +FRR = frr_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_amd64.deb +$(FRR)_DEPENDS += $(LIBSNMP_DEV) $(LIBYANG_DEV) +$(FRR)_RDEPENDS += $(LIBYANG) $(FRR)_SRC_PATH = $(SRC_PATH)/sonic-frr SONIC_MAKE_DEBS += $(FRR) +SONIC_STRETCH_DEBS += $(FRR) + +FRR_PYTHONTOOLS = frr-pythontools_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_all.deb +$(eval $(call add_derived_package,$(FRR),$(FRR_PYTHONTOOLS))) + +FRR_DBG = frr-dbgsym_$(FRR_VERSION)-sonic-$(FRR_SUBVERSION)_amd64.deb +$(eval $(call add_derived_package,$(FRR),$(FRR_DBG))) -# 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) +export FRR FRR_PYTHONTOOLS FRR_DBG diff --git a/rules/libyang.mk b/rules/libyang.mk new file mode 100644 index 000000000000..efad22daa5b4 --- /dev/null +++ b/rules/libyang.mk @@ -0,0 +1,20 @@ +# libyang + +LIBYANG_VERSION_BASE = 0.16 +LIBYANG_VERSION = $(LIBYANG_VERSION_BASE).105 +LIBYANG_SUBVERSION = 1 + +export LIBYANG_VERSION_BASE +export LIBYANG_VERSION +export LIBYANG_SUBVERSION + +LIBYANG = libyang$(LIBYANG_VERSION_BASE)_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION)_amd64.deb +$(LIBYANG)_SRC_PATH = $(SRC_PATH)/libyang +$(LIBYAND)_DEPENDS += $(SWIG_BASE) $(SWIG) +SONIC_MAKE_DEBS += $(LIBYANG) +SONIC_STRETCH_DEBS += $(LIBYANG) + +LIBYANG_DEV = libyang-dev_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION)_amd64.deb +$(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_DEV))) + +export LIBYANG LIBYANG_DEV diff --git a/rules/swig.mk b/rules/swig.mk new file mode 100644 index 000000000000..630ac81c9c3d --- /dev/null +++ b/rules/swig.mk @@ -0,0 +1,22 @@ +# 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)_amd64.deb +$(SWIG_BASE)_SRC_PATH = $(SRC_PATH)/swig +SONIC_MAKE_DEBS += $(SWIG_BASE) +SONIC_STRETCH_DEBS += $(SWIG_BASE) + +SWIG = swig_$(SWIG_VERSION)-$(SWIG_SUBVERSION)_amd64.deb +$(eval $(call add_derived_package,$(SWIG_BASE),$(SWIG))) + +SWIG_DBG = swig$(SWIG_VERSION_BASE)-dbgsym_$(SWIG_VERSION)-$(SWIG_SUBVERSION)_amd64.deb +$(eval $(call add_derived_package,$(SWIG_BASE),$(SWIG_DBG))) + +export SWIG_BASE SWIG SWIG_DBG diff --git a/sonic-slave-stretch/Dockerfile b/sonic-slave-stretch/Dockerfile index ac41f1e77c81..43e8b6ff9c03 100644 --- a/sonic-slave-stretch/Dockerfile +++ b/sonic-slave-stretch/Dockerfile @@ -62,6 +62,11 @@ RUN apt-get update && apt-get install -y \ libjson-c-dev \ libsystemd-dev \ python-ipaddr \ + libcmocka-dev \ + python3-all-dev \ + python3-all-dbg \ + install-info \ + logrotate \ # For libnl3 (local) build cdbs \ # For SAI meta build @@ -109,7 +114,6 @@ RUN apt-get update && apt-get install -y \ dpatch \ libdb-dev \ iptables-dev \ - swig \ ctags \ # For mellanox sai build libtool-bin \ diff --git a/src/libyang/Makefile b/src/libyang/Makefile new file mode 100644 index 000000000000..0cad110ed4f3 --- /dev/null +++ b/src/libyang/Makefile @@ -0,0 +1,23 @@ +.ONESHELL: +SHELL = /bin/bash +.SHELLFLAGS += -e + +MAIN_TARGET = $(LIBYANG) +DERIVED_TARGETS = $(LIBYANG_DEV) +DEPS = $(DEST)/$(SWIG_BASE) $(DEST)/$(SWIG) + +$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : + rm -fr ./libyang-$(LIBYANG_VERSION) + sudo dpkg -i $(DEPS) + wget -N http://deb.debian.org/debian/pool/main/liby/libyang/libyang_0.16.105.orig.tar.gz + wget -O libyang_$(LIBYANG_VERSION).dsc -N http://deb.debian.org/debian/pool/main/liby/libyang/libyang_0.16.105-1.dsc + wget -O libyang_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION).debian.tar.xz -N http://deb.debian.org/debian/pool/main/liby/libyang/libyang_0.16.105-1.debian.tar.xz + dpkg-source -x libyang_$(LIBYANG_VERSION).dsc + + pushd ./libyang-$(LIBYANG_VERSION) + dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) + popd + + mv $(DERIVED_TARGETS) $* $(DEST)/ + +$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET) diff --git a/src/lldpd/Makefile b/src/lldpd/Makefile index ca0f83aa6d38..0d0dadbfdec6 100644 --- a/src/lldpd/Makefile +++ b/src/lldpd/Makefile @@ -17,7 +17,7 @@ DEBIAN_FILE_URL = $(LLDP_URL)/$(DEBIAN_FILE) $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Remove any stale files - rm -rf ./lldpd + rm -rf lldpd-$(LLDPD_VERSION) # download debian LLDPDD wget -NO "$(DSC_FILE)" $(DSC_FILE_URL) diff --git a/src/python3/Makefile b/src/python3/Makefile index d7718cbeccf6..87e49d67216d 100644 --- a/src/python3/Makefile +++ b/src/python3/Makefile @@ -15,6 +15,7 @@ DERIVED_TARGETS = lib$(PYTHON_PNAME)-stdlib_$(PYTHON_VER)-$(PYTHON_DEB_VER)_amd6 #$(PYTHON_PNAME)-dev_$(PYTHON_VER)-$(PYTHON_DEB_VER)_amd64.deb $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : + rm -fr $(PYTHON_PNAME)-$(PYTHON_VER) ## Obtaining the python3 wget 'https://sonicstorage.blob.core.windows.net/packages/$(PYTHON_PNAME)_$(PYTHON_VER).orig.tar.xz?sv=2015-04-05&sr=b&sig=d42Wh1CA9NZvlskhW4fpWcHVgc7N3IKhdFzyeO2zbRA%3D&se=2027-02-02T01%3A00%3A57Z&sp=r' -O $(PYTHON_PNAME)_$(PYTHON_VER).orig.tar.xz wget 'https://sonicstorage.blob.core.windows.net/packages/$(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER).debian.tar.xz?sv=2015-04-05&sr=b&sig=KLX9pMJ3zpQvGBo6ZjzoZXgooMJRUUwMx8ZaTJtywK0%3D&se=2027-02-02T00%3A59%3A34Z&sp=r' -O $(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER).debian.tar.xz diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile index c2ccffbbebd7..3bf8b2ef925a 100644 --- a/src/sonic-frr/Makefile +++ b/src/sonic-frr/Makefile @@ -2,29 +2,15 @@ SHELL = /bin/bash .SHELLFLAGS += -e -MAIN_TARGET = frr_$(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) +MAIN_TARGET = $(FRR) +DERIVED_TARGET = $(FRR_PYTHONTOOLS) $(FRR_DBG) $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : - # Build the package pushd ./frr - - # 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.debian9+1 'SONiC FRR debian package build' - sudo apt-get -y install install-info + tools/tarsource.sh -V -e '-sonic' dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib - cd .. - 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 + mv $(DERIVED_TARGET) $* $(DEST)/ $(addprefix $(DEST)/, $(DERIVED_TARGET)): $(DEST)/% : $(DEST)/$(MAIN_TARGET) - diff --git a/src/sonic-frr/frr b/src/sonic-frr/frr index 5a35fd375978..cd305c0973be 160000 --- a/src/sonic-frr/frr +++ b/src/sonic-frr/frr @@ -1 +1 @@ -Subproject commit 5a35fd375978dd7fce99c4b8ba84b0cdd1f32ac3 +Subproject commit cd305c0973be0baa1173e09f9d72e096c03e7e7e diff --git a/src/swig/Makefile b/src/swig/Makefile new file mode 100644 index 000000000000..8bf37f17120c --- /dev/null +++ b/src/swig/Makefile @@ -0,0 +1,21 @@ +.ONESHELL: +SHELL = /bin/bash +.SHELLFLAGS += -e + +MAIN_TARGET = $(SWIG_BASE) +DERIVED_TARGETS = $(SWIG) $(SWIG_DBG) + +$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : + rm -fr ./swig-$(SWIG_VERSION) *.deb + wget -N http://deb.debian.org/debian/pool/main/s/swig/swig_3.0.12.orig.tar.gz + wget -O swig_$(SWIG_VERSION).dsc -N http://deb.debian.org/debian/pool/main/s/swig/swig_3.0.12-2.dsc + wget -O swig_$(SWIG_VERSION)-$(SWIG_SUBVERSION).debian.tar.xz -N http://deb.debian.org/debian/pool/main/s/swig/swig_3.0.12-2.debian.tar.xz + dpkg-source -x swig_$(SWIG_VERSION).dsc + + pushd ./swig-$(SWIG_VERSION) + dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) + popd + + mv $(DERIVED_TARGETS) $* $(DEST)/ + +$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET) From ec8a39ecdbc6b3529b997540a251bc106a257fc7 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 15 May 2019 13:58:01 -0700 Subject: [PATCH 2/7] Fix a typo --- rules/libyang.mk | 2 +- src/libyang/Makefile | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/rules/libyang.mk b/rules/libyang.mk index efad22daa5b4..e2dabdf30442 100644 --- a/rules/libyang.mk +++ b/rules/libyang.mk @@ -10,7 +10,7 @@ export LIBYANG_SUBVERSION LIBYANG = libyang$(LIBYANG_VERSION_BASE)_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION)_amd64.deb $(LIBYANG)_SRC_PATH = $(SRC_PATH)/libyang -$(LIBYAND)_DEPENDS += $(SWIG_BASE) $(SWIG) +$(LIBYANG)_DEPENDS += $(SWIG_BASE) $(SWIG) SONIC_MAKE_DEBS += $(LIBYANG) SONIC_STRETCH_DEBS += $(LIBYANG) diff --git a/src/libyang/Makefile b/src/libyang/Makefile index 0cad110ed4f3..2a25d0f9653f 100644 --- a/src/libyang/Makefile +++ b/src/libyang/Makefile @@ -4,11 +4,9 @@ SHELL = /bin/bash MAIN_TARGET = $(LIBYANG) DERIVED_TARGETS = $(LIBYANG_DEV) -DEPS = $(DEST)/$(SWIG_BASE) $(DEST)/$(SWIG) $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : rm -fr ./libyang-$(LIBYANG_VERSION) - sudo dpkg -i $(DEPS) wget -N http://deb.debian.org/debian/pool/main/liby/libyang/libyang_0.16.105.orig.tar.gz wget -O libyang_$(LIBYANG_VERSION).dsc -N http://deb.debian.org/debian/pool/main/liby/libyang/libyang_0.16.105-1.dsc wget -O libyang_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION).debian.tar.xz -N http://deb.debian.org/debian/pool/main/liby/libyang/libyang_0.16.105-1.debian.tar.xz From 145215ede22db2aa069b27ca55ca959ef425d76b Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 15 May 2019 15:08:02 -0700 Subject: [PATCH 3/7] Set right permissions on /etc/frr --- dockers/docker-fpm-frr/Dockerfile.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2 index 111ebe850228..748c9b29a5ff 100644 --- a/dockers/docker-fpm-frr/Dockerfile.j2 +++ b/dockers/docker-fpm-frr/Dockerfile.j2 @@ -30,6 +30,8 @@ RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return {%- endfor %} {%- endif %} +RUN chown -R ${frr_user_uid}:${frr_user_gid} /etc/frr/ + # Clean up RUN apt-get clean -y RUN apt-get autoclean -y From 07d41bf3b3d4f7ff3e299f6453ac5890d7dabca4 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 15 May 2019 15:28:15 -0700 Subject: [PATCH 4/7] Convert external file links from debian to Azure --- src/libyang/Makefile | 6 +++--- src/swig/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libyang/Makefile b/src/libyang/Makefile index 2a25d0f9653f..99dedcd1a4ab 100644 --- a/src/libyang/Makefile +++ b/src/libyang/Makefile @@ -7,9 +7,9 @@ DERIVED_TARGETS = $(LIBYANG_DEV) $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : rm -fr ./libyang-$(LIBYANG_VERSION) - wget -N http://deb.debian.org/debian/pool/main/liby/libyang/libyang_0.16.105.orig.tar.gz - wget -O libyang_$(LIBYANG_VERSION).dsc -N http://deb.debian.org/debian/pool/main/liby/libyang/libyang_0.16.105-1.dsc - wget -O libyang_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION).debian.tar.xz -N http://deb.debian.org/debian/pool/main/liby/libyang/libyang_0.16.105-1.debian.tar.xz + wget -O libyang_$(LIBYANG_VERSION).orig.tar.gz 'https://sonicstorage.blob.core.windows.net/packages/libyang_0.16.105.orig.tar.gz?sv=2015-04-05&sr=b&sig=yTWDhl6B9TTXWAQ46zpLiNxUib61W7U0%2F%2FGvhRibKOc%3D&se=2046-09-30T22%3A10%3A27Z&sp=r' + wget -O libyang_$(LIBYANG_VERSION).dsc 'https://sonicstorage.blob.core.windows.net/packages/libyang_0.16.105-1.dsc?sv=2015-04-05&sr=b&sig=eLkO5wzB1C5oKNIaUPro4gwrgEC3EygIO6eCyTzHmeI%3D&se=2046-09-30T22%3A10%3A12Z&sp=r' + wget -O libyang_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION).debian.tar.xz 'https://sonicstorage.blob.core.windows.net/packages/libyang_0.16.105-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=AH18p7pKK0xIBVxZuA8EMv9%2FhXbCFKmbWAn7Za8%2BZW4%3D&se=2046-09-30T22%3A09%3A36Z&sp=r' dpkg-source -x libyang_$(LIBYANG_VERSION).dsc pushd ./libyang-$(LIBYANG_VERSION) diff --git a/src/swig/Makefile b/src/swig/Makefile index 8bf37f17120c..f9deda6a831d 100644 --- a/src/swig/Makefile +++ b/src/swig/Makefile @@ -7,9 +7,9 @@ DERIVED_TARGETS = $(SWIG) $(SWIG_DBG) $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : rm -fr ./swig-$(SWIG_VERSION) *.deb - wget -N http://deb.debian.org/debian/pool/main/s/swig/swig_3.0.12.orig.tar.gz - wget -O swig_$(SWIG_VERSION).dsc -N http://deb.debian.org/debian/pool/main/s/swig/swig_3.0.12-2.dsc - wget -O swig_$(SWIG_VERSION)-$(SWIG_SUBVERSION).debian.tar.xz -N http://deb.debian.org/debian/pool/main/s/swig/swig_3.0.12-2.debian.tar.xz + wget -O swig_$(SWIG_VERSION).orig.tar.gz 'https://sonicstorage.blob.core.windows.net/packages/swig_3.0.12.orig.tar.gz?sv=2015-04-05&sr=b&sig=kcSKFvlTQZst8Dbb8MUfckGbVEZU5sptFqT2HbwOUtA%3D&se=2046-09-30T22%3A11%3A59Z&sp=r' + wget -O swig_$(SWIG_VERSION).dsc 'https://sonicstorage.blob.core.windows.net/packages/swig_3.0.12-2.dsc?sv=2015-04-05&sr=b&sig=k3eLfmWgmCz1Kx8SYcirX18FSQdJ76ifo%2B9rbJBnrf8%3D&se=2046-09-30T22%3A11%3A45Z&sp=r' + wget -O swig_$(SWIG_VERSION)-$(SWIG_SUBVERSION).debian.tar.xz 'https://sonicstorage.blob.core.windows.net/packages/swig_3.0.12-2.debian.tar.xz?sv=2015-04-05&sr=b&sig=SQICTE%2BR1BO7npUBNwTQjo447OaFz%2BooX6VAm912c7g%3D&se=2046-09-30T22%3A11%3A32Z&sp=r' dpkg-source -x swig_$(SWIG_VERSION).dsc pushd ./swig-$(SWIG_VERSION) From 6a9233f437ddcbd07fdb0c97b1f7cadc2ad34c79 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 15 May 2019 15:30:07 -0700 Subject: [PATCH 5/7] Revert python3 fix --- src/python3/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/src/python3/Makefile b/src/python3/Makefile index 87e49d67216d..d7718cbeccf6 100644 --- a/src/python3/Makefile +++ b/src/python3/Makefile @@ -15,7 +15,6 @@ DERIVED_TARGETS = lib$(PYTHON_PNAME)-stdlib_$(PYTHON_VER)-$(PYTHON_DEB_VER)_amd6 #$(PYTHON_PNAME)-dev_$(PYTHON_VER)-$(PYTHON_DEB_VER)_amd64.deb $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : - rm -fr $(PYTHON_PNAME)-$(PYTHON_VER) ## Obtaining the python3 wget 'https://sonicstorage.blob.core.windows.net/packages/$(PYTHON_PNAME)_$(PYTHON_VER).orig.tar.xz?sv=2015-04-05&sr=b&sig=d42Wh1CA9NZvlskhW4fpWcHVgc7N3IKhdFzyeO2zbRA%3D&se=2027-02-02T01%3A00%3A57Z&sp=r' -O $(PYTHON_PNAME)_$(PYTHON_VER).orig.tar.xz wget 'https://sonicstorage.blob.core.windows.net/packages/$(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER).debian.tar.xz?sv=2015-04-05&sr=b&sig=KLX9pMJ3zpQvGBo6ZjzoZXgooMJRUUwMx8ZaTJtywK0%3D&se=2027-02-02T00%3A59%3A34Z&sp=r' -O $(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER).debian.tar.xz From 43458a531410cc054a1006ab041dec7502c82156 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 15 May 2019 17:54:06 -0700 Subject: [PATCH 6/7] Build frr using more than 1 job --- src/sonic-frr/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile index 3bf8b2ef925a..48da9c72116e 100644 --- a/src/sonic-frr/Makefile +++ b/src/sonic-frr/Makefile @@ -9,7 +9,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Build the package pushd ./frr tools/tarsource.sh -V -e '-sonic' - dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib + dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib -j$(SONIC_CONFIG_MAKE_JOBS) popd mv $(DERIVED_TARGET) $* $(DEST)/ From 07505711cf8e82ffeab6eb43950fba4ac9421fde Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 15 May 2019 17:54:35 -0700 Subject: [PATCH 7/7] Add SWIG as dependency for libswss-common --- rules/swss-common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/swss-common.mk b/rules/swss-common.mk index 623410d4cdab..c8e21d7d5f9f 100644 --- a/rules/swss-common.mk +++ b/rules/swss-common.mk @@ -4,7 +4,7 @@ LIBSWSSCOMMON = libswsscommon_1.0.0_amd64.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) + $(LIBNL_CLI_DEV) $(SWIG) $(LIBSWSSCOMMON)_RDEPENDS += $(LIBHIREDIS) $(LIBNL3) $(LIBNL_GENL3) \ $(LIBNL_ROUTE3) $(LIBNL_NF3) $(LIBNL_CLI) SONIC_DPKG_DEBS += $(LIBSWSSCOMMON)