From e20c213433b0c9d8cd7d17d61b046623dee02f57 Mon Sep 17 00:00:00 2001 From: nikos Date: Wed, 18 Sep 2019 23:09:29 -0700 Subject: [PATCH 1/5] Fix sonic frr makefile to handle multiple builds --- src/sonic-frr/Makefile | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile index 1e1e198e42d..5c21d44fc04 100644 --- a/src/sonic-frr/Makefile +++ b/src/sonic-frr/Makefile @@ -5,14 +5,26 @@ SHELL = /bin/bash MAIN_TARGET = $(FRR) DERIVED_TARGET = $(FRR_PYTHONTOOLS) $(FRR_DBG) $(FRR_SNMP) $(FRR_SNMP_DBG) +patch1 = 0001-Add-support-of-bgp-tcp-DSCP-value.patch +patch2 = 0002-Reduce-severity-of-Vty-connected-from-message.patch +patch3 = 0003-ignore-nexthop-attribute-when-NLRI-is-present.patch +patch4 = 0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch +patch5 = 0005-Support-VRF.patch +patches = "$patch1 $patch2 $patch3 $patch4 $patch5" + $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Build the package pushd ./frr - patch -p1 < ../patch/0001-Add-support-of-bgp-tcp-DSCP-value.patch - patch -p1 < ../patch/0002-Reduce-severity-of-Vty-connected-from-message.patch - patch -p1 < ../patch/0003-ignore-nexthop-attribute-when-NLRI-is-present.patch - patch -p1 < ../patch/0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch - patch -p1 < ../patch/0005-Support-VRF.patch + for frr_patch in $patches; do + if patch -sfp1 --dry-run < ../patch/$frr_patch; then + patch -sfp1 < ../patch/$frr_patch + else + if ! patch -Rsfp1 --dry-run < ../patch/$frr_patch; then + echo "Patch $frr_patch failure" + exit 1 + fi + fi + done tools/tarsource.sh -V -e '-sonic' dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib -j$(SONIC_CONFIG_MAKE_JOBS) popd From 74b49f93d41240556e8ec8493819ae5682c30045 Mon Sep 17 00:00:00 2001 From: nikos Date: Wed, 25 Sep 2019 15:13:27 -0700 Subject: [PATCH 2/5] Fix sonic frr makefile to handle multiple builds --- src/sonic-frr/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile index 5c21d44fc04..0fa4d42f2cd 100644 --- a/src/sonic-frr/Makefile +++ b/src/sonic-frr/Makefile @@ -15,12 +15,12 @@ patches = "$patch1 $patch2 $patch3 $patch4 $patch5" $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Build the package pushd ./frr - for frr_patch in $patches; do - if patch -sfp1 --dry-run < ../patch/$frr_patch; then - patch -sfp1 < ../patch/$frr_patch + for frr_patch in $$patches; do + if patch -sfp1 --dry-run < ../patch/$$frr_patch; then + patch -sfp1 < ../patch/$$frr_patch else - if ! patch -Rsfp1 --dry-run < ../patch/$frr_patch; then - echo "Patch $frr_patch failure" + if ! patch -Rsfp1 --dry-run < ../patch/$$frr_patch; then + echo "Patch $$frr_patch failure" exit 1 fi fi From 8b5d8188d5304f1eaf8bc8b6c40e3128189a9263 Mon Sep 17 00:00:00 2001 From: nikos Date: Wed, 25 Sep 2019 15:18:13 -0700 Subject: [PATCH 3/5] Fix sonic frr makefile to handle multiple builds --- src/sonic-frr/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile index 0fa4d42f2cd..2614b0feb08 100644 --- a/src/sonic-frr/Makefile +++ b/src/sonic-frr/Makefile @@ -10,12 +10,11 @@ patch2 = 0002-Reduce-severity-of-Vty-connected-from-message.patch patch3 = 0003-ignore-nexthop-attribute-when-NLRI-is-present.patch patch4 = 0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch patch5 = 0005-Support-VRF.patch -patches = "$patch1 $patch2 $patch3 $patch4 $patch5" $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Build the package pushd ./frr - for frr_patch in $$patches; do + for frr_patch in $patch1 $patch2 $patch3 $patch4 $patch5; do if patch -sfp1 --dry-run < ../patch/$$frr_patch; then patch -sfp1 < ../patch/$$frr_patch else From 0e0fc742911673dc22362c88b1d83bc4e1fad8c2 Mon Sep 17 00:00:00 2001 From: nikos Date: Wed, 25 Sep 2019 15:23:38 -0700 Subject: [PATCH 4/5] Fix sonic frr makefile to handle multiple builds --- src/sonic-frr/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile index 2614b0feb08..61a6f2c7fb4 100644 --- a/src/sonic-frr/Makefile +++ b/src/sonic-frr/Makefile @@ -10,11 +10,12 @@ patch2 = 0002-Reduce-severity-of-Vty-connected-from-message.patch patch3 = 0003-ignore-nexthop-attribute-when-NLRI-is-present.patch patch4 = 0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch patch5 = 0005-Support-VRF.patch +patches = $patch1 $patch2 $patch3 $patch4 $patch5 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Build the package pushd ./frr - for frr_patch in $patch1 $patch2 $patch3 $patch4 $patch5; do + for frr_patch in $(patches); do if patch -sfp1 --dry-run < ../patch/$$frr_patch; then patch -sfp1 < ../patch/$$frr_patch else From 0f650cd1af96373400d281b4c8299c1cd2cbc6e1 Mon Sep 17 00:00:00 2001 From: nikos Date: Wed, 25 Sep 2019 16:34:56 -0700 Subject: [PATCH 5/5] Fix sonic frr makefile to handle multiple builds --- src/sonic-frr/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile index 61a6f2c7fb4..f1b55a9b4f9 100644 --- a/src/sonic-frr/Makefile +++ b/src/sonic-frr/Makefile @@ -10,12 +10,11 @@ patch2 = 0002-Reduce-severity-of-Vty-connected-from-message.patch patch3 = 0003-ignore-nexthop-attribute-when-NLRI-is-present.patch patch4 = 0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch patch5 = 0005-Support-VRF.patch -patches = $patch1 $patch2 $patch3 $patch4 $patch5 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Build the package pushd ./frr - for frr_patch in $(patches); do + for frr_patch in $(patch1) $(patch2) $(patch3) $(patch4) $(patch5); do if patch -sfp1 --dry-run < ../patch/$$frr_patch; then patch -sfp1 < ../patch/$$frr_patch else