From d50707bb295dbd4bc50e3d0301fc8be605448429 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 4 Sep 2024 20:44:01 +0200 Subject: [PATCH 1/7] T1416: remove deprecated default-union-grub-entry --- .../vyatta/etc/grub/default-union-grub-entry | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry deleted file mode 100644 index 49f4afc4ab..0000000000 --- a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry +++ /dev/null @@ -1,20 +0,0 @@ -menuentry "VyOS (KVM console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=ttyS0,115200 console=tty0 - initrd /boot//initrd.img -} - -menuentry "VyOS (Serial console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=tty0 console=ttyS0,115200 - initrd /boot//initrd.img -} - -menuentry "Lost password change (KVM console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=ttyS0,115200 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset - initrd /boot//initrd.img -} - -menuentry "Lost password change (Serial console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=tty0 console=ttyS0,115200 init=/opt/vyatta/sbin/standalone_root_pw_reset - initrd /boot//initrd.img -} - From 388efd9f7847a21782e7dd98581beeabb1a0f0ba Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 4 Sep 2024 20:45:34 +0200 Subject: [PATCH 2/7] Makefile: T861: add possibility to pass CLI options to check-qemu-install We can now pass any arbitrary option to the check-qemu-install script by calling: make test -- --bar-option or make testc -- --foo-option please note the -- which is not a typo but rather signals the end of options and disables further option processing and passes the options down to the next script. --- Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 48225d6c9f..34381bd397 100644 --- a/Makefile +++ b/Makefile @@ -31,28 +31,29 @@ test-no-interfaces: checkiso .PHONY: testc .ONESHELL: testc: checkiso - scripts/check-qemu-install --debug --configd --configtest build/live-image-amd64.hybrid.iso + scripts/check-qemu-install --debug --configd --configtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS)) .PHONY: testraid .ONESHELL: testraid: checkiso - scripts/check-qemu-install --debug --configd --raid --configtest build/live-image-amd64.hybrid.iso + scripts/check-qemu-install --debug --configd --raid --configtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS)) + +.PHONY: testtpm +.ONESHELL: +testtpm: checkiso + scripts/check-qemu-install --debug --tpmtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS)) .PHONY: qemu-live .ONESHELL: qemu-live: checkiso - scripts/check-qemu-install --qemu-cmd build/live-image-amd64.hybrid.iso + scripts/check-qemu-install --qemu-cmd --uefi build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS)) + .PHONE: oci .ONESHELL: oci: checkiso scripts/iso-to-oci build/live-image-amd64.hybrid.iso -.PHONY: testtpm -.ONESHELL: -testtpm: checkiso - scripts/check-qemu-install --debug --tpmtest build/live-image-amd64.hybrid.iso - .PHONY: clean .ONESHELL: clean: From 3e9cda21c8ae127f7c2d4cf45d198bebb9ae45a4 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 4 Sep 2024 20:55:23 +0200 Subject: [PATCH 3/7] Docker: T861: fix warnings about latest ENV key=value syntax --- docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9bcc234f67..40b2067de5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -50,7 +50,7 @@ LABEL authors="VyOS Maintainers " \ org.opencontainers.image.title="vyos-build" \ org.opencontainers.image.description="Container to build VyOS ISO" \ org.opencontainers.image.base.name="docker.io/debian/debian:bookworm" -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive RUN /bin/echo -e 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommends @@ -60,9 +60,9 @@ RUN apt-get update && apt-get install -y \ locales RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen -ENV LANG en_US.utf8 +ENV LANG=en_US.utf8 -ENV OCAML_VERSION 4.14.2 +ENV OCAML_VERSION=4.14.2 # Base packaged needed to build packages and their package dependencies RUN apt-get update && apt-get install -y \ From f53921911efa73d53b3dc20bddac7203976219e1 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 4 Sep 2024 21:05:51 +0200 Subject: [PATCH 4/7] telegraf: T3664: remove package dependency Telegraf is not a full VyOS feature with a proper dependency in place via vyos-1x package. Drop this temporary dependency. --- data/architectures/amd64.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 5f9a764592..7a781869d1 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -15,5 +15,4 @@ packages = [ "mlnx-ofed-kernel-modules", "mlnx-tools", "openvpn-dco", - "telegraf" ] From 3170bcaf2c8355d65c0c6931e42afee657c28655 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 4 Sep 2024 21:08:55 +0200 Subject: [PATCH 5/7] build: T3664: remove unused psutil dependency --- scripts/image-build/build-vyos-image | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index c13d760716..a0acd18478 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -43,10 +43,9 @@ try: import tomli import jinja2 import git - import psutil except ModuleNotFoundError as e: print(f"E: Cannot load required library {e}") - print("E: Please make sure the following Python3 modules are installed: tomli jinja2 git psutil") + print("E: Please make sure the following Python3 modules are installed: tomli jinja2 git") sys.exit(1) # Import local defaults From d851548515ce3aa680728f33c0b2ae2ccbda85fc Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 4 Sep 2024 21:34:41 +0200 Subject: [PATCH 6/7] Makefile: T2640: fix PHONY typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix typo added in commit 499e8e1cbb ("Makefile: T2640: add helper to convert ISO to OCI image to start a co…ntainer") should be PHONY over PHONE --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 34381bd397..6d0f0d4769 100644 --- a/Makefile +++ b/Makefile @@ -48,8 +48,7 @@ testtpm: checkiso qemu-live: checkiso scripts/check-qemu-install --qemu-cmd --uefi build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS)) - -.PHONE: oci +.PHONY: oci .ONESHELL: oci: checkiso scripts/iso-to-oci build/live-image-amd64.hybrid.iso From 68671774f9161e502b99f9a2aeb63f9427a6f63c Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 4 Sep 2024 21:19:45 +0200 Subject: [PATCH 7/7] T4974: remove package openvpn-dco as it has a proper dependency via vyos-1x --- data/architectures/amd64.toml | 1 - data/architectures/arm64.toml | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 7a781869d1..44a203a22b 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -14,5 +14,4 @@ packages = [ "vyos-intel-ixgbevf", "mlnx-ofed-kernel-modules", "mlnx-tools", - "openvpn-dco", ] diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml index ff95d0cf4b..22f1fd1095 100644 --- a/data/architectures/arm64.toml +++ b/data/architectures/arm64.toml @@ -5,5 +5,7 @@ additional_repositories = [ kernel_flavor = "arm64-vyos" # Packages included in ARM64 images by default -packages = ["grub-efi-arm64", "openvpn-dco"] +packages = [ + "grub-efi-arm64", +] bootloaders = "grub-efi"