shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-12 08:58:20 +03:00
Code

mkosi: Stop using python3.9 on CentOS 8

Browse Source 
Let's get rid of all the complexity and just not build ukify on
CentOS Stream 8.
This commit is contained in:
Daan De Meyer 2023-07-14 14:31:40 +02:00
parent 2defccf3e1
commit 3e0718f282
10 changed files with 20 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mkosi.presets/00-base/mkosi.build
View File

@ -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

7
mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf
View File

@ -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

7
mkosi.presets/00-base/mkosi.conf.d/10-fedora.conf
View File

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

16
mkosi.presets/00-base/mkosi.conf.d/11-centos-8.conf
View File

@ -1,16 +0,0 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Match]
Distribution=centos
Release=8
[Content]
BuildPackages=
libgcrypt-devel # CentOS Stream 8 libgcrypt-devel doesn't ship a pkg-config file.
platform-python
python3.9dist(jinja2)
python3.9dist(lxml)
python3.9dist(pefile)
python3.9dist(pyelftools)
python3.9dist(pytest)
python39

15
mkosi.presets/00-base/mkosi.conf.d/11-centos-9.conf
View File

@ -1,15 +0,0 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Match]
Distribution=centos
Release=9
[Content]
BuildPackages=
pkgconfig(libgcrypt)
platform-python
python3dist(jinja2)
python3dist(lxml)
python3dist(pefile)
python3dist(pyelftools)
python3dist(pytest)

12
mkosi.presets/00-base/mkosi.prepare
View File

@ -1,12 +0,0 @@
#!/bin/sh
# SPDX-License-Identifier: LGPL-2.1-or-later
set -e
if [ "$1" = "build" ]; then
. /etc/os-release
if [ "$ID" = "centos" ] && [ "$VERSION" = "8" ]; then
alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1
alternatives --set python3 /usr/bin/python3.9
fi
fi

5
mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
View File

@ -23,5 +23,10 @@ Packages=
passwd
polkit
procps-ng
python3
python3dist(pefile)
python3dist(pluggy) # python3-pluggy is a pytest dependency that's not installed for some reason.
python3dist(psutil)
python3dist(pytest)
quota
vim-common

4
mkosi.presets/20-final/mkosi.conf.d/10-fedora.conf
View File

@ -8,7 +8,3 @@ Packages=
btrfs-progs
compsize
f2fs-tools
python3
python3dist(pefile)
python3dist(psutil)
python3dist(pytest)

14
mkosi.presets/20-final/mkosi.conf.d/11-centos-8.conf
View File

@ -1,14 +0,0 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Match]
Distribution=centos
Release=8
[Content]
Packages=
platform-python
python3.9dist(pefile)
python3.9dist(pluggy) # python39-pluggy is a pytest dependency that's not installed for some reason.
python3.9dist(psutil)
python3.9dist(pytest)
python39

13
mkosi.presets/20-final/mkosi.conf.d/11-centos-9.conf
View File

@ -1,13 +0,0 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Match]
Distribution=centos
Release=9
[Content]
Packages=
platform-python
python3dist(pefile)
python3dist(pluggy) # python39-pluggy is a pytest dependency that's not installed for some reason.
python3dist(psutil)
python3dist(pytest)