diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 4b5e6fe759..abcba56a40 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -25,7 +25,7 @@ jobs: steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd - - uses: systemd/mkosi@14d2d37a1923c03062f55454b2b61d0c64db6238 + - uses: systemd/mkosi@d6ddc66acb05d3d761d3f600c6b029319db9ae95 # 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 diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index c20aceeda9..4ec82533b9 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -39,7 +39,7 @@ jobs: GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml ENABLE_GITHUB_PULL_REQUEST_SUMMARY_COMMENT: false - - uses: systemd/mkosi@14d2d37a1923c03062f55454b2b61d0c64db6238 + - uses: systemd/mkosi@d6ddc66acb05d3d761d3f600c6b029319db9ae95 - name: Check that tabs are not used in Python code run: sh -c '! git grep -P "\\t" -- src/core/generate-bpf-delegate-configs.py src/boot/generate-hwids-section.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py' diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 4b4c0f00c1..78246964ef 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -167,7 +167,7 @@ jobs: steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd - - uses: systemd/mkosi@14d2d37a1923c03062f55454b2b61d0c64db6238 + - uses: systemd/mkosi@d6ddc66acb05d3d761d3f600c6b029319db9ae95 # 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 diff --git a/mkosi/mkosi.conf b/mkosi/mkosi.conf index a52f3be22f..4e5be6718c 100644 --- a/mkosi/mkosi.conf +++ b/mkosi/mkosi.conf @@ -1,9 +1,8 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Config] -MinimumVersion=commit:14d2d37a1923c03062f55454b2b61d0c64db6238 +MinimumVersion=commit:d6ddc66acb05d3d761d3f600c6b029319db9ae95 Dependencies= - initrd minimal-base minimal-0 minimal-1 @@ -58,7 +57,6 @@ ExtraTrees= %O/minimal-base:/usr/share/TEST-13-NSPAWN-container-template %O/initrd:/exitrd -Initrds=%O/initrd KernelInitrdModules=default # Disable relabeling by default as it only matters for TEST-06-SELINUX, takes a non-trivial amount of time diff --git a/mkosi/mkosi.images/minimal-0/mkosi.conf b/mkosi/mkosi.images/minimal-0/mkosi.conf index 5d6717f897..0d55105c70 100644 --- a/mkosi/mkosi.images/minimal-0/mkosi.conf +++ b/mkosi/mkosi.images/minimal-0/mkosi.conf @@ -9,6 +9,7 @@ SplitArtifacts=yes [Build] Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs +Incremental=relaxed [Content] BaseTrees=%O/minimal-base diff --git a/mkosi/mkosi.images/minimal-1/mkosi.conf b/mkosi/mkosi.images/minimal-1/mkosi.conf index 5d6717f897..0d55105c70 100644 --- a/mkosi/mkosi.images/minimal-1/mkosi.conf +++ b/mkosi/mkosi.images/minimal-1/mkosi.conf @@ -9,6 +9,7 @@ SplitArtifacts=yes [Build] Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs +Incremental=relaxed [Content] BaseTrees=%O/minimal-base diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf index 0a5f342c9e..8e57cd032d 100644 --- a/mkosi/mkosi.images/minimal-base/mkosi.conf +++ b/mkosi/mkosi.images/minimal-base/mkosi.conf @@ -5,6 +5,7 @@ Format=directory [Build] Environment=SYSTEMD_REQUIRED_DEPS_ONLY=1 +Incremental=relaxed [Content] Bootable=no diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf index c7a1db67a8..6d77d2305d 100644 --- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf +++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf @@ -10,9 +10,6 @@ Packages= iproute nmap -VolatilePackages= - systemd-libs - RemoveFiles= # Arch Linux doesn't split their gcc-libs package so we manually remove # unneeded stuff here to make sure it doesn't end up in the image. diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf index 3338824272..53cc68d794 100644 --- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf +++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf @@ -11,6 +11,3 @@ Packages= iproute iproute-tc nmap-ncat - -VolatilePackages= - systemd-libs diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf index acbcea7cd2..8b148d8422 100644 --- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf +++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf @@ -12,7 +12,3 @@ Packages= iproute2 mount ncat - -VolatilePackages= - libsystemd0 - libudev1 diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf index 811b49276e..8b38a769a1 100644 --- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf +++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf @@ -15,7 +15,3 @@ Packages= patterns-base-minimal_base sed xz - -VolatilePackages= - libsystemd0 - libudev1 diff --git a/mkosi/mkosi.images/initrd/mkosi.conf b/mkosi/mkosi.initrd.conf/mkosi.conf similarity index 93% rename from mkosi/mkosi.images/initrd/mkosi.conf rename to mkosi/mkosi.initrd.conf/mkosi.conf index 2b731d4397..1c73f3a328 100644 --- a/mkosi/mkosi.images/initrd/mkosi.conf +++ b/mkosi/mkosi.initrd.conf/mkosi.conf @@ -2,7 +2,6 @@ [Include] Include= - mkosi-initrd %D/mkosi/mkosi.sanitizers %D/mkosi/mkosi.coverage diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/arch.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/arch.conf similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.conf.d/arch.conf rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/arch.conf diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/build.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/build.conf similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.conf.d/build.conf rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/build.conf diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/centos-fedora.conf similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.conf.d/centos-fedora.conf rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/centos-fedora.conf diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/debian-ubuntu.conf similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.conf.d/debian-ubuntu.conf rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/debian-ubuntu.conf diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/fedora.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/fedora.conf similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.conf.d/fedora.conf rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/fedora.conf diff --git a/mkosi/mkosi.images/initrd/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/opensuse.conf similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.conf.d/opensuse.conf rename to mkosi/mkosi.initrd.conf/mkosi.conf.d/opensuse.conf diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/shutdown b/mkosi/mkosi.initrd.conf/mkosi.extra/shutdown similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.extra/shutdown rename to mkosi/mkosi.initrd.conf/mkosi.extra/shutdown diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/encrypted-var.repart.d/00-root.conf diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/encrypted-var.service b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/encrypted-var.service similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/encrypted-var.service rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/encrypted-var.service diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/initrd-run-mount.service diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrdcred.service b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/initrdcred.service similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/initrdcred.service rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/initrdcred.service diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-initrd.service.d/exit-on-failure.conf diff --git a/mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf b/mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf similarity index 100% rename from mkosi/mkosi.images/initrd/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf rename to mkosi/mkosi.initrd.conf/mkosi.extra/usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service.d/exit-on-failure.conf