From 255963ec3a092a3e8b8b0896b45b1ad3ec60f988 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 25 Aug 2022 23:02:29 +0100 Subject: [PATCH 1/2] mkosi: disable isc-dhcp-server again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's still failing in Ubuntu: ● isc-dhcp-server.service loaded failed failed ISC DHCP IPv4 server ● isc-dhcp-server6.service loaded failed failed ISC DHCP IPv6 server Just disable them via the kernel command line masking. --- .github/workflows/mkosi.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index c2c12f3393..acb215dc79 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -20,7 +20,8 @@ permissions: env: # Enable debug logging in systemd, but keep udev's log level to info, # since it's _very_ verbose in the QEMU task - KERNEL_CMDLINE: "systemd.unit=mkosi-check-and-shutdown.service !quiet systemd.log_level=debug systemd.log_target=console udev.log_level=info systemd.default_standard_output=journal+console" + # Disable the ISC DHCP servers, as they are failing in Ubuntu + KERNEL_CMDLINE: "systemd.unit=mkosi-check-and-shutdown.service !quiet systemd.log_level=debug systemd.log_target=console udev.log_level=info systemd.default_standard_output=journal+console systemd.mask=isc-dhcp-server6.service systemd.mask=isc-dhcp-server.service" jobs: ci: From a26e6bf8bfe1366590a4cce0ca9828d5ac4e140b Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 25 Aug 2022 23:59:04 +0100 Subject: [PATCH 2/2] mkosi: add back packages removed from OpenSUSE build Some packages were removed from the OpenSUSE build, which broke the unit tests. Add them back. Fixes: 37d35150cbb5 ("mkosi: Ensure we build all features/components in mkosi") --- mkosi.default.d/opensuse/10-mkosi.opensuse | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/mkosi.default.d/opensuse/10-mkosi.opensuse b/mkosi.default.d/opensuse/10-mkosi.opensuse index 8dbb1dc50f..b7514a575f 100644 --- a/mkosi.default.d/opensuse/10-mkosi.opensuse +++ b/mkosi.default.d/opensuse/10-mkosi.opensuse @@ -35,11 +35,16 @@ BuildPackages= bpftool dbus-1-devel docbook-xsl-stylesheets + fdupes + gcc-c++ glib2-devel glibc-locale + intltool libacl-devel + libapparmor-devel libblkid-devel libbpf-devel + libbz2-devel libcap-devel libcryptsetup-devel libcurl-devel @@ -57,10 +62,21 @@ BuildPackages= libselinux-devel libxkbcommon-devel libxslt-tools + liblz4-devel openssl-devel pam-devel pcre-devel + pciutils-devel python3-Jinja2 python3-lxml qrencode-devel + shadow + system-group-obsolete + system-user-bin + system-user-daemon + system-user-nobody + system-user-root + systemd-sysvinit + timezone tpm2-0-tss-devel + zlib-devel