mkosi: update mkosi commit reference to 7e4ec15aee6b98300b2ee14265bc647a716a9f8a

* 7e4ec15aee Generate key-cert pair in config directory (fixes #3655)
* 5793e64958 Don't use gen_kernel_images() in run_depmod()
* bc497f1d17 Fix typing due to recent changes in typeshed
* e6a603a21a Add "plymouth" initrd profile

(cherry picked from commit c7bb07fff5cf4356e4b633cf93a460d1beb92b6e)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 0a2f3b3c6bddfc662c7215d72d20a695d50a4a7d..56000cd6149652f6a0dac4ee9efd1b592b142b7a 100644 (file)
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@32105855f386c980069d134d1b0f8fea4db2129e
+      - uses: systemd/mkosi@7e4ec15aee6b98300b2ee14265bc647a716a9f8a
 
       # 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/mkosi.yml b/.github/workflows/mkosi.yml
index 601f18ee9c744a5815fd969f6513b4ce6a81204d..1d5d4d7cb8a79643063810abee4183b6d8064107 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -113,7 +113,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@32105855f386c980069d134d1b0f8fea4db2129e
+      - uses: systemd/mkosi@7e4ec15aee6b98300b2ee14265bc647a716a9f8a
 
       # 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/.gitignore b/.gitignore
index 9eb287ec7efecff8602cfd84370f0f05f25b34e4..fec289e5b97829ece7c24fb84ed4827c3b1f9e16 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,8 +23,8 @@ __pycache__/
 /ID
 /build*
 /install-tree
-/mkosi.key
-/mkosi.crt
+/mkosi/mkosi.key
+/mkosi/mkosi.crt
 /mkosi.tools/
 /mkosi.tools.manifest
 /mkosi/mkosi.local.conf

diff --git a/mkosi/mkosi.conf b/mkosi/mkosi.conf
index b1a0dc1addd3f6a446531616540d712c3fa0f49a..3d4addd855d595d317dde45ea07a9f559db6b0e0 100644 (file)
--- a/mkosi/mkosi.conf
+++ b/mkosi/mkosi.conf
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Config]
-MinimumVersion=commit:32105855f386c980069d134d1b0f8fea4db2129e
+MinimumVersion=commit:7e4ec15aee6b98300b2ee14265bc647a716a9f8a
 Dependencies=
         exitrd
         initrd
@@ -38,15 +38,11 @@ Incremental=yes
 
 [Validation]
 SignExpectedPcr=yes
-SignExpectedPcrKey=../mkosi.key
-SignExpectedPcrCertificate=../mkosi.crt
-VerityKey=../mkosi.key
-VerityCertificate=../mkosi.crt
 
 [Content]
 ExtraTrees=
         mkosi.extra.common
-        ../mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key
+        mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key
         %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
@@ -137,8 +133,6 @@ Packages=
         zstd
 
 [Runtime]
-SshKey=../mkosi.key
-SshCertificate=../mkosi.crt
 Credentials=
         journal.storage=persistent
         tty.serial.hvc0.agetty.autologin=root