diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-11-27 19:33:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-27 19:33:01 +0100 |
| commit | e11dbc7bbe58951bdbf06474f2918dd4d48798c4 (patch) | |
| tree | 63364edfebb503778376fa6f8a17ed110ae8427e /packages | |
| parent | fee2237ca0a1977c774979b83860c19322fab388 (diff) | |
| parent | a30a8b06d8b9a2405befcb56207f4391542b00e7 (diff) | |
| download | vyos-build-e11dbc7bbe58951bdbf06474f2918dd4d48798c4.tar.gz vyos-build-e11dbc7bbe58951bdbf06474f2918dd4d48798c4.zip | |
Merge pull request #182 from c-po/frr-8-upgrade
FRR: upgrade to upstream stable/8.1 branch
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/frr/.gitignore | 1 | ||||
| -rw-r--r-- | packages/frr/Jenkinsfile | 9 | ||||
| -rwxr-xr-x | packages/frr/build-frr.sh | 6 | ||||
| -rw-r--r-- | packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch | 25 |
4 files changed, 9 insertions, 32 deletions
diff --git a/packages/frr/.gitignore b/packages/frr/.gitignore index 1586d21f..a6f28160 100644 --- a/packages/frr/.gitignore +++ b/packages/frr/.gitignore @@ -1,4 +1,5 @@ frr/ +libyang/ *.deb *.dsc *.buildinfo diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile index c3020676..d4084cbf 100644 --- a/packages/frr/Jenkinsfile +++ b/packages/frr/Jenkinsfile @@ -21,10 +21,15 @@ @Library('vyos-build@current')_ def pkgList = [ + ['name': 'libyang', + 'scmCommit': 'v2.0.97', + 'scmUrl': 'https://github.com/CESNET/libyang.git', + 'buildCmd': 'apkg build -i && find pkg/pkgs -type f -name *.deb -exec mv -t .. {} +'], + ['name': 'frr', - 'scmCommit': 'stable/7.5', + 'scmCommit': 'stable/8.1', 'scmUrl': 'https://github.com/FRRouting/frr.git', - 'buildCmd': '''cd ..; ./build-frr.sh'''], + 'buildCmd': 'cd ..; ./build-frr.sh'], ] // Start package build using library function from https://github.com/vyos/vyos-build 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 |