diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-05-04 21:31:51 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-05-04 21:31:51 +0200 |
| commit | f2d58f06e9a36d511b56a3ba933f482c362f59e3 (patch) | |
| tree | 6618391c7fd57e8728acbcda3ca364f3bbaaf357 | |
| parent | 85aa235ecdc077c594379bceecad45fd542d90d1 (diff) | |
| download | vyos-build-f2d58f06e9a36d511b56a3ba933f482c362f59e3.tar.gz vyos-build-f2d58f06e9a36d511b56a3ba933f482c362f59e3.zip | |
frr: bugfix rtrlib v0.8.0 dependency update
| -rw-r--r-- | docker/Dockerfile | 8 | ||||
| -rw-r--r-- | packages/frr/Jenkinsfile | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 342264c9..878b6b41 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -255,11 +255,9 @@ RUN apt-get update && apt-get install -y \ doxygen # Build rtrlib release 0.8.0 -RUN export RTRLIB_VERSION="0.8.0" \ - export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \ - wget -P /tmp https://github.com/rtrlib/rtrlib/archive/v${RTRLIB_VERSION}.tar.gz && \ - tar xf /tmp/v${RTRLIB_VERSION}.tar.gz -C /tmp && \ - cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ +RUN export RTRLIB_VERSION="0.8.0" export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \ + git clone https://github.com/rtrlib/rtrlib.git /tmp/rtrlib && cd /tmp/rtrlib && \ + dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../librtr0*_${ARCH}.deb ../librtr-dev*_${ARCH}.deb ../rtr-tools*_${ARCH}.deb # Packages needed to build libyang2 diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile index 2005ea39..a22f6fd8 100644 --- a/packages/frr/Jenkinsfile +++ b/packages/frr/Jenkinsfile @@ -25,7 +25,10 @@ def pkgList = [ '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': 'rtrlib', + 'scmCommit': 'v0.8.0', + 'scmUrl': 'https://github.com/rtrlib/rtrlib.git', + 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], ['name': 'frr', 'scmCommit': 'stable/8.2', 'scmUrl': 'https://github.com/FRRouting/frr.git', |