frr: T3753: upgrade to upstream stable/8.0 branch

vyos · Aug 27, 2021 · f63ea8f · f63ea8f
1 parent 108c2a0
commit f63ea8f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 31 deletions.
diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile
@@ -22,7 +22,7 @@
 
 def pkgList = [
     ['name': 'frr',
-     'scmCommit': 'stable/7.5',
+     'scmCommit': 'stable/8.0',
      'scmUrl': 'https://github.com/FRRouting/frr.git',
      'buildCmd': '''cd ..; ./build-frr.sh'''],
 ]

diff --git a/packages/frr/build-frr.sh b/packages/frr/build-frr.sh
@@ -29,10 +29,6 @@ if [ -d $PATCH_DIR ]; then
     done
 fi
 
-# Prepare FRR source for building
-echo "I: Prepare FRR source for building"
-./tools/tarsource.sh -V
-
 # Build Debian FRR package
 echo "I: Build Debian FRR Package"
-dpkg-buildpackage -us -uc -Ppkg.frr.rtrlib
+dpkg-buildpackage -us -uc -tc -b -Ppkg.frr.rtrlib
diff --git a/packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch b/packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch