]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Adapt configuration to take into account configuration rework
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 8 Jul 2024 10:59:52 +0000 (12:59 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 9 Jul 2024 06:07:09 +0000 (08:07 +0200)
In https://github.com/systemd/mkosi/pull/2847, the '@' specifier is
removed, CLI arguments take priority over configuration files again
and the "main" image is defined at the top level instead of in
mkosi.images/. Additionally, not every setting from the top level
configuration is inherited by the images in mkosi.images/ anymore,
only settings which make sense to be inherited are inherited.

This commit gets rid of all the usages of '@', moves the "main" image
configuration from mkosi.images/system to the top level and gets rid
of various hacks we had in place to deal with quirks of the old
configuration parsing logic.

We also remove usages of Images= and --append as these options are
removed by the mentioned PR.

84 files changed:
.github/workflows/mkosi.yml
docs/HACKING.md
mkosi.clean [moved from mkosi.images/system/mkosi.clean with 100% similarity]
mkosi.conf
mkosi.conf.d/10-arch/mkosi.build.chroot [moved from mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot with 100% similarity]
mkosi.conf.d/10-arch/mkosi.conf [moved from mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf with 100% similarity]
mkosi.conf.d/10-arch/mkosi.conf.d/10-debug.conf [moved from mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf.d/10-debug.conf with 100% similarity]
mkosi.conf.d/10-arch/mkosi.prepare [moved from mkosi.images/system/mkosi.conf.d/10-arch/mkosi.prepare with 100% similarity]
mkosi.conf.d/10-centos-fedora/mkosi.build.chroot [moved from mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot with 100% similarity]
mkosi.conf.d/10-centos-fedora/mkosi.conf [moved from mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf with 100% similarity]
mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-debug.conf [moved from mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-debug.conf with 100% similarity]
mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf [moved from mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf with 100% similarity]
mkosi.conf.d/10-centos-fedora/mkosi.prepare [moved from mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.prepare with 100% similarity]
mkosi.conf.d/10-centos.conf [deleted file]
mkosi.conf.d/10-centos/mkosi.conf [moved from mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf with 84% similarity]
mkosi.conf.d/10-debian-ubuntu/mkosi-pinning.pref [moved from mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi-pinning.pref with 100% similarity]
mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot [moved from mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot with 100% similarity]
mkosi.conf.d/10-debian-ubuntu/mkosi.conf [moved from mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf with 100% similarity]
mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf [moved from mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf with 100% similarity]
mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/efi.conf [moved from mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/efi.conf with 100% similarity]
mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/network.conf [moved from mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/network.conf with 100% similarity]
mkosi.conf.d/10-debian-ubuntu/mkosi.postinst [moved from mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.postinst with 100% similarity]
mkosi.conf.d/10-debian-ubuntu/mkosi.prepare [moved from mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.prepare with 100% similarity]
mkosi.conf.d/10-debian.conf [deleted file]
mkosi.conf.d/10-debian/mkosi.conf [moved from mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf with 78% similarity]
mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf [moved from mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf with 100% similarity]
mkosi.conf.d/10-debian/mkosi.conf.d/x86-64.conf [moved from mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/x86-64.conf with 100% similarity]
mkosi.conf.d/10-fedora.conf [deleted file]
mkosi.conf.d/10-fedora/mkosi.conf [moved from mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf with 93% similarity]
mkosi.conf.d/10-opensuse.conf [deleted file]
mkosi.conf.d/10-opensuse/initrd/mkosi.postinst [moved from mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst with 100% similarity]
mkosi.conf.d/10-opensuse/macros.db_backend [moved from mkosi.conf.d/macros.db_backend with 100% similarity]
mkosi.conf.d/10-opensuse/mkosi.build.chroot [moved from mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot with 100% similarity]
mkosi.conf.d/10-opensuse/mkosi.conf [moved from mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf with 95% similarity]
mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf [moved from mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf with 100% similarity]
mkosi.conf.d/10-opensuse/mkosi.prepare [moved from mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare with 100% similarity]
mkosi.conf.d/10-ubuntu.conf [deleted file]
mkosi.conf.d/10-ubuntu/mkosi.conf [moved from mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf with 77% similarity]
mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf [moved from mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf with 100% similarity]
mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf [moved from mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf with 100% similarity]
mkosi.conf.d/10-ubuntu/noble-backports-ports.sources [moved from mkosi.images/system/mkosi.conf.d/10-ubuntu/noble-backports-ports.sources with 100% similarity]
mkosi.conf.d/10-ubuntu/noble-backports.sources [moved from mkosi.images/system/mkosi.conf.d/10-ubuntu/noble-backports.sources with 100% similarity]
mkosi.conf.d/20-none.conf [new file with mode: 0644]
mkosi.conf.d/20-particle/mkosi.conf [moved from mkosi.images/system/mkosi.conf.d/20-particle/mkosi.conf with 74% similarity]
mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/15-swap.conf [moved from mkosi.images/system/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/15-swap.conf with 100% similarity]
mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/20-root.conf [moved from mkosi.images/system/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/repart.d/20-root.conf with 100% similarity]
mkosi.conf.d/20-particle/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf [moved from mkosi.images/system/mkosi.conf.d/20-particle/mkosi.extra/usr/lib/tmpfiles.d/99-mkosi.conf with 100% similarity]
mkosi.conf.d/20-particle/mkosi.finalize [moved from mkosi.images/system/mkosi.conf.d/20-particle/mkosi.finalize with 100% similarity]
mkosi.conf.d/20-particle/mkosi.postinst.chroot [moved from mkosi.images/system/mkosi.conf.d/20-particle/mkosi.postinst.chroot with 100% similarity]
mkosi.conf.d/20-particle/mkosi.repart/00-esp.conf [moved from mkosi.images/system/mkosi.conf.d/20-particle/mkosi.repart/00-esp.conf with 100% similarity]
mkosi.conf.d/20-particle/mkosi.repart/10-usr.conf [moved from mkosi.images/system/mkosi.conf.d/20-particle/mkosi.repart/10-usr.conf with 100% similarity]
mkosi.conf.d/20-particle/mkosi.repart/11-usr-verity.conf [moved from mkosi.images/system/mkosi.conf.d/20-particle/mkosi.repart/11-usr-verity.conf with 100% similarity]
mkosi.conf.d/20-particle/mkosi.repart/12-usr-verity-sig.conf [moved from mkosi.images/system/mkosi.conf.d/20-particle/mkosi.repart/12-usr-verity-sig.conf with 100% similarity]
mkosi.coredump-journal-storage.conf [moved from mkosi.images/system/coredump-journal-storage.conf with 100% similarity]
mkosi.extra/.autorelabel [moved from mkosi.images/system/mkosi.extra/.autorelabel with 100% similarity]
mkosi.extra/etc/iscsi/iscsid.conf [moved from mkosi.images/system/mkosi.extra/etc/iscsi/iscsid.conf with 100% similarity]
mkosi.extra/etc/issue [moved from mkosi.images/system/mkosi.extra/etc/issue with 100% similarity]
mkosi.extra/usr/lib/sysctl.d/99-apparmor-unpriv-userns.conf [moved from mkosi.images/system/mkosi.extra/usr/lib/sysctl.d/99-apparmor-unpriv-userns.conf with 100% similarity]
mkosi.extra/usr/lib/systemd/journald.conf.d/ratelimit.conf [moved from mkosi.images/system/mkosi.extra/usr/lib/systemd/journald.conf.d/ratelimit.conf with 100% similarity]
mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset [moved from mkosi.images/system/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset with 100% similarity]
mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset [moved from mkosi.images/system/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset with 100% similarity]
mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/asan.conf [moved from mkosi.images/system/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/asan.conf with 100% similarity]
mkosi.extra/usr/lib/systemd/system/user@.service.d/99-SYSTEMD_UNIT_PATH.conf [moved from mkosi.images/system/mkosi.extra/usr/lib/systemd/system/user@.service.d/99-SYSTEMD_UNIT_PATH.conf with 100% similarity]
mkosi.extra/usr/lib/tmpfiles.d/locale.conf [moved from mkosi.images/system/mkosi.extra/usr/lib/tmpfiles.d/locale.conf with 100% similarity]
mkosi.extra/usr/share/dbus-1/system.d/systemd.test.ExecStopPost.conf [moved from mkosi.images/system/mkosi.extra/usr/share/dbus-1/system.d/systemd.test.ExecStopPost.conf with 100% similarity]
mkosi.images/exitrd/mkosi.conf
mkosi.images/minimal-0/mkosi.conf
mkosi.images/minimal-1/mkosi.conf
mkosi.images/minimal-base/mkosi.conf
mkosi.images/system/initrd/mkosi.conf [deleted file]
mkosi.images/system/mkosi.conf [deleted file]
mkosi.images/system/mkosi.conf.d/20-images.conf [deleted file]
mkosi.initrd/mkosi.conf [new file with mode: 0644]
mkosi.initrd/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf [moved from mkosi.images/system/initrd/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf with 100% similarity]
mkosi.initrd/mkosi.extra/usr/lib/systemd/system/encrypted-var.service [moved from mkosi.images/system/initrd/mkosi.extra/usr/lib/systemd/system/encrypted-var.service with 100% similarity]
mkosi.initrd/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service [moved from mkosi.images/system/initrd/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service with 100% similarity]
mkosi.initrd/mkosi.extra/usr/lib/systemd/system/initrdcred.service [moved from mkosi.images/system/initrd/mkosi.extra/usr/lib/systemd/system/initrdcred.service with 100% similarity]
mkosi.leak-sanitizer-suppressions [moved from mkosi.images/system/leak-sanitizer-suppressions with 100% similarity]
mkosi.postinst.chroot [moved from mkosi.images/system/mkosi.postinst.chroot with 100% similarity]
mkosi.repart/00-esp.conf [moved from mkosi.images/system/mkosi.repart/00-esp.conf with 100% similarity]
mkosi.repart/10-root.conf [moved from mkosi.images/system/mkosi.repart/10-root.conf with 100% similarity]
mkosi.sanitizers.chroot [moved from mkosi.images/system/mkosi.sanitizers.chroot with 100% similarity]
mkosi.sync [moved from mkosi.images/system/mkosi.sync with 100% similarity]
test/integration-test-wrapper.py

index 2acde48fb4fdbbfac8c9d412ad3edf74e6aaed41..21dcb6ff03b50a15d94dfc7a6e01320bf1cde6cb 100644 (file)
@@ -92,7 +92,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-    - uses: systemd/mkosi@9f280901d5ba81ce63072e0892649c27d41dd169
+    - uses: systemd/mkosi@e5706bd0761107bda96763191950c4198e0ccb27
 
     # 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
index e05f029d9094ea5ef2ba757f615df45a8a19eacb..5b1e355327757e928e38e33d64c8ff4e1f1070db 100644 (file)
@@ -52,7 +52,7 @@ image all the time when iterating on a patch, add the following to
 
 ```conf
 [Host]
-@RuntimeBuildSources=yes
+RuntimeBuildSources=yes
 ```
 
 After enabling this setting, the source and build directories will be mounted to
similarity index 100%
rename from mkosi.images/system/mkosi.clean
rename to mkosi.clean
index 38d6e8331a2e7abe3af61dc60610ba136bfed22f..c90f5bfc774b4b29e8284caccbffbe2fe4a8ec03 100644 (file)
@@ -1,17 +1,28 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Config]
-@Images=system
 MinimumVersion=23~devel
