From 9d2e4ceee5bf891354754775fd98c6792e672af8 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 10 Jan 2023 12:04:10 +0100
Subject: ci: Update mkosi action to latest commit

Let's make sure we're testing with the latest changes in mkosi. This
includes both the switch to systemd-repart and ukify, making sure we
get extra testing coverage for those components.

This also drops options from the centos config that have been removed
in the newer mkosi.

For some reason idmapping runs into some issues so we disable it for
now.
---
 mkosi.conf.d/centos/10-mkosi.centos           | 95 ++++++++++++++++++++++++++
 mkosi.conf.d/centos_epel/10-mkosi.centos_epel | 98 ---------------------------
 2 files changed, 95 insertions(+), 98 deletions(-)
 create mode 100644 mkosi.conf.d/centos/10-mkosi.centos
 delete mode 100644 mkosi.conf.d/centos_epel/10-mkosi.centos_epel

(limited to 'mkosi.conf.d')

diff --git a/mkosi.conf.d/centos/10-mkosi.centos b/mkosi.conf.d/centos/10-mkosi.centos
new file mode 100644
index 0000000000..a950cbd4d2
--- /dev/null
+++ b/mkosi.conf.d/centos/10-mkosi.centos
@@ -0,0 +1,95 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
+# Symlink this file to mkosi.default in the project root directory and invoke "mkosi" to build an OS image.
+
+[Distribution]
+Distribution=centos
+Repositories=epel
+
+[Content]
+Packages=
+        alsa-lib
+        audit
+        cryptsetup
+        dhcp-server
+        fuse
+        glib2
+        glibc-minimal-langpack
+        glibc.i686
+        gnutls
+        iproute
+        iproute-tc
+        kernel-modules-extra
+        libasan
+        libbpf
+        libcap-ng
+        libfido2
+        libmicrohttpd
+        libmnl
+        libubsan
+        libxcrypt
+        libxkbcommon
+        netcat
+        numactl-libs
+        p11-kit
+        pam
+        polkit
+        popt
+        procps-ng
+        quota
+        tpm2-tss
+        vim-common
+
+BuildPackages=
+        bpftool
+        docbook-xsl
+        dwarves
+        glibc-devel.i686
+        glibc-static
+        glibc-static.i686
+        gnu-efi-devel
+        libgcrypt-devel # CentOS Stream 8 libgcrypt-devel doesn't ship a pkg-config file.
+        libxslt
+        pam-devel
+        perl-interpreter
+        pkgconfig(alsa)
+        pkgconfig(audit)
+        pkgconfig(blkid)
+        pkgconfig(bzip2)
+        pkgconfig(dbus-1)
+        pkgconfig(fdisk)
+        pkgconfig(fuse)
+        pkgconfig(glib-2.0)
+        pkgconfig(gnutls)
+        pkgconfig(libacl)
+        pkgconfig(libbpf)
+        pkgconfig(libcap-ng)
+        pkgconfig(libcap)
+        pkgconfig(libcryptsetup)
+        pkgconfig(libcurl)
+        pkgconfig(libdw)
+        pkgconfig(libfido2)
+        pkgconfig(libidn2)
+        pkgconfig(libkmod)
+        pkgconfig(libmicrohttpd)
+        pkgconfig(libmnl)
+        pkgconfig(libpcre2-8)
+        pkgconfig(libqrencode)
+        pkgconfig(libseccomp)
+        pkgconfig(libselinux)
+        pkgconfig(libzstd)
+        pkgconfig(mount)
+        pkgconfig(numa)
+        pkgconfig(openssl)
+        pkgconfig(p11-kit-1)
+        pkgconfig(popt)
+        pkgconfig(pwquality)
+        pkgconfig(tss2-esys)
+        pkgconfig(tss2-mu)
+        pkgconfig(tss2-rc)
+        pkgconfig(valgrind)
+        pkgconfig(xkbcommon)
+        python3dist(docutils)
+        python3dist(jinja2)
+        python3dist(lxml)
diff --git a/mkosi.conf.d/centos_epel/10-mkosi.centos_epel b/mkosi.conf.d/centos_epel/10-mkosi.centos_epel
deleted file mode 100644
index 768403f7cf..0000000000
--- a/mkosi.conf.d/centos_epel/10-mkosi.centos_epel
+++ /dev/null
@@ -1,98 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
-# Symlink this file to mkosi.default in the project root directory and invoke "mkosi" to build an OS image.
-
-[Distribution]
-Distribution=centos_epel
-
-[Output]
-Format=gpt_xfs
-HostonlyInitrd=no
-
-[Content]
-Packages=
-        alsa-lib
-        audit
-        cryptsetup
-        dhcp-server
-        fuse
-        glib2
-        glibc-minimal-langpack
-        glibc.i686
-        gnutls
-        iproute
-        iproute-tc
-        kernel-modules-extra
-        libasan
-        libbpf
-        libcap-ng
-        libfido2
-        libmicrohttpd
-        libmnl
-        libubsan
-        libxcrypt
-        libxkbcommon
-        netcat
-        numactl-libs
-        p11-kit
-        pam
-        polkit
-        popt
-        procps-ng
-        quota
-        tpm2-tss
-        vim-common
-
-BuildPackages=
-        bpftool
-        docbook-xsl
-        dwarves
-        glibc-devel.i686
-        glibc-static
-        glibc-static.i686
-        gnu-efi-devel
-        libgcrypt-devel # CentOS Stream 8 libgcrypt-devel doesn't ship a pkg-config file.
-        libxslt
-        pam-devel
-        perl-interpreter
-        pkgconfig(alsa)
-        pkgconfig(audit)
-        pkgconfig(blkid)
-        pkgconfig(bzip2)
-        pkgconfig(dbus-1)
-        pkgconfig(fdisk)
-        pkgconfig(fuse)
-        pkgconfig(glib-2.0)
-        pkgconfig(gnutls)
-        pkgconfig(libacl)
-        pkgconfig(libbpf)
-        pkgconfig(libcap-ng)
-        pkgconfig(libcap)
-        pkgconfig(libcryptsetup)
-        pkgconfig(libcurl)
-        pkgconfig(libdw)
-        pkgconfig(libfido2)
-        pkgconfig(libidn2)
-        pkgconfig(libkmod)
-        pkgconfig(libmicrohttpd)
-        pkgconfig(libmnl)
-        pkgconfig(libpcre2-8)
-        pkgconfig(libqrencode)
-        pkgconfig(libseccomp)
-        pkgconfig(libselinux)
-        pkgconfig(libzstd)
-        pkgconfig(mount)
-        pkgconfig(numa)
-        pkgconfig(openssl)
-        pkgconfig(p11-kit-1)
-        pkgconfig(popt)
-        pkgconfig(pwquality)
-        pkgconfig(tss2-esys)
-        pkgconfig(tss2-mu)
-        pkgconfig(tss2-rc)
-        pkgconfig(valgrind)
-        pkgconfig(xkbcommon)
-        python3dist(docutils)
-        python3dist(jinja2)
-        python3dist(lxml)
-- 
cgit v1.2.1