From 3acf36f2b1e588ae7667ce55245a8501f36919bb Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 13 Aug 2021 21:29:52 +0200
Subject: frr: T3753: upgrade to upstream stable/8.0 branch

---
 packages/frr/Jenkinsfile                           |  2 +-
 packages/frr/build-frr.sh                          |  6 +-----
 ...-fix-package-build-on-Bullseye-workaround.patch | 25 ----------------------
 3 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch

diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile
index c3020676..bcf75c27 100644
--- 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
index bcf26eb0..8f2aedc2 100755
--- 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
deleted file mode 100644
index d1fb19e0..00000000
--- a/packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c88011519aba9462bf9e464830fcee5b6f7bfc25 Mon Sep 17 00:00:00 2001
-From: Christian Poessinger <christian@poessinger.com>
-Date: Sat, 19 Jun 2021 13:38:56 +0000
-Subject: [PATCH] Debian: fix package build on Bullseye (workaround)
-
-This is the workaround mentioned in https://github.com/FRRouting/frr/issues/6502
----
- debian/frr-doc.install | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/debian/frr-doc.install b/debian/frr-doc.install
-index c48dc5a8d..6cc87e9cb 100644
---- a/debian/frr-doc.install
-+++ b/debian/frr-doc.install
-@@ -3,7 +3,7 @@ usr/share/doc/frr/html
-
- # info + images referenced by it
- usr/share/info/
--doc/user/_build/texinfo/*.png usr/share/info
-+#doc/user/_build/texinfo/*.png usr/share/info
-
- # other
- README.md         usr/share/doc/frr
---
-2.30.2
-- 
cgit v1.2.3