+InitrdInclude=mkosi.initrd/
 
 [Output]
-@OutputDirectory=build/mkosi.output
-@BuildDirectory=build/mkosi.builddir
-@CacheDirectory=build/mkosi.cache
+RepartDirectories=mkosi.repart
+OutputDirectory=build/mkosi.output
+BuildDirectory=build/mkosi.builddir
+CacheDirectory=build/mkosi.cache
 
 [Content]
-@SELinuxRelabel=no
+SELinuxRelabel=no
 BuildSourcesEphemeral=yes
+Autologin=yes
+
+PostInstallationScripts=mkosi.sanitizers.chroot
+ExtraTrees=
+        mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key
+        mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
+        mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
+
+Environment=
+        SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=%F
 
 # Adding more kernel command line arguments is likely to hit the kernel command line limit (512 bytes) in
 # various scenarios. Consider adding support for a credential instead if possible and using that.
@@ -43,13 +54,85 @@ KernelCommandLine=systemd.crash_shell
 KernelModulesInitrdExclude=.*
 KernelModulesInitrdInclude=default
 
+ExtraTrees=
+        %O/minimal-0.root-%a.raw:/usr/share/minimal_0.raw
+        %O/minimal-0.root-%a-verity.raw:/usr/share/minimal_0.verity
+        %O/minimal-0.root-%a-verity-sig.raw:/usr/share/minimal_0.verity.sig
+        %O/minimal-1.root-%a.raw:/usr/share/minimal_1.raw
+        %O/minimal-1.root-%a-verity.raw:/usr/share/minimal_1.verity
+        %O/minimal-1.root-%a-verity-sig.raw:/usr/share/minimal_1.verity.sig
+        %O/minimal-base:/usr/share/TEST-13-NSPAWN-container-template
+        %O/exitrd:/exitrd
+
+InitrdPackages=
+        btrfs-progs
+        findutils
+        grep
+        sed
+
+Packages=
+        acl
+        attr
+        bash-completion
+        bpftrace
+        btrfs-progs
+        clang
+        coreutils
+        curl
+        diffutils
+        dnsmasq
+        dosfstools
+        e2fsprogs
+        findutils
+        gdb
+        grep
+        gzip
+        jq
+        kbd
+        kexec-tools
+        kmod
+        knot
+        less
+        lld
+        llvm
+        lvm2
+        man
+        mdadm
+        mtools
+        nano
+        nftables
+        nvme-cli
+        opensc
+        openssl
+        p11-kit
+        pciutils
+        python3
+        qrencode
+        radvd
+        rsync
+        sed
+        socat
+        strace
+        systemd
+        tar
+        tmux
+        tree
+        udev
+        util-linux
+        valgrind
+        which
+        wireguard-tools
+        xfsprogs
+        zsh
+        zstd
+
 [Host]
 Credentials=journal.storage=persistent
