matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[docker-frr]: Move FRR from 4.0 to 6.0.2 and make the new frr version and debian package compile (#2454)

Browse Source 
Signed-off-by: nikos <ntriantafillis@gmail.com>
This commit is contained in:
Nikos 2019-01-16 18:34:41 -08:00 committed by lguohan
parent 8542a291e1
commit 4ed5cb4ef1
5 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockers/docker-fpm-frr/Dockerfile.j2
View File

@ -13,7 +13,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update
# Install required packages
RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4 libc-ares2 iproute libpython2.7
RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4 libc-ares2 iproute libpython2.7 libjson-c2 logrotate
{% if docker_fpm_frr_debs.strip() -%}
# Copy locally-built Debian package dependencies

4
rules/config
View File

@ -82,5 +82,5 @@ DEFAULT_KERNEL_PROCURE_METHOD = build
# host, then either the appropriate account and group will need to be created on the host
# manually or changes need to be made when the image is built to create the account and
# group during installation.
FRR_USER_UID = 1000
FRR_USER_GID = 1000
FRR_USER_UID = 300
FRR_USER_GID = 300

2
rules/frr.mk
View File

@ -1,6 +1,6 @@
# FRRouting (frr) package
FRR_VERSION = 4.0
FRR_VERSION = 6.0.2
export FRR_VERSION
FRR = frr_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb

31
src/sonic-frr/Makefile
View File

@ -9,32 +9,13 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Build the package
pushd ./frr
# clean up the previous build
rm -rf debian
rm -f frr*.tar.gz
rm -f frr*.tar.xz
rm -f frr*.dsc
# make a dist tarball
./bootstrap.sh
./configure
make dist
# Create backports debian sources
cp -a debianpkg debian
make -f debian/rules backports
# new directory to build the package
rm -rf frrpkg
mkdir frrpkg
cd frrpkg
tar xf ../frr_*.orig.tar.gz
cd frr*
tar xf ../../frr_*sonic.debian8*.debian.tar.xz
# build package
dpkg-buildpackage -rfakeroot -b -us -uc
# This could very well be tools/tarsource.sh -V -e sonic
tools/tarsource.sh -V
# This is a no-op but here in case the changelog stops being a symlink
debchange -b -v $(FRR_VERSION)-1~sonic.debian8+1 'SONiC FRR debian package build'
dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib
cd ..
mv frr_$(FRR_VERSION)-*_amd64.deb frr_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb
mv $* $(DEST)/
popd

2
src/sonic-frr/frr

@ -1 +1 @@
Subproject commit aaf54fda1378167d7ce317f5b4a16c3a61ef59eb
Subproject commit 5a35fd375978dd7fce99c4b8ba84b0cdd1f32ac3