Merge pull request #28397 from DaanDeMeyer/python-stuff

mkosi: Stop using python3.9 on CentOS 8

Author: DaanDeMeyer

.github/workflows/mkosi.yml

@@ -76,7 +76,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-    - uses: systemd/mkosi@b1a570550ee077ed7a9a9359e4732636034807e6
+    - uses: systemd/mkosi@5866c0ff3b36d350c943016e5a3b115f7a95d37f
 
     - name: Configure
       run: |

meson.build

@@ -2143,16 +2143,15 @@ if efi_arch == 'x64' and cc.links('''
 endif
 
 have_pyelftools = pymod.find_installation('python3', required : false, modules : ['elftools']).found()
-if get_option('bootloader') == 'true' and (not python_39 or not have_pyelftools)
-        error('EFI bootloader support requires Python >= 3.9 and pyelftools.')
+if get_option('bootloader') == 'true' and not have_pyelftools
+        error('EFI bootloader support requires pyelftools.')
 endif
 
 conf.set10(
         'ENABLE_BOOTLOADER',
         get_option('efi') and
         get_option('bootloader') in ['auto', 'true'] and
         efi_arch != '' and
-        python_39 and
         have_pyelftools,
 )
 

mkosi.conf.d/10-centos.conf

@@ -6,3 +6,5 @@ Distribution=centos
 [Distribution]
 Release=9
 Repositories=epel
+             epel-next
+             hyperscale-packages-main

mkosi.conf.d/10-systemd.conf

@@ -1,15 +1,15 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Output]
+OutputDirectory=mkosi.output
+BuildDirectory=mkosi.builddir
+CacheDirectory=mkosi.cache
+
+[Content]
 # Prevent ASAN warnings when building the image and ship the real ASAN options prefixed with MKOSI_.
 Environment=ASAN_OPTIONS=verify_asan_link_order=false
             MKOSI_ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1
             MKOSI_UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
-OutputDirectory=mkosi.output
-
-[Content]
-BuildDirectory=mkosi.builddir
-CacheDirectory=mkosi.cache
 
 [Host]
 Incremental=yes
@@ -22,21 +22,10 @@ KernelCommandLineExtra=systemd.crash_shell
                        systemd.log_ratelimit_kmsg=0
                        systemd.journald.forward_to_console
                        systemd.journald.max_level_console=warning
-                       # Tell the kernel to only log warning and up to the console.
-                       loglevel=4
                        # Disable the kernel's ratelimiting on userspace logging to kmsg.
                        printk.devkmsg=on
-                       # Tell networkd to manage the ethernet interface.
-                       ip=enp0s1:any
-                       # Make sure sulogin works even with a locked root account.
-                       SYSTEMD_SULOGIN_FORCE=1
                        # Make sure /sysroot is mounted rw in the initrd.
                        rw
-                       # Make sure we pull in network related units even if nothing else depends on the
-                       # network to be online.
-                       systemd.wants=network-online.target
-                       # Make sure we don't load vmw_vmci which messes with virtio vsock.
-                       module_blacklist=vmw_vmci
                        # Lower the default device timeout so we get a shell earlier if the root device does
                        # not appear for some reason.
                        systemd.default_device_timeout_sec=10

mkosi.conf.d/11-centos-8/mkosi.conf

@@ -48,6 +48,13 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
         rootprefix=/${rootprefix#/}
     fi
 
+    . /etc/os-release
+    if [ "$ID" = "centos" ] && [ "$VERSION" = "8" ]; then
+        UKIFY=false
+    else
+        UKIFY=true
+    fi
+
     CONFIGURE_OPTS=(
         -D sysvinit-path="$sysvinit_path"
         -D rootprefix="$rootprefix"
@@ -133,7 +140,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
         -D kernel-install=true
         -D analyze=true
         -D bpf-framework=true
-        -D ukify=true
+        -D ukify="$UKIFY"
         -D seccomp=true
         -D selinux=auto
         -D apparmor=auto

mkosi.conf.d/11-centos-8/mkosi.reposdir/CentOS-Stream-Hyperscale.repo

@@ -28,6 +28,7 @@ BuildPackages=
         bpftool
         docbook-xsl
         findutils
+        libgcrypt-devel # CentOS Stream 8 libgcrypt-devel doesn't ship a pkg-config file.
         libxslt
         pam-devel
         pkgconfig(audit)
@@ -65,4 +66,10 @@ BuildPackages=
         pkgconfig(tss2-tcti-device)
         pkgconfig(valgrind)
         pkgconfig(xkbcommon)
+        python3
+        python3dist(jinja2)
+        python3dist(lxml)
+        python3dist(pefile)
+        python3dist(pyelftools)
+        python3dist(pytest)
         rpm

mkosi.conf.d/11-centos-8/mkosi.reposdir/powertools.repo

@@ -8,11 +8,4 @@ Packages=
         python3dist(pytest-flakes)
 
 BuildPackages=
-        pkgconfig(libgcrypt)
         pkgconfig(xencontrol)
-        python3
-        python3dist(jinja2)
-        python3dist(lxml)
-        python3dist(pefile)
-        python3dist(pyelftools)
-        python3dist(pytest)