From b2b3b4ed8460d5a77785dd834c05e208fbd15d5b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 26 Mar 2024 11:16:55 +0100 Subject: [PATCH 1/5] mkosi: Update to latest --- .github/workflows/mkosi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index f9df0a22ba..2d54dfcbb5 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -76,7 +76,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 From c2720fa55c0de0813c22edbecd5a220c83224a5a Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 26 Mar 2024 10:42:00 +0100 Subject: [PATCH 2/5] mkosi: Re-enable OpenSUSE build --- .github/workflows/mkosi.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 2d54dfcbb5..c5b72c00cd 100644 --- a/.github/workflows/mkosi.yml +++ b/.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" From 6327988d65a19ab2d8b9a5fb29116c8ff4c4a606 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 27 Mar 2024 11:07:52 +0100 Subject: [PATCH 3/5] mkosi: Merge base and system images The only reason to have these split up is to be able to build extension images that use the base image as a base tree and install extra packages. Until we have such a use case, let's merge the base and system images to simplify things a bit. We keep the mkosi.images/ directory to not cause too many conflicts with the integration tests PR. --- mkosi.images/base/mkosi.conf | 55 ------------------- .../base/mkosi.conf.d/10-centos/mkosi.conf | 12 ---- mkosi.images/system/mkosi.conf | 50 ++++++++++++++--- .../10-arch/initrd/mkosi.postinst | 0 .../mkosi.conf.d/10-arch/mkosi.build.chroot | 0 .../mkosi.conf.d/10-arch/mkosi.conf | 0 .../mkosi.conf.d/10-arch/mkosi.prepare | 0 .../10-centos-fedora/initrd/mkosi.postinst | 0 .../10-centos-fedora/mkosi.build.chroot | 0 .../mkosi.conf.d/10-centos-fedora/mkosi.conf | 0 .../10-centos-fedora/mkosi.prepare | 0 .../system/mkosi.conf.d/10-centos/mkosi.conf | 8 +++ .../10-debian-ubuntu/initrd/mkosi.postinst | 0 .../10-debian-ubuntu/mkosi.build.chroot | 0 .../mkosi.conf.d/10-debian-ubuntu/mkosi.conf | 0 .../10-debian-ubuntu/mkosi.prepare | 0 .../mkosi.conf.d/10-debian/mkosi.conf | 0 .../10-debian/mkosi.conf.d/amd64.conf | 0 .../10-debian/mkosi.conf.d/arm64.conf | 0 .../mkosi.conf.d/10-fedora/mkosi.conf | 0 .../10-opensuse/initrd/mkosi.postinst | 0 .../10-opensuse/mkosi.build.chroot | 0 .../mkosi.conf.d/10-opensuse/mkosi.conf | 0 .../mkosi.conf.d/10-opensuse/mkosi.prepare | 0 .../mkosi.conf.d/10-ubuntu/mkosi.conf | 0 .../{base => system}/mkosi.extra/etc/issue | 0 .../journald.conf.d/50-persistent.conf | 0 .../lib/systemd/mkosi-check-and-shutdown.sh | 0 .../lib/systemd/system-preset/00-mkosi.preset | 0 .../lib/systemd/system-preset/99-mkosi.preset | 0 .../system/mkosi-check-and-shutdown.service | 0 .../usr/lib/tmpfiles.d/99-mkosi.conf | 0 .../usr/lib/tmpfiles.d/locale.conf | 0 .../share/factory/mkosi/gdbinit.d/systemd.gdb | 0 mkosi.images/{base => system}/mkosi.finalize | 0 mkosi.images/{base => system}/mkosi.postinst | 0 .../{base => system}/mkosi.postinst.chroot | 0 mkosi.images/{base => system}/mkosi.sync | 0 38 files changed, 50 insertions(+), 75 deletions(-) delete mode 100644 mkosi.images/base/mkosi.conf delete mode 100644 mkosi.images/base/mkosi.conf.d/10-centos/mkosi.conf rename mkosi.images/{base => system}/mkosi.conf.d/10-arch/initrd/mkosi.postinst (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-arch/mkosi.build.chroot (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-arch/mkosi.conf (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-arch/mkosi.prepare (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-centos-fedora/initrd/mkosi.postinst (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-centos-fedora/mkosi.conf (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-centos-fedora/mkosi.prepare (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-debian-ubuntu/initrd/mkosi.postinst (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-debian-ubuntu/mkosi.conf (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-debian-ubuntu/mkosi.prepare (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-debian/mkosi.conf (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-debian/mkosi.conf.d/amd64.conf (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-fedora/mkosi.conf (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-opensuse/mkosi.build.chroot (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-opensuse/mkosi.conf (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-opensuse/mkosi.prepare (100%) rename mkosi.images/{base => system}/mkosi.conf.d/10-ubuntu/mkosi.conf (100%) rename mkosi.images/{base => system}/mkosi.extra/etc/issue (100%) rename mkosi.images/{base => system}/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf (100%) rename mkosi.images/{base => system}/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh (100%) rename mkosi.images/{base => system}/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset (100%) rename mkosi.images/{base => system}/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset (100%) rename mkosi.images/{base => system}/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service (100%) rename mkosi.images/{base => system}/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf (100%) rename mkosi.images/{base => system}/mkosi.extra/usr/lib/tmpfiles.d/locale.conf (100%) rename mkosi.images/{base => system}/mkosi.extra/usr/share/factory/mkosi/gdbinit.d/systemd.gdb (100%) rename mkosi.images/{base => system}/mkosi.finalize (100%) rename mkosi.images/{base => system}/mkosi.postinst (100%) rename mkosi.images/{base => system}/mkosi.postinst.chroot (100%) rename mkosi.images/{base => system}/mkosi.sync (100%) diff --git a/mkosi.images/base/mkosi.conf b/mkosi.images/base/mkosi.conf deleted file mode 100644 index aed8bb5ba8..0000000000 --- a/mkosi.images/base/mkosi.conf +++ /dev/null @@ -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 diff --git a/mkosi.images/base/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.images/base/mkosi.conf.d/10-centos/mkosi.conf deleted file mode 100644 index 0f57319c2a..0000000000 --- a/mkosi.images/base/mkosi.conf.d/10-centos/mkosi.conf +++ /dev/null @@ -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 diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf index 9937ad3a98..ccb719a512 100644 --- a/mkosi.images/system/mkosi.conf +++ b/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 diff --git a/mkosi.images/base/mkosi.conf.d/10-arch/initrd/mkosi.postinst b/mkosi.images/system/mkosi.conf.d/10-arch/initrd/mkosi.postinst similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-arch/initrd/mkosi.postinst rename to mkosi.images/system/mkosi.conf.d/10-arch/initrd/mkosi.postinst diff --git a/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot rename to mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot diff --git a/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-arch/mkosi.conf rename to mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf diff --git a/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.prepare b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.prepare similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-arch/mkosi.prepare rename to mkosi.images/system/mkosi.conf.d/10-arch/mkosi.prepare diff --git a/mkosi.images/base/mkosi.conf.d/10-centos-fedora/initrd/mkosi.postinst b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/initrd/mkosi.postinst similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-centos-fedora/initrd/mkosi.postinst rename to mkosi.images/system/mkosi.conf.d/10-centos-fedora/initrd/mkosi.postinst diff --git a/mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot rename to mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot diff --git a/mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.conf rename to mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf diff --git a/mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.prepare b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.prepare similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-centos-fedora/mkosi.prepare rename to mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.prepare diff --git a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf index af4862d4b1..0f57319c2a 100644 --- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf +++ b/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 diff --git a/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/initrd/mkosi.postinst b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/initrd/mkosi.postinst similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/initrd/mkosi.postinst rename to mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/initrd/mkosi.postinst diff --git a/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot rename to mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot diff --git a/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.conf rename to mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf diff --git a/mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.prepare b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.prepare similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-debian-ubuntu/mkosi.prepare rename to mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.prepare diff --git a/mkosi.images/base/mkosi.conf.d/10-debian/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-debian/mkosi.conf rename to mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf diff --git a/mkosi.images/base/mkosi.conf.d/10-debian/mkosi.conf.d/amd64.conf b/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/amd64.conf similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-debian/mkosi.conf.d/amd64.conf rename to mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/amd64.conf diff --git a/mkosi.images/base/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf b/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf rename to mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf diff --git a/mkosi.images/base/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-fedora/mkosi.conf rename to mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf diff --git a/mkosi.images/base/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst b/mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst rename to mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst diff --git a/mkosi.images/base/mkosi.conf.d/10-opensuse/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-opensuse/mkosi.build.chroot rename to mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot diff --git a/mkosi.images/base/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-opensuse/mkosi.conf rename to mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf diff --git a/mkosi.images/base/mkosi.conf.d/10-opensuse/mkosi.prepare b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-opensuse/mkosi.prepare rename to mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare diff --git a/mkosi.images/base/mkosi.conf.d/10-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf similarity index 100% rename from mkosi.images/base/mkosi.conf.d/10-ubuntu/mkosi.conf rename to mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf diff --git a/mkosi.images/base/mkosi.extra/etc/issue b/mkosi.images/system/mkosi.extra/etc/issue similarity index 100% rename from mkosi.images/base/mkosi.extra/etc/issue rename to mkosi.images/system/mkosi.extra/etc/issue diff --git a/mkosi.images/base/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf b/mkosi.images/system/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf similarity index 100% rename from mkosi.images/base/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf rename to mkosi.images/system/mkosi.extra/usr/lib/systemd/journald.conf.d/50-persistent.conf diff --git a/mkosi.images/base/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh b/mkosi.images/system/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh similarity index 100% rename from mkosi.images/base/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh rename to mkosi.images/system/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh diff --git a/mkosi.images/base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset b/mkosi.images/system/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset similarity index 100% rename from mkosi.images/base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset rename to mkosi.images/system/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset diff --git a/mkosi.images/base/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset b/mkosi.images/system/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset similarity index 100% rename from mkosi.images/base/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset rename to mkosi.images/system/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset diff --git a/mkosi.images/base/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service b/mkosi.images/system/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service similarity index 100% rename from mkosi.images/base/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service rename to mkosi.images/system/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service diff --git a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf b/mkosi.images/system/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf similarity index 100% rename from mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf rename to mkosi.images/system/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf diff --git a/mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/locale.conf b/mkosi.images/system/mkosi.extra/usr/lib/tmpfiles.d/locale.conf similarity index 100% rename from mkosi.images/base/mkosi.extra/usr/lib/tmpfiles.d/locale.conf rename to mkosi.images/system/mkosi.extra/usr/lib/tmpfiles.d/locale.conf diff --git a/mkosi.images/base/mkosi.extra/usr/share/factory/mkosi/gdbinit.d/systemd.gdb b/mkosi.images/system/mkosi.extra/usr/share/factory/mkosi/gdbinit.d/systemd.gdb similarity index 100% rename from mkosi.images/base/mkosi.extra/usr/share/factory/mkosi/gdbinit.d/systemd.gdb rename to mkosi.images/system/mkosi.extra/usr/share/factory/mkosi/gdbinit.d/systemd.gdb diff --git a/mkosi.images/base/mkosi.finalize b/mkosi.images/system/mkosi.finalize similarity index 100% rename from mkosi.images/base/mkosi.finalize rename to mkosi.images/system/mkosi.finalize diff --git a/mkosi.images/base/mkosi.postinst b/mkosi.images/system/mkosi.postinst similarity index 100% rename from mkosi.images/base/mkosi.postinst rename to mkosi.images/system/mkosi.postinst diff --git a/mkosi.images/base/mkosi.postinst.chroot b/mkosi.images/system/mkosi.postinst.chroot similarity index 100% rename from mkosi.images/base/mkosi.postinst.chroot rename to mkosi.images/system/mkosi.postinst.chroot diff --git a/mkosi.images/base/mkosi.sync b/mkosi.images/system/mkosi.sync similarity index 100% rename from mkosi.images/base/mkosi.sync rename to mkosi.images/system/mkosi.sync From afc6ecd9cbeb784fc29e01d2c545bf9f41b05351 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 27 Mar 2024 12:58:17 +0100 Subject: [PATCH 4/5] Update pkg/fedora to latest --- pkg/fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/fedora b/pkg/fedora index f1d38667ef..976e1b0a68 160000 --- a/pkg/fedora +++ b/pkg/fedora @@ -1 +1 @@ -Subproject commit f1d38667ef013aa832f43ea7b5861efd29b09fee +Subproject commit 976e1b0a6828cdc1ec6f3d227009dff5edfa744b From 0a6bf709dd55ee4c4ecb40becb7d9b506aa020a2 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 27 Mar 2024 13:00:11 +0100 Subject: [PATCH 5/5] mkosi: Specify --without docs if needed for fedora/centos --- .../system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot index 73c1910f8b..b8b130e0e8 100755 --- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot +++ b/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" \