From 6ff4b31c4a75583424edd0deb479d1dacc42d6b3 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sat, 4 May 2024 16:15:54 +0200 Subject: 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. --- packages/frr/Jenkinsfile | 2 +- packages/frr/build-frr.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/frr') 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" -- cgit v1.2.3