summaryrefslogtreecommitdiff
path: root/packages/frr/build-frr.sh
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-10-28 20:24:15 +0100
committerChristian Poessinger <christian@poessinger.com>2020-10-28 20:24:15 +0100
commit1040a4bdf7e0d1ccd70bf653d11a58de9bb0e09d (patch)
treec98c303fad08aa11bd6316236e61afc6044a55a4 /packages/frr/build-frr.sh
parentc6f83de5bfa0262bd76882dc92dcd55f90fa0074 (diff)
downloadvyos-build-1040a4bdf7e0d1ccd70bf653d11a58de9bb0e09d.tar.gz
vyos-build-1040a4bdf7e0d1ccd70bf653d11a58de9bb0e09d.zip
frr: drop custom patches as they are now part of upstream repox
Diffstat (limited to 'packages/frr/build-frr.sh')
-rwxr-xr-xpackages/frr/build-frr.sh23
1 files changed, 12 insertions, 11 deletions
diff --git a/packages/frr/build-frr.sh b/packages/frr/build-frr.sh
index 477c41e3..d6ea62b4 100755
--- a/packages/frr/build-frr.sh
+++ b/packages/frr/build-frr.sh
@@ -16,17 +16,18 @@ fi
cd ${FRR_SRC}
PATCH_DIR=${CWD}/patches
-
-echo "I: Apply FRRouting patches not in main repository:"
-for patch in $(ls ${PATCH_DIR})
-do
- if [ -z "$(git config --list | grep -e user.name -e user.email)" ]; then
- # if git user.name and user.email is not set, -c sets temorary user.name and
- # user.email variables as these is not set in the build container by default.
- OPTS="-c user.name=VyOS-CI -c user.email=maintainers@vyos.io"
- fi
- git $OPTS am ${PATCH_DIR}/${patch}
-done
+if [ -d $PATCH_DIR ]; then
+ echo "I: Apply FRRouting patches not in main repository:"
+ for patch in $(ls ${PATCH_DIR})
+ do
+ if [ -z "$(git config --list | grep -e user.name -e user.email)" ]; then
+ # if git user.name and user.email is not set, -c sets temorary user.name and
+ # user.email variables as these is not set in the build container by default.
+ OPTS="-c user.name=VyOS-CI -c user.email=maintainers@vyos.io"
+ fi
+ git $OPTS am ${PATCH_DIR}/${patch}
+ done
+fi
# Prepare FRR source for building
echo "I: Prepare FRR source for building"