diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-04 16:15:54 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-05-04 16:15:54 +0200 |
| commit | 6ff4b31c4a75583424edd0deb479d1dacc42d6b3 (patch) | |
| tree | d5450acc2aa3992a1a41965440d5fa16f577b70d /packages | |
| parent | 884de8dc760b461246fe001b662946970da6f930 (diff) | |
| download | vyos-build-6ff4b31c4a75583424edd0deb479d1dacc42d6b3.tar.gz vyos-build-6ff4b31c4a75583424edd0deb479d1dacc42d6b3.zip | |
Docker: T6283: T6250: no need to include rtrlib and libyang in general
FRR build tracks the rtrlib and libyang version, so only one place is needed to
build to sources.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/frr/Jenkinsfile | 2 | ||||
| -rwxr-xr-x | packages/frr/build-frr.sh | 2 |
2 files changed, 2 insertions, 2 deletions
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" |