diff options
| -rw-r--r-- | docker/Dockerfile | 12 | ||||
| -rw-r--r-- | packages/frr/Jenkinsfile | 2 | ||||
| -rwxr-xr-x | packages/frr/build-frr.sh | 2 |
3 files changed, 2 insertions, 14 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index de6b147f..1fa9b213 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -222,18 +222,6 @@ RUN apt-get update && apt-get install -y \ build-essential RUN gem install --no-document fpm -# Build rtrlib release 0.8.0 -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 && \ - mk-build-deps --install --tool "apt-get --yes --no-install-recommends" && \ - 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.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 - # Packages needed for vyos-1x RUN pip install --break-system-packages \ git+https://github.com/aristanetworks/j2lint.git@341b5d5db86 \ diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile index 2c309443..441b1681 100644 --- a/packages/frr/Jenkinsfile +++ b/packages/frr/Jenkinsfile @@ -32,7 +32,7 @@ def pkgList = [ ['name': 'frr', 'scmCommit': 'stable/9.1', 'scmUrl': 'https://github.com/FRRouting/frr.git', - 'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; cd ..; ./build-frr.sh'], + 'buildCmd': 'sudo dpkg -i ../*.deb; sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; 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 8be3cb4b..7171a883 100755 --- a/packages/frr/build-frr.sh +++ b/packages/frr/build-frr.sh @@ -31,7 +31,7 @@ fi echo "I: Ensure Debian build dependencies are met" sudo apt-get -y install chrpath gawk install-info libcap-dev libjson-c-dev librtr-dev -sudo apt-get -y install libpam-dev libprotobuf-c-dev libpython3-dev:native libsnmp-dev protobuf-c-compiler python3-dev:native texinfo lua5.3 +sudo apt-get -y install libpam-dev libprotobuf-c-dev libpython3-dev:native python3-sphinx:native libsnmp-dev protobuf-c-compiler python3-dev:native texinfo lua5.3 # Build Debian FRR package echo "I: Build Debian FRR Package" |