summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-10-31 19:01:49 +0100
committerGitHub <noreply@github.com>2023-10-31 19:01:49 +0100
commitea5d3cd7d9a198b5390a660d99a0321581c54271 (patch)
treef99271a0c6fc475798abc1056c4ec6dfe41cc1d5
parent231dc565c0a6ad0a2f9366f8c38197a5007b7f8e (diff)
parent9d7b018c6d5148fc00f5388dc3c6c8c6a9962f58 (diff)
downloadvyos-build-ea5d3cd7d9a198b5390a660d99a0321581c54271.tar.gz
vyos-build-ea5d3cd7d9a198b5390a660d99a0321581c54271.zip
Merge pull request #449 from vyos/mergify/bp/sagitta/pr-446
T5415: upgrade libyang library to v2.1.128 (backport #446)
-rw-r--r--docker/Dockerfile2
-rw-r--r--packages/frr/Jenkinsfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index dab32b3d..178c46ba 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -212,7 +212,7 @@ RUN export RTRLIB_VERSION="0.8.0" export ARCH=$(dpkg-architecture -qDEB_HOST_ARC
dpkg-buildpackage -uc -us -tc -b && \
dpkg -i ../librtr0*_${ARCH}.deb ../librtr-dev*_${ARCH}.deb ../rtr-tools*_${ARCH}.deb
-RUN export LIBYANG_VERSION="v2.1.80" export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \
+RUN export LIBYANG_VERSION="v2.1.128" export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \
git clone https://github.com/CESNET/libyang.git /tmp/libyang && cd /tmp/libyang && \
pipx run apkg build -i && find pkg/pkgs -type f -name *.deb -exec mv -t .. {} + && \
dpkg -i ../libyang*.deb
diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile
index 96432b8c..6f678fef 100644
--- a/packages/frr/Jenkinsfile
+++ b/packages/frr/Jenkinsfile
@@ -22,7 +22,7 @@
def pkgList = [
['name': 'libyang',
- 'scmCommit': 'v2.1.80',
+ 'scmCommit': 'v2.1.128',
'scmUrl': 'https://github.com/CESNET/libyang.git',
'buildCmd': 'pipx run apkg build -i && find pkg/pkgs -type f -name *.deb -exec mv -t .. {} +'],
['name': 'rtrlib',