diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-08-01 20:53:12 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-08-01 20:54:17 +0200 |
| commit | 9e2ba40939bbafba1a63e0a27a784965be8255a1 (patch) | |
| tree | 77e8bca5af465de25c0f340eee94e69b18cab492 | |
| parent | adfd8a58c66adb6e5a61bc8a00ec1d183368a196 (diff) | |
| download | vyos-build-9e2ba40939bbafba1a63e0a27a784965be8255a1.tar.gz vyos-build-9e2ba40939bbafba1a63e0a27a784965be8255a1.zip | |
frr: T5415: upgrade libyang library to v2.1.80
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rw-r--r-- | packages/frr/.gitignore | 1 | ||||
| -rw-r--r-- | packages/frr/Jenkinsfile | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index a4c2b931..8b33d506 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -211,6 +211,11 @@ 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) && \ + 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 + # Packages needed for vyos-1x RUN pip install --break-system-packages \ git+https://github.com/aristanetworks/j2lint.git@341b5d5db86 \ diff --git a/packages/frr/.gitignore b/packages/frr/.gitignore index 9aefeba5..8afd14e8 100644 --- a/packages/frr/.gitignore +++ b/packages/frr/.gitignore @@ -1,2 +1,3 @@ frr/ rtrlib/ +libyang/ diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile index 0e82657d..26bcc369 100644 --- a/packages/frr/Jenkinsfile +++ b/packages/frr/Jenkinsfile @@ -21,6 +21,10 @@ @Library('vyos-build@current')_ def pkgList = [ + ['name': 'libyang', + 'scmCommit': 'v2.1.80', + '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', 'scmCommit': 'v0.8.0', 'scmUrl': 'https://github.com/rtrlib/rtrlib.git', |