-@Incremental=yes
-@RuntimeBuildSources=yes
-@RuntimeScratch=no
-@QemuSmp=2
-@QemuSwtpm=yes
-@QemuVsock=yes
-@QemuKvm=yes
+Incremental=yes
+RuntimeBuildSources=yes
+RuntimeScratch=no
+QemuSmp=2
+QemuSwtpm=yes
+QemuVsock=yes
+QemuKvm=yes
 ToolsTreePackages=virtiofsd
diff --git a/mkosi.conf.d/10-centos.conf b/mkosi.conf.d/10-centos.conf
deleted file mode 100644 (file)
index ee8d0e5..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=centos
-
-[Distribution]
-@Release=9
-Repositories=epel
-             epel-next
-             hyperscale-packages-main
-             hyperscale-packages-experimental
similarity index 84%
rename from mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
rename to mkosi.conf.d/10-centos/mkosi.conf
index 121257e8e53a682476ecca7729ae9dd42bc87740..66aa0611d6854fb3f2574dde62bdde9c690eda39 100644 (file)
@@ -3,6 +3,13 @@
 [Match]
 Distribution=centos
 
+[Distribution]
+Release=9
+Repositories=epel
+             epel-next
+             hyperscale-packages-main
+             hyperscale-packages-experimental
+
 [Content]
 Environment=
         Environment=
