Merge pull request #24454 from bluca/ci

Fix Ubuntu/SUSE mkosi

.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:

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