diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-12-22 17:24:22 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-12-22 17:24:22 +0100 |
| commit | f3f962fd2bafc502da4e5657c96166e19a10f22b (patch) | |
| tree | dacda14eb33be031216cee4767a1f17581717317 | |
| parent | 7743524c0734de20d0b42b9154978368c3f01626 (diff) | |
| download | vyos-build-f3f962fd2bafc502da4e5657c96166e19a10f22b.tar.gz vyos-build-f3f962fd2bafc502da4e5657c96166e19a10f22b.zip | |
frr: T3146: upgrade to Free Range Routing 7.5 series
| -rw-r--r-- | data/live-build-config/archives/bullseye.list.chroot | 1 | ||||
| -rw-r--r-- | data/live-build-config/archives/bullseye.pref.chroot | 7 | ||||
| -rw-r--r-- | docker/Dockerfile | 13 | ||||
| -rw-r--r-- | packages/frr/Jenkinsfile | 2 |
4 files changed, 19 insertions, 4 deletions
diff --git a/data/live-build-config/archives/bullseye.list.chroot b/data/live-build-config/archives/bullseye.list.chroot new file mode 100644 index 00000000..16eb57e5 --- /dev/null +++ b/data/live-build-config/archives/bullseye.list.chroot @@ -0,0 +1 @@ +deb http://deb.debian.org/debian/ bullseye main diff --git a/data/live-build-config/archives/bullseye.pref.chroot b/data/live-build-config/archives/bullseye.pref.chroot new file mode 100644 index 00000000..d8fc2a57 --- /dev/null +++ b/data/live-build-config/archives/bullseye.pref.chroot @@ -0,0 +1,7 @@ +Package: libyang1 +Pin: release n=bullseye +Pin-Priority: 600 + +Package: * +Pin: release n=bullseye +Pin-Priority: -10 diff --git a/docker/Dockerfile b/docker/Dockerfile index 6964a289..a2ccac1f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -257,12 +257,19 @@ RUN export RTRLIB_VERSION="0.6.3" && \ cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../librtr*_$(dpkg-architecture -qDEB_HOST_ARCH).deb ../librtr*_all.deb -# Packages needed to build frr itself +# Upgrading to FRR 7.5 requires a more recent version of libyang which is only +# available from Debian Bullseye +RUN echo "deb http://deb.debian.org/debian/ bullseye main" \ + > /etc/apt/sources.list.d/bullseye-backports.list && \ + apt-get update && apt-get install -y -t bullseye \ + libyang-dev \ + libyang1; \ + rm -f /etc/apt/sources.list.d/bullseye-backports.list + +# Packages needed to build FRR itself # https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst # for more info RUN apt-get update && apt-get install -y \ - libyang-dev \ - libyang0.16 \ chrpath \ install-info \ libjson-c-dev \ diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile index 1fc835c0..2129f379 100644 --- a/packages/frr/Jenkinsfile +++ b/packages/frr/Jenkinsfile @@ -22,7 +22,7 @@ def pkgList = [ ['name': 'frr', - 'scmCommit': 'stable/7.4', + 'scmCommit': 'stable/7.5', 'scmUrl': 'https://github.com/FRRouting/frr.git', 'buildCmd': '''cd ..; ./build-frr.sh'''], ] |