mkosi: Update to latest and two speed improvements (#40678)

2026-02-14 23:08:00 +09:00
parent 2d4359fa89 7a70c32368
commit 009a170d2f
25 changed files with 7 additions and 21 deletions
@@ -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
@@ -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'
@@ -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
@@ -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
@@ -9,6 +9,7 @@ SplitArtifacts=yes

 [Build]
 Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
+Incremental=relaxed

 [Content]
 BaseTrees=%O/minimal-base
@@ -9,6 +9,7 @@ SplitArtifacts=yes

 [Build]
 Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
+Incremental=relaxed

 [Content]
 BaseTrees=%O/minimal-base
@@ -5,6 +5,7 @@ Format=directory

 [Build]
 Environment=SYSTEMD_REQUIRED_DEPS_ONLY=1
+Incremental=relaxed

 [Content]
 Bootable=no
@@ -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.
@@ -11,6 +11,3 @@ Packages=
        iproute
        iproute-tc
        nmap-ncat
-
-VolatilePackages=
-        systemd-libs
@@ -12,7 +12,3 @@ Packages=
        iproute2
        mount
        ncat
-
-VolatilePackages=
-        libsystemd0
-        libudev1
@@ -15,7 +15,3 @@ Packages=
        patterns-base-minimal_base
        sed
        xz
-
-VolatilePackages=
-        libsystemd0
-        libudev1
@@ -2,7 +2,6 @@

 [Include]
 Include=
-        mkosi-initrd
        %D/mkosi/mkosi.sanitizers
        %D/mkosi/mkosi.coverage