diff options
author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-01-24 12:51:31 +0100 |
---|---|---|
committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-01-27 15:05:04 +0100 |
commit | c8943ce884c3b315aa833a1a9777938719620c6b (patch) | |
tree | 6630445b9a70c0c5bb91f42632475a5d1e7bdad2 | |
parent | b6033b706028a64e9affb79050ced1ad9a4f5b43 (diff) | |
download | systemd-c8943ce884c3b315aa833a1a9777938719620c6b.tar.gz |
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.
-rw-r--r-- | .github/workflows/mkosi.yml | 6 | ||||
-rwxr-xr-x | mkosi.build | 3 | ||||
-rw-r--r-- | mkosi.conf.d/arch/10-arch.conf | 2 | ||||
-rw-r--r-- | mkosi.conf.d/centos/10-centos.conf | 3 | ||||
-rw-r--r-- | mkosi.conf.d/debian/10-debian.conf | 2 | ||||
-rw-r--r-- | mkosi.conf.d/fedora/10-fedora.conf | 2 | ||||
-rw-r--r-- | mkosi.conf.d/opensuse/10-opensuse.conf | 2 | ||||
-rw-r--r-- | mkosi.conf.d/ubuntu/10-ubuntu.conf | 2 |
8 files changed, 17 insertions, 5 deletions
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 357b4f4205..4b77be24b4 100644 --- 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 372711c607..d2b9ea957e 100755 --- 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 993e3dd344..ee51396e04 100644 --- 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 a950cbd4d2..5d57cd46f3 100644 --- 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 7443f7db53..356b8b06ab 100644 --- 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 8ce05f5331..5d4959ba16 100644 --- 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 417827f7c0..6034b8a87e 100644 --- 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 346b129e52..99cffa043d 100644 --- 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 |