similarity index 100%
rename from mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
rename to mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index 654ca91bab8084b95729ba5060fdc0723848d624..5f9e3843e36816f80f980f6bddde3f6d77830885 100644 (file)
@@ -4,6 +4,9 @@
 Distribution=|debian
 Distribution=|ubuntu
 
+[Distribution]
+PackageManagerTrees=mkosi-pinning.pref:/etc/apt/preferences.d/mkosi-pinning.pref
+
 [Content]
 Environment=
         GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
@@ -11,9 +14,6 @@ Environment=
         GIT_BRANCH=debian/master
         GIT_COMMIT=abf24e775c67cf054f474526dd5d9d952a00228b
 
-[Distribution]
-PackageManagerTrees=mkosi-pinning.pref:/etc/apt/preferences.d/mkosi-pinning.pref
-
 VolatilePackages=
         libnss-myhostname
         libnss-mymachines
diff --git a/mkosi.conf.d/10-debian.conf b/mkosi.conf.d/10-debian.conf
deleted file mode 100644 (file)
index 8674e88..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=debian
-
-[Distribution]
-@Release=testing
similarity index 78%
rename from mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf
rename to mkosi.conf.d/10-debian/mkosi.conf
index 50dfa11db42628b286e25ce6d092ad34f63923bc..c960a1b2ecd4e6db69cd6d03566011f86e4a77f6 100644 (file)
@@ -3,6 +3,9 @@
 [Match]
 Distribution=debian
 
