From b7a289ba66b8dfda85a1b8b82aae6176196673ef Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 11 Oct 2019 22:13:00 +0200 Subject: T1726: update Linux Firmware to a more recent version (2019-10-07) --- data/live-build-config/hooks/live/40-linux-firmware.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot index cd944faf..a7f431da 100755 --- a/data/live-build-config/hooks/live/40-linux-firmware.chroot +++ b/data/live-build-config/hooks/live/40-linux-firmware.chroot @@ -2,7 +2,7 @@ # To get the possibility of reproducible builds we pin to a specific commit # of the linux-firmware repository -COMMIT="7bc246451318b3536d9bfd3c4e46d541a9831b33" +COMMIT="aa95e90b2c638f1ca6647d12b2d1b18284428f9c" echo I: Retrieving Linux Firmware - commit ${COMMIT} -- cgit v1.2.3 From 088dbe5d1d5f4a383f600227cef9be6c806de02f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 13 Oct 2019 17:02:54 +0200 Subject: Kernel: T1728: update to Linux 4.19.79 --- data/defaults.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/defaults.json b/data/defaults.json index 81c52007..cc5da5fe 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "jessie", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "4.19.76", + "kernel_version": "4.19.79", "kernel_flavor": "amd64-vyos", "additional_repositories": [ "deb http://repo.saltstack.com/apt/debian/8/amd64/2017.7 jessie main", -- cgit v1.2.3 From 25bb74bc51f7ee36b8da834b8cb1ecc1aa1e5ea9 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 13 Oct 2019 19:01:44 +0200 Subject: Firmware: bail out when there is a download error --- data/live-build-config/hooks/live/40-linux-firmware.chroot | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot index a7f431da..7d0de1f2 100755 --- a/data/live-build-config/hooks/live/40-linux-firmware.chroot +++ b/data/live-build-config/hooks/live/40-linux-firmware.chroot @@ -4,10 +4,16 @@ # of the linux-firmware repository COMMIT="aa95e90b2c638f1ca6647d12b2d1b18284428f9c" -echo I: Retrieving Linux Firmware - commit ${COMMIT} +echo "I: Retrieving Linux Firmware - commit ${COMMIT}" + +ret=$(curl -w "%{http_code}" -o /tmp/linux-firmware-${COMMIT}.tar.gz \ + https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz) + +if [ "${ret}" != "200" ]; then + echo E: Received HTTP error code \"${ret}\" when downloading Linux Firmware ... + exit 1 +fi -curl -o /tmp/linux-firmware-${COMMIT}.tar.gz \ - https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /lib mv /lib/linux-firmware-${COMMIT} /lib/firmware rm -f /tmp/linux-firmware-${COMMIT}.tar.gz -- cgit v1.2.3 From bdce9244ff9acc57bf04a6c922cc78787aaa8174 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Mon, 28 Oct 2019 13:44:47 -0500 Subject: T1773: update Dockerfile for changes to libvyosconfig --- docker/Dockerfile | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3befeea0..b9fdae85 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -98,40 +98,24 @@ RUN apt-get update && apt-get install -y \ RUN curl https://raw.githubusercontent.com/ocaml/opam/2.0.2/shell/install.sh --output /tmp/opam_install.sh && \ sed -i 's/read BINDIR/BINDIR=""/' /tmp/opam_install.sh && sh /tmp/opam_install.sh && \ - opam init --root=/opt/opam --comp=4.07.0 --disable-sandboxing - -RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam install -y \ - oasis + opam init --root=/opt/opam --comp=4.08.0 --disable-sandboxing RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ - fileutils \ - lwt \ - lwt_ppx \ - lwt_log \ - ocplib-endian \ - ounit \ - pcre \ - ppx_deriving_yojson \ - sha \ - toml \ - xml-light \ - batteries \ - ocaml-protoc \ - ctypes-foreign \ - menhir + pcre RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ - ctypes + ctypes \ + ctypes-foreign \ + ctypes-build # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam pin add vyconf https://github.com/vyos/vyconf.git#51d79a3f -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#550048b3 -y # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ - cd libvyosconfig && git checkout 9a80a5d3 && \ + cd libvyosconfig && git checkout 5138b5eb && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb -- cgit v1.2.3 From ef8d9f1ef6553801cbba3ff19e3944f926ba9c79 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 30 Oct 2019 03:38:37 +0100 Subject: Docker: always use libvyosconfig HEAD revision --- docker/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b9fdae85..2a9006b6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -115,8 +115,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ - cd libvyosconfig && git checkout 5138b5eb && \ - dpkg-buildpackage -uc -us -tc -b && \ + cd libvyosconfig && dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb # Packages needed for vyatta-cfg -- cgit v1.2.3 From 2ec7f9b30676d0eb2792311e6be969006aeb9a06 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Tue, 5 Nov 2019 14:09:41 +0100 Subject: add build option for vep4600 --- Makefile | 17 +++++++++++++++++ tools/vep4600/10-eth0.link | 5 +++++ tools/vep4600/10-eth1.link | 5 +++++ tools/vep4600/10-eth2.link | 5 +++++ tools/vep4600/10-eth3.link | 5 +++++ tools/vep4600/10-eth4.link | 5 +++++ tools/vep4600/10-eth5.link | 5 +++++ tools/vep4600/10-eth6.link | 5 +++++ tools/vep4600/90-vep4600.chroot | 14 ++++++++++++++ tools/vep4600/99-default.link | 0 10 files changed, 66 insertions(+) create mode 100644 tools/vep4600/10-eth0.link create mode 100644 tools/vep4600/10-eth1.link create mode 100644 tools/vep4600/10-eth2.link create mode 100644 tools/vep4600/10-eth3.link create mode 100644 tools/vep4600/10-eth4.link create mode 100644 tools/vep4600/10-eth5.link create mode 100644 tools/vep4600/10-eth6.link create mode 100755 tools/vep4600/90-vep4600.chroot create mode 100644 tools/vep4600/99-default.link diff --git a/Makefile b/Makefile index c42766a4..9614ab67 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,10 @@ all: check_build_config: @scripts/check-config +.PHONY: vep4600_serial +vep4600_serial: + sed -i 's/union=overlay/union=overlay console=ttyS0,115200n8/g' scripts/live-build-config + .PHONY: prepare prepare: @set -e @@ -190,6 +194,19 @@ PACKET-debug: clean prepare cd .. @scripts/copy-image +.PHONY: vep4600 +.ONESHELL: +vep4600: check_build_config clean vep4600_serial prepare + @set -e + @echo "It's not like I'm building this specially for you or anything!" + mkdir -p build/config/includes.chroot/etc/systemd/network + cp tools/vep4600/90-vep4600.chroot build/config/hooks/live/ + cp tools/vep4600/*.link build/config/includes.chroot/etc/systemd/network + cd $(build_dir) + lb build 2>&1 | tee build.log + cd .. + @scripts/copy-image + .PHONY: clean .ONESHELL: clean: diff --git a/tools/vep4600/10-eth0.link b/tools/vep4600/10-eth0.link new file mode 100644 index 00000000..0885fd8b --- /dev/null +++ b/tools/vep4600/10-eth0.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:04:* + +[Link] +Name=eth0 diff --git a/tools/vep4600/10-eth1.link b/tools/vep4600/10-eth1.link new file mode 100644 index 00000000..9d33db13 --- /dev/null +++ b/tools/vep4600/10-eth1.link @@ -0,0 +1,5 @@ +[Match] +Path=0000:b8:00.0 + +[Link] +Name=eth1 diff --git a/tools/vep4600/10-eth2.link b/tools/vep4600/10-eth2.link new file mode 100644 index 00000000..60b88f83 --- /dev/null +++ b/tools/vep4600/10-eth2.link @@ -0,0 +1,5 @@ +[Match] +Path=0000:b8:00.1 + +[Link] +Name=eth2 diff --git a/tools/vep4600/10-eth3.link b/tools/vep4600/10-eth3.link new file mode 100644 index 00000000..0c37c8d4 --- /dev/null +++ b/tools/vep4600/10-eth3.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:02:00.1 + +[Link] +Name=eth3 diff --git a/tools/vep4600/10-eth4.link b/tools/vep4600/10-eth4.link new file mode 100644 index 00000000..7762187a --- /dev/null +++ b/tools/vep4600/10-eth4.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:02:00.0 + +[Link] +Name=eth4 diff --git a/tools/vep4600/10-eth5.link b/tools/vep4600/10-eth5.link new file mode 100644 index 00000000..10099488 --- /dev/null +++ b/tools/vep4600/10-eth5.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:02:00.3 + +[Link] +Name=eth5 diff --git a/tools/vep4600/10-eth6.link b/tools/vep4600/10-eth6.link new file mode 100644 index 00000000..f3a6fe00 --- /dev/null +++ b/tools/vep4600/10-eth6.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:02:00.2 + +[Link] +Name=eth6 diff --git a/tools/vep4600/90-vep4600.chroot b/tools/vep4600/90-vep4600.chroot new file mode 100755 index 00000000..c4bb7496 --- /dev/null +++ b/tools/vep4600/90-vep4600.chroot @@ -0,0 +1,14 @@ +#!/bin/sh +echo I: Change the default serial baud rate. +sed -i 's/9600/115200/g' /opt/vyatta/etc/config-migrate/migrate/system/3-to-4 + +echo "ShowStatus=yes" >> /etc/systemd/system.conf + +echo I: Disable default link rule. +rm /lib/systemd/network/99-default.link +touch /lib/systemd/network/99-default.link +rm /lib/udev/rules.d/65-vyatta-net.rules +touch /lib/udev/rules.d/65-vyatta-net.rules + +echo I: Update initramfs. +update-initramfs -u diff --git a/tools/vep4600/99-default.link b/tools/vep4600/99-default.link new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3 From 33c865b2ada281587b8d72d232db277973cf2a1e Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Tue, 5 Nov 2019 14:12:27 +0100 Subject: do not add the serial option for vep4600 --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9614ab67..7b319251 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,6 @@ all: check_build_config: @scripts/check-config -.PHONY: vep4600_serial -vep4600_serial: - sed -i 's/union=overlay/union=overlay console=ttyS0,115200n8/g' scripts/live-build-config - .PHONY: prepare prepare: @set -e @@ -196,7 +192,7 @@ PACKET-debug: clean prepare .PHONY: vep4600 .ONESHELL: -vep4600: check_build_config clean vep4600_serial prepare +vep4600: check_build_config clean prepare @set -e @echo "It's not like I'm building this specially for you or anything!" mkdir -p build/config/includes.chroot/etc/systemd/network -- cgit v1.2.3 From 5df80f6535cab017074d5e6bbdf5350b68bf0d75 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 6 Nov 2019 17:48:42 +0100 Subject: Revert "Docker: always use libvyosconfig HEAD revision" This reverts commit ef8d9f1ef6553801cbba3ff19e3944f926ba9c79. --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2a9006b6..b9fdae85 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -115,7 +115,8 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ - cd libvyosconfig && dpkg-buildpackage -uc -us -tc -b && \ + cd libvyosconfig && git checkout 5138b5eb && \ + dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb # Packages needed for vyatta-cfg -- cgit v1.2.3 From 263c2379eebca8161f0ab70ed55d0503beb1e913 Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 8 Nov 2019 10:08:11 -0800 Subject: vyos-qat: adding pkg dependency --- docker/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index b9fdae85..34733195 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -169,6 +169,11 @@ RUN apt-get update && apt-get install -y \ cmake \ liblua5.2-dev +# Packages needed for vyos-qat +RUN apt-get update && apt-get install -y \ + libboost-dev \ + libudev-dev + # Prerequisites for building rtrlib # see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html RUN apt-get update && apt-get install -y \ -- cgit v1.2.3 From 19b75a3339956319f244f40540ad7ba3af9b9389 Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 8 Nov 2019 10:14:42 -0800 Subject: docker: set always pull to use always latest container --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 59223b79..c2449fe5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -84,6 +84,7 @@ pipeline { filename 'Dockerfile' dir 'docker' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006' + alwaysPull true } } stages { -- cgit v1.2.3 From ca70fe2650eed43d651e3e60e5fd8890ebee07d1 Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 8 Nov 2019 10:24:15 -0800 Subject: Revert "docker: set always pull to use always latest container" This reverts commit 19b75a3339956319f244f40540ad7ba3af9b9389. I was on the wrong repo. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c2449fe5..59223b79 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -84,7 +84,6 @@ pipeline { filename 'Dockerfile' dir 'docker' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006' - alwaysPull true } } stages { -- cgit v1.2.3 From d68054f2930ea410ef04a4c24a938e9021307004 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 10 Nov 2019 13:20:22 +0100 Subject: Kernel: T1791: update to Linux 4.19.82 --- data/defaults.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/defaults.json b/data/defaults.json index cc5da5fe..08c0645d 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "jessie", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "4.19.79", + "kernel_version": "4.19.82", "kernel_flavor": "amd64-vyos", "additional_repositories": [ "deb http://repo.saltstack.com/apt/debian/8/amd64/2017.7 jessie main", -- cgit v1.2.3 From 2382c90dc7a30d17628a11f9ff41f8c63867887a Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 10 Nov 2019 22:12:45 +0100 Subject: hooks: fix installation of linux firmware files Firmware files have ben installed in wrong subdirectory (/lib/firmware/linux-firmware-) --- data/live-build-config/hooks/live/40-linux-firmware.chroot | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot index 7d0de1f2..d3f34dec 100755 --- a/data/live-build-config/hooks/live/40-linux-firmware.chroot +++ b/data/live-build-config/hooks/live/40-linux-firmware.chroot @@ -14,9 +14,10 @@ if [ "${ret}" != "200" ]; then exit 1 fi -tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /lib -mv /lib/linux-firmware-${COMMIT} /lib/firmware -rm -f /tmp/linux-firmware-${COMMIT}.tar.gz +tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /tmp +mkdir -p /lib/firmware +mv /tmp/linux-firmware-${COMMIT}/* /lib/firmware +rm -rf /tmp/linux-firmware-${COMMIT}* # We do not need all firmware blobs .. cleanup RM_FIRMWARE=" \ -- cgit v1.2.3 From a9759aa9c1426d066342429858163e2d97a5411b Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Tue, 12 Nov 2019 15:47:43 +0100 Subject: add api option to the ovf template --- scripts/template.ovf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/template.ovf b/scripts/template.ovf index 88ea5562..b0952c8c 100644 --- a/scripts/template.ovf +++ b/scripts/template.ovf @@ -78,6 +78,10 @@ NTP servers for this VM (comma separated). Leave blank if DHCP is desired. + + + API configuration key. Leave blank to not enable the API. + VM specific properties -- cgit v1.2.3 From 460dbeaa04213d722ea95069eca82be8edb345de Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 12 Nov 2019 22:12:46 +0100 Subject: Kernel: T1800: update to Linux 4.19.84 --- data/defaults.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/defaults.json b/data/defaults.json index 08c0645d..8ae218ee 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "jessie", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "4.19.82", + "kernel_version": "4.19.84", "kernel_flavor": "amd64-vyos", "additional_repositories": [ "deb http://repo.saltstack.com/apt/debian/8/amd64/2017.7 jessie main", -- cgit v1.2.3 From e7a834c040cbd9928e9f440534b214b11a4a04a4 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Thu, 14 Nov 2019 09:48:00 -0600 Subject: T1804: add python3-psutil to docker image python3-psutil is a dependency of vyos-1x and will be a requirement for the build if, for example, util.py is included in nosetests. --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 34733195..5c4342d5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -63,6 +63,7 @@ RUN apt-get update && apt-get install -y \ python3-coverage \ python3-sphinx \ python3-pystache \ + python3-psutil \ pkg-config \ debhelper \ jq -- cgit v1.2.3 From e598fd03b6a2fdd5a1b73966b7141d4fa40fb962 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 23 Nov 2019 20:56:50 +0100 Subject: wireless: T1627: migrate to vyos-1x --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index e8508599..7997f580 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -168,7 +168,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-webproxy', 'vyatta-cfg-quagga', 'vyatta-op-quagga', - 'vyatta-wireless', 'vyatta-wirelessmodem', 'vyatta-wanloadbalance', 'vyatta-netflow', -- cgit v1.2.3