Merge pull request #31954 from DaanDeMeyer/mkosi

mkosi: Re-enable OpenSUSE build

.github/workflows/mkosi.yml

@@ -64,10 +64,8 @@ jobs:
             release: "39"
           - distro: fedora
             release: rawhide
-          # TODO: Re-enable once https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/AU4NWTBXNA7MVAUXWR74XYCHCSZN4Z4K/
-          # is resolved or https://build.opensuse.org/request/show/1152118 is merged.
-          # - distro: opensuse
-          #   release: tumbleweed
+          - distro: opensuse
+            release: tumbleweed
           - distro: centos
             release: "9"
 
@@ -76,7 +74,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
-    - uses: systemd/mkosi@1445b389750af22756c0fde6facc1f2f343340b4
+    - uses: systemd/mkosi@82108567f23cb29ecbea0a495833a18498eaafb9
 
     # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
     # immediately, we remove the files in the background. However, we first move them to a different location

mkosi.images/base/mkosi.conf

@@ -1,55 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Output]
-Format=directory
-
-[Content]
-Autologin=yes
-# Make sure we build the default initrd as part of the base image as it will have access to the systemd and
-# udev rpms which are built by the build scripts that are part of the base image.
-Bootable=yes
-# we want to build the UKI as part of the system image so make sure none are built here.
-Bootloader=none
-CleanPackageMetadata=no
-
-Packages=
-        acl
-        bash-completion
-        coreutils
-        diffutils
-        dnsmasq
-        dosfstools
-        e2fsprogs
-        findutils
-        gcc # Sanitizer libraries
-        gdb
-        git
-        grep
-        gzip
-        jq
-        kbd
-        kexec-tools
-        kmod
-        less
-        man
-        mtools
-        nano
-        nftables
-        openssl
-        python3
-        qrencode
-        rsync
-        sed
-        socat
-        strace
-        systemd
-        tar
-        tmux
-        tree
-        udev
-        util-linux
-        valgrind
-        wireguard-tools
-        xfsprogs
-        zsh
-        zstd

mkosi.images/base/mkosi.conf.d/10-centos/mkosi.conf

@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=centos
-
-[Content]
-Environment=
-        PKG_SUBDIR="centos"
-
-Packages=
-        kernel-modules # For squashfs support
-        rpmautospec-rpm-macros

mkosi.images/system/mkosi.conf

@@ -1,17 +1,51 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Config]
-Dependencies=base
-
-[Distribution]
-CacheOnly=metadata
-
 [Output]
 @Format=directory
 
 [Content]
-BaseTrees=%O/base
-Initrds=%O/base.initrd
+Autologin=yes
+Packages=
+        acl
+        bash-completion
+        coreutils
+        diffutils
+        dnsmasq
+        dosfstools
+        e2fsprogs
+        findutils
+        gcc # Sanitizer libraries
+        gdb
+        git
+        grep
+        gzip
+        jq
+        kbd
+        kexec-tools
+        kmod
+        less
+        man
+        mtools
+        nano
+        nftables
+        openssl
+        python3
+        qrencode
+        rsync
+        sed
+        socat
+        strace
+        systemd
+        tar
+        tmux
+        tree
+        udev
+        util-linux
+        valgrind
+        wireguard-tools
+        xfsprogs
+        zsh
+        zstd
 
 [Validation]
 @SecureBoot=yes

mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot

@@ -20,7 +20,8 @@ rpmbuild \
     -bb \
     --build-in-place \
     --with upstream \
-    $( ((WITH_TESTS)) || echo --nocheck) \
+    $( ((WITH_TESTS)) || echo "--nocheck") \
+    $( ((WITH_DOCS))  || echo "--without docs") \
     --define "_topdir /var/tmp" \
     --define "_sourcedir pkg/$PKG_SUBDIR" \
     --define "_rpmdir $PACKAGEDIR" \

mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf

@@ -2,3 +2,11 @@
 
 [Match]
 Distribution=centos
+
+[Content]
+Environment=
+        PKG_SUBDIR="centos"
+
+Packages=
+        kernel-modules # For squashfs support
+        rpmautospec-rpm-macros

pkg/fedora

@@ -1 +1 @@
-Subproject commit f1d38667ef013aa832f43ea7b5861efd29b09fee
+Subproject commit 976e1b0a6828cdc1ec6f3d227009dff5edfa744b