mkosi: update mkosi ref to 4b18ea8395e9cc2b1d247be93944f5539affe964 (#40681)

* 4b18ea8395 sandbox: Make sure eventfd is CLOEXEC
* 23ea86d0cf Revert "Bump minimum python version to 3.10"
* 81fd30ec77 Revert "sandbox: Use os.eventfd()"
* 717020c97b Revert "Use python3.12 as interpreter in CentOS Stream 9
zipapp"
* e1d0e45e3b Rework sandbox globbing and exist checks

.github/workflows/coverage.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-      - uses: systemd/mkosi@14d2d37a1923c03062f55454b2b61d0c64db6238
+      - uses: systemd/mkosi@4b18ea8395e9cc2b1d247be93944f5539affe964
 
       # 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

.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@4b18ea8395e9cc2b1d247be93944f5539affe964
 
       - 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'

.github/workflows/mkosi.yml

@@ -167,7 +167,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-      - uses: systemd/mkosi@14d2d37a1923c03062f55454b2b61d0c64db6238
+      - uses: systemd/mkosi@4b18ea8395e9cc2b1d247be93944f5539affe964
 
       # 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/mkosi.conf

@@ -1,9 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Config]
-MinimumVersion=commit:14d2d37a1923c03062f55454b2b61d0c64db6238
+MinimumVersion=commit:4b18ea8395e9cc2b1d247be93944f5539affe964
 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

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

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

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

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.

mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf

@@ -11,6 +11,3 @@ Packages=
         iproute
         iproute-tc
         nmap-ncat
-
-VolatilePackages=
-        systemd-libs

mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf

@@ -12,7 +12,3 @@ Packages=
         iproute2
         mount
         ncat
-
-VolatilePackages=
-        libsystemd0
-        libudev1

mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf

@@ -15,7 +15,3 @@ Packages=
         patterns-base-minimal_base
         sed
         xz
-
-VolatilePackages=
-        libsystemd0
-        libudev1

mkosi/mkosi.initrd.conf/mkosi.conf

@@ -2,7 +2,6 @@
 
 [Include]
 Include=
-        mkosi-initrd
         %D/mkosi/mkosi.sanitizers
         %D/mkosi/mkosi.coverage
 

src/libsystemd/sd-json/sd-json.c

@@ -56,7 +56,7 @@ typedef struct JsonSource {
         char name[];
 } JsonSource;
 
-/* On x86-64 this whole structure should have a size of 6 * 64 bit = 48 bytes */
+/* On x86-64 this whole structure should have a size of 5 * 64 bit = 40 bytes */
 struct sd_json_variant {
         union {
                 /* We either maintain a reference counter for this variant itself, or we are embedded into an
@@ -132,7 +132,7 @@ struct sd_json_variant {
 
 /* Let's make sure this structure isn't increased in size accidentally. This check is only for our most relevant arch
  * (x86-64). */
-#if defined(__x86_64__) && __SIZEOF_POINTER__ == 8
+#if defined(__x86_64__) && __SIZEOF_POINTER__ == 8 && !defined(__EDG__)
 assert_cc(sizeof(sd_json_variant) == 40U);
 assert_cc(INLINE_STRING_MAX == 7U);
 #endif

tools/fetch-distro.py

@@ -123,7 +123,7 @@ def update_distro(args, distro: str, config: dict):
         print(f'{pkg_subdir}: commit {new_commit!s} is still fresh')
         return
 
-    cmd = ['git', '-C', f'pkg/{pkg_subdir}', 'log', '--graph', '--first-parent',
+    cmd = ['git', '-C', f'pkg/{pkg_subdir}', 'log', '--graph', '--no-merges',
            '--pretty=oneline', '--no-decorate', '--abbrev-commit', '--abbrev=10',
            f'{old_commit}..{new_commit}']
     if subdir is not None:

tools/fetch-mkosi.py

@@ -75,7 +75,7 @@ def update_mkosi(args):
         print(f'mkosi: commit {new_commit!s} is still fresh')
         return
 
-    cmd = ['git', '-C', args.dir.as_posix(), 'log', '--graph', '--first-parent', '--no-merges',
+    cmd = ['git', '-C', args.dir.as_posix(), 'log', '--graph', '--no-merges',
            '--pretty=oneline', '--no-decorate', '--abbrev-commit', '--abbrev=10',
            f'{old_commit}..{new_commit}']
     print(f"+ {shlex.join(cmd)}")