+[Distribution]
+Release=testing
+
 [Content]
 Packages=
         linux-perf
diff --git a/mkosi.conf.d/10-fedora.conf b/mkosi.conf.d/10-fedora.conf
deleted file mode 100644 (file)
index 71948d8..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=fedora
-
-[Distribution]
-@Release=rawhide
similarity index 93%
rename from mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
rename to mkosi.conf.d/10-fedora/mkosi.conf
index c4617d26fe8039eff65f89899139f63374bfd644..b9f310d3c175c9dde0e67ffd01f1161bb950b232 100644 (file)
@@ -3,6 +3,9 @@
 [Match]
 Distribution=fedora
 
+[Distribution]
+Release=rawhide
+
 [Content]
 Environment=
         GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
diff --git a/mkosi.conf.d/10-opensuse.conf b/mkosi.conf.d/10-opensuse.conf
deleted file mode 100644 (file)
index f976fc8..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=opensuse
-
-[Distribution]
-@Release=tumbleweed
-PackageManagerTrees=mkosi.conf.d/macros.db_backend:/etc/rpm/macros.db_backend
similarity index 95%
rename from mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
rename to mkosi.conf.d/10-opensuse/mkosi.conf
index e488b2dd4bec5f33453fdf4abf6e319ba265880d..c5a014f70bfd6f262274e57933769cacadbc018c 100644 (file)
@@ -6,6 +6,10 @@ Distribution=opensuse
 [Config]
 InitrdInclude=initrd/
 
+[Distribution]
+Release=tumbleweed
+PackageManagerTrees=macros.db_backend:/etc/rpm/macros.db_backend
+
 [Content]
 Environment=
         GIT_URL=https://src.opensuse.org/rpm/systemd
diff --git a/mkosi.conf.d/10-ubuntu.conf b/mkosi.conf.d/10-ubuntu.conf
deleted file mode 100644 (file)
index da2d318..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=ubuntu
-
-[Distribution]
-@Release=noble
-Repositories=universe
similarity index 77%
rename from mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf
rename to mkosi.conf.d/10-ubuntu/mkosi.conf
index 86f9736ed97a820ff8920ab1bbdce158a5d11b77..1ffa3ab0318ffabfb3b25d93a0584dbea5eaf887 100644 (file)
@@ -3,6 +3,10 @@
 [Match]
 Distribution=ubuntu
 
