mkosi: Update and enable ukify in mkosi builds

We also add the necessary deps for ukify to the mkosi configs.

CentOS Stream 8 is dropped from CI because its python version is too
old (3.6) to be able to run ukify.

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 357b4f420594736abe97bd009f440583e072433f..4b77be24b40511e2fe07d733b1673b55aaf45c63 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -73,13 +73,11 @@ jobs:
           - distro: opensuse
             release: tumbleweed
           - distro: centos
-            release: 9-stream
-          - distro: centos
-            release: 8-stream
+            release: "9"
 
     steps:
     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-    - uses: systemd/mkosi@ab2aff830096e681da1950a7d29f277caa89516c
+    - uses: systemd/mkosi@37c0524360ee460174f83081fa14e0dc9bc6ee0d
 
     - name: Configure
       run: |

diff --git a/mkosi.build b/mkosi.build
index 372711c6077f4ebac3f1783e236e9fbf6e7a556a..d2b9ea957e3a7b55d41adadf2ce16600ed352922 100755 (executable)
--- a/mkosi.build
+++ b/mkosi.build
@@ -165,7 +165,8 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
                 -D gnu-efi=true \
                 -D kernel-install=true \
                 -D analyze=true \
-                -D bpf-framework=true
+                -D bpf-framework=true \
+                -D ukify=true
 fi
 
 cd "$BUILDDIR"

diff --git a/mkosi.conf.d/arch/10-arch.conf b/mkosi.conf.d/arch/10-arch.conf
index 993e3dd3441ac1585267ac6d105c79c24c200f3c..ee51396e0487455d8803e22fb9c00d41c890b445 100644 (file)
--- a/mkosi.conf.d/arch/10-arch.conf
+++ b/mkosi.conf.d/arch/10-arch.conf
@@ -30,6 +30,7 @@ Packages=
         openbsd-netcat
         polkit
         popt
+        python-pefile
         quota-tools
         tpm2-tss
         vim
@@ -44,3 +45,4 @@ BuildPackages=
         python-docutils
         python-jinja
         python-lxml
+        python-pytest

diff --git a/mkosi.conf.d/centos/10-centos.conf b/mkosi.conf.d/centos/10-centos.conf
index a950cbd4d2aa4f486ad92456e4596e039c78f037..5d57cd46f38a8e53bfddb153d39a76d6887894b2 100644 (file)
--- a/mkosi.conf.d/centos/10-centos.conf
+++ b/mkosi.conf.d/centos/10-centos.conf
@@ -6,6 +6,7 @@
 [Distribution]
 Distribution=centos
 Repositories=epel
+             epel-testing # FIXME: Remove when python3-pefile goes to stable EPEL.
 
 [Content]
 Packages=
@@ -37,6 +38,7 @@ Packages=
         polkit
         popt
         procps-ng
+        python3dist(pefile)
         quota
         tpm2-tss
         vim-common
@@ -93,3 +95,4 @@ BuildPackages=
         python3dist(docutils)
         python3dist(jinja2)
         python3dist(lxml)
+        python3dist(pytest)

diff --git a/mkosi.conf.d/debian/10-debian.conf b/mkosi.conf.d/debian/10-debian.conf
index 7443f7db536399353b4748d763c0dbcf53bee52d..356b8b06ab5b00eb14ff92dca08f9de4e2735952 100644 (file)
--- a/mkosi.conf.d/debian/10-debian.conf
+++ b/mkosi.conf.d/debian/10-debian.conf
@@ -37,6 +37,7 @@ Packages=
         netcat-openbsd
         policykit-1
         procps
+        python3-pefile
         quota
         xxd
 
@@ -87,4 +88,5 @@ BuildPackages=
         python3-docutils
         python3-jinja2
         python3-lxml
+        python3-pytest
         xsltproc

diff --git a/mkosi.conf.d/fedora/10-fedora.conf b/mkosi.conf.d/fedora/10-fedora.conf
index 8ce05f5331b6c3b97a2e83546728fd8fcd803541..5d4959ba1682f4318349ade38b4270d57698ad9d 100644 (file)
--- a/mkosi.conf.d/fedora/10-fedora.conf
+++ b/mkosi.conf.d/fedora/10-fedora.conf
@@ -37,6 +37,7 @@ Packages=
         polkit
         popt
         procps-ng
+        python3dist(pefile)
         quota
         tpm2-tss
         vim-common
@@ -90,3 +91,4 @@ BuildPackages=
         python3dist(docutils)
         python3dist(jinja2)
         python3dist(lxml)
+        python3dist(pytest)

diff --git a/mkosi.conf.d/opensuse/10-opensuse.conf b/mkosi.conf.d/opensuse/10-opensuse.conf
index 417827f7c0d4100f1bdabf476dec12438dc9e0d9..6034b8a87e0b41b88cb4ba46faf090afb42965ee 100644 (file)
--- a/mkosi.conf.d/opensuse/10-opensuse.conf
+++ b/mkosi.conf.d/opensuse/10-opensuse.conf
@@ -37,6 +37,7 @@ Packages=
         libseccomp2
         libxkbcommon0
         pam
+        python3-pefile
         tpm2-0-tss
         vim
 
@@ -91,6 +92,7 @@ BuildPackages=
         python3-docutils
         python3-Jinja2
         python3-lxml
+        python3-pytest
         qrencode-devel
         shadow
         system-group-obsolete

diff --git a/mkosi.conf.d/ubuntu/10-ubuntu.conf b/mkosi.conf.d/ubuntu/10-ubuntu.conf
index 346b129e521295b70e7dfccb59a53b5ddfeacfbd..99cffa043d458b9bc2cc8e3513ec5a1cfd1256f7 100644 (file)
--- a/mkosi.conf.d/ubuntu/10-ubuntu.conf
+++ b/mkosi.conf.d/ubuntu/10-ubuntu.conf
@@ -39,6 +39,7 @@ Packages=
         netcat-openbsd
         policykit-1
         procps
+        python3-pefile
         quota
         xxd
 
@@ -88,4 +89,5 @@ BuildPackages=
         python3-docutils
         python3-jinja2
         python3-lxml
+        python3-pytest
         xsltproc