summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-03-15 21:10:32 +0100
committerChristian Poessinger <christian@poessinger.com>2022-03-15 21:10:32 +0100
commitd21e0cade82e67965d48b5973d7464f37325cce3 (patch)
tree239c172e615e023b869f6a67794111605d9596c1
parent1766d6622aa7a67b8d680d1fed16c820d61bb3b2 (diff)
downloadvyos-build-d21e0cade82e67965d48b5973d7464f37325cce3.tar.gz
vyos-build-d21e0cade82e67965d48b5973d7464f37325cce3.zip
frr: T4302: upgrade to version 8.2
-rw-r--r--docker/Dockerfile2
-rw-r--r--packages/frr/Jenkinsfile4
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 36efd311..f3694298 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -275,7 +275,7 @@ RUN apt-get update && apt-get install -y \
# Prerequisites for building FRR from source
# see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html
#
-RUN export LIBYANG_COMMIT="v2.0.7" && \
+RUN export LIBYANG_COMMIT="v2.0.164" && \
git clone https://github.com/CESNET/libyang.git && \
cd libyang && git checkout $LIBYANG_COMMIT && apkg build -i && \
cd pkg/pkgs/debian-11/libyang2_* && dpkg -i *.deb
diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile
index d4084cbf..2005ea39 100644
--- a/packages/frr/Jenkinsfile
+++ b/packages/frr/Jenkinsfile
@@ -22,12 +22,12 @@
def pkgList = [
['name': 'libyang',
- 'scmCommit': 'v2.0.97',
+ 'scmCommit': 'v2.0.164',
'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/8.1',
+ 'scmCommit': 'stable/8.2',
'scmUrl': 'https://github.com/FRRouting/frr.git',
'buildCmd': 'cd ..; ./build-frr.sh'],
]