+[Distribution]
+Release=noble
+Repositories=universe
+
 [Content]
 Packages=
         linux-image-generic
diff --git a/mkosi.conf.d/20-none.conf b/mkosi.conf.d/20-none.conf
new file mode 100644 (file)
index 0000000..57a2f3f
--- /dev/null
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# If we're only rerunning the build script, remove all subimage dependencies to speed up builds.
+
+[Match]
+Format=none
+
+[Config]
+Dependencies=
similarity index 74%
rename from mkosi.images/system/mkosi.conf.d/20-particle/mkosi.conf
rename to mkosi.conf.d/20-particle/mkosi.conf
index 8c1920b0ce42fac17620ebc1e488e74bd6ff5042..99dad00f5af002830dde9a79b7edb2105e892ca1 100644 (file)
@@ -8,8 +8,8 @@ RepartDirectories=
 RepartDirectories=mkosi.repart
 
 [Validation]
-@SecureBoot=yes
-@SignExpectedPcr=yes
+SecureBoot=yes
+SignExpectedPcr=yes
 
 [Host]
-@RuntimeSize=8G
+RuntimeSize=8G
index 2e867cbd452bdde30dda08c2a9ab459e2293a154..3b25091759c549b856350193a3977f96d6d1fd9c 100644 (file)
@@ -1,22 +1,14 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Config]
-ConfigureScripts=
-
 [Output]
 Format=directory
 
 [Content]
 Bootable=no
-@Locale=C.UTF-8
+Locale=C.UTF-8
 WithDocs=no
 CleanPackageMetadata=yes
 MakeInitrd=yes
 
-BuildSources=
-Packages=
-BuildPackages=
-VolatilePackages=
-
 Packages=
         bash
index a929fb6eea35cfd8bd33c97083ba1e9c0884b986..6f4dfb8b99decccdaf2f58ccaac94e20ce79dd90 100644 (file)
@@ -2,7 +2,6 @@
 
 [Config]
 Dependencies=minimal-base
-ConfigureScripts=
 
 [Distribution]
 CacheOnly=always
@@ -15,11 +14,3 @@ SplitArtifacts=yes
 BaseTrees=%O/minimal-base
 Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
 Bootable=no
-
-BuildSources=
-Packages=
-BuildPackages=
-VolatilePackages=
-
-[Host]
-Incremental=no
index a929fb6eea35cfd8bd33c97083ba1e9c0884b986..6f4dfb8b99decccdaf2f58ccaac94e20ce79dd90 100644 (file)
@@ -2,7 +2,6 @@
 
 [Config]
 Dependencies=minimal-base
-ConfigureScripts=
 
 [Distribution]
 CacheOnly=always
@@ -15,11 +14,3 @@ SplitArtifacts=yes
 BaseTrees=%O/minimal-base
 Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
 Bootable=no
-
-BuildSources=
-Packages=
-BuildPackages=
-VolatilePackages=
-
-[Host]
-Incremental=no
index 7eb147379fe35184c6a7a51e471c1cf8c790f2e2..f6deeeadfb8f00dfd761ec96bcb8b02dcefa75f7 100644 (file)
@@ -1,22 +1,14 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Config]
-ConfigureScripts=
-
 [Output]
 Format=directory
 
 [Content]
 Bootable=no
-@Locale=C.UTF-8
+Locale=C.UTF-8
 WithDocs=no
 CleanPackageMetadata=yes
 
-BuildSources=
-Packages=
-BuildPackages=
-VolatilePackages=
-
 Packages=
         bash
         coreutils
diff --git a/mkosi.images/system/initrd/mkosi.conf b/mkosi.images/system/initrd/mkosi.conf
deleted file mode 100644 (file)
index ed9bfdc..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Content]
-PostInstallationScripts=../mkosi.sanitizers.chroot
-ExtraTrees=
-    ../leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
-    ../coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
deleted file mode 100644 (file)
index bf08e75..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Config]
-InitrdInclude=initrd/
-
-[Output]
-RepartDirectories=mkosi.repart
-
-[Content]
-Autologin=yes
-ExtraTrees=
-        %D/mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key
-        leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
-        coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
-
-PostInstallationScripts=mkosi.sanitizers.chroot
-
-Environment=
-        SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=%F
-
-InitrdPackages=
-        btrfs-progs
-        findutils
-        grep
-        sed
-
-Packages=
-        acl
-        attr
-        bash-completion
-        bpftrace
-        btrfs-progs
-        clang
-        coreutils
-        curl
-        diffutils
-        dnsmasq
-        dosfstools
-        e2fsprogs
-        findutils
-        gdb
-        grep
-        gzip
-        jq
-        kbd
-        kexec-tools
-        kmod
-        knot
-        less
-        lld
-        llvm
-        lvm2
-        man
-        mdadm
-        mtools
-        nano
-        nftables
-        nvme-cli
-        opensc
-        openssl
-        p11-kit
-        pciutils
-        python3
-        qrencode
-        radvd
-        rsync
-        sed
-        socat
-        strace
-        systemd
-        tar
-        tmux
-        tree
-        udev
-        util-linux
-        valgrind
-        which
-        wireguard-tools
-        xfsprogs
-        zsh
-        zstd
diff --git a/mkosi.images/system/mkosi.conf.d/20-images.conf b/mkosi.images/system/mkosi.conf.d/20-images.conf
deleted file mode 100644 (file)
index 8641984..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Format=!none
-
-[Config]
-Dependencies=
-        exitrd
-        minimal-base
-        minimal-0
-        minimal-1
-
-[Content]
-ExtraTrees=
-        %O/minimal-0.root-%a.raw:/usr/share/minimal_0.raw
-        %O/minimal-0.root-%a-verity.raw:/usr/share/minimal_0.verity
-        %O/minimal-0.root-%a-verity-sig.raw:/usr/share/minimal_0.verity.sig
-        %O/minimal-1.root-%a.raw:/usr/share/minimal_1.raw
-        %O/minimal-1.root-%a-verity.raw:/usr/share/minimal_1.verity
-        %O/minimal-1.root-%a-verity-sig.raw:/usr/share/minimal_1.verity.sig
-        %O/minimal-base:/usr/share/TEST-13-NSPAWN-container-template
-        %O/exitrd:/exitrd
diff --git a/mkosi.initrd/mkosi.conf b/mkosi.initrd/mkosi.conf
new file mode 100644 (file)
index 0000000..8f8cc2f
--- /dev/null
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Content]
+PostInstallationScripts=../mkosi.sanitizers.chroot
+ExtraTrees=
+    ../mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
+    ../mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
similarity index 100%
rename from mkosi.images/system/mkosi.sync
rename to mkosi.sync
index 743a14c3d8a63a336f1bd69e79436f1767376b95..d7a622abe80c177772fd8c730b8c1597a6832ada 100755 (executable)
@@ -134,7 +134,6 @@ def main():
         '--runtime-network=none',
         '--runtime-scratch=no',
         *args.mkosi_args,
-        '--append',
         '--qemu-firmware', args.firmware,
         '--qemu-kvm', "auto" if not bool(int(os.getenv("TEST_NO_KVM", "0"))) else "no",
         '--kernel-command-line-extra',
@@ -184,9 +183,8 @@ def main():
                     text=True,
                 ).stdout
             )
-            images = {image["Image"]: image for image in j["Images"]}
-            distribution = images["system"]["Distribution"]
-            release = images["system"]["Release"]
+            distribution = j["Images"][-1]["Distribution"]
+            release = j["Images"][-1]["Release"]
             artifact = f"ci-mkosi-{id}-{iteration}-{distribution}-{release}-failed-test-journals"
             ops += [f"gh run download {id} --name {artifact} -D ci/{artifact}"]
             journal_file = Path(f"ci/{artifact}/test/journal/{name}.journal")