CI: Fix builds following qemu-xen update

A recent update to qemu-xen has bumped the build requirements, with Python 3.8
being the new baseline but also needing the 'ensurepip' and 'tomllib/tomli'
packages.

 * Ubuntu/Debian package 'ensurepip' separately, but it can be obtained by
   installing the python3-venv package.

 * 'tomllib' was added to the python standard library in Python 3.11, but
   previously it was a separate package named 'tomli'.

In terms of changes required to build QEMU:

 * Ubuntu 24.04 (Noble) has Python 3.12 so only needs python3-venv

 * Ubuntu 22.04 (Jammy) has Python 3.10 but does have a python3-tomli package
   that QEMU is happy with.

 * FreeBSD has Python 3.9, but Python 3.11 is available.

In terms of exclusions:

 * Ubuntu 20.04 (Focal) has Python 3.8, but lacks any kind of tomli package.

 * Fedora 29 (Python 3.7), OpenSUSE Leap 15.6 (Python 3.6), and Ubuntu
   18.04/Bionic (Python 3.6) are now too old.

Detecting tomllib/tomli is more than can fit in build's one-liner, so break it
out into a proper script.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Anthony PERARD <anthony.perard@vates.tech>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
This commit is contained in:
Andrew Cooper committed 2024-10-04 19:27:40 +01:00
1 parent bcce5a6b62
commit 1223375d8b
5 files changed
+26 -3

No files matched your search

+2 -1
View File
@@ -7,10 +7,11 @@ freebsd_template: &FREEBSD_TEMPLATE
install_script: pkg install -y seabios gmake ninja bash
pkgconf python bison perl5
yajl lzo2 pixman argp-standalone
libxml2 glib git
libxml2 glib git python311
build_script:
- cc --version
- export PYTHON=/usr/local/bin/python3.11
- ./configure --with-system-seabios=/usr/local/share/seabios/bios.bin
- gmake -j`sysctl -n hw.ncpu` clang=y
@@ -62,6 +62,8 @@ RUN <<EOF
meson
ninja-build
python3-packaging
python3-tomli
python3-venv
)
apt-get -y --no-install-recommends install "${DEPS[@]}"
@@ -62,6 +62,7 @@ RUN <<EOF
meson
ninja-build
python3-packaging
python3-venv
)
apt-get -y --no-install-recommends install "${DEPS[@]}"
+2 -2
View File
@@ -91,9 +91,9 @@ else
cfgargs+=("--with-extra-qemuu-configure-args=\"--disable-werror\"")
fi
# Qemu requires Python 3.5 or later, and ninja
# Qemu requires Python 3.8 or later, and ninja
# and Clang 10 or later
if ! type python3 || python3 -c "import sys; res = sys.version_info < (3, 5); exit(not(res))" \
if ! type python3 || ! python3 automation/scripts/qemu-deps-check.py \
|| [[ "$cc_is_clang" == y && "$cc_ver" -lt 0x0a0000 ]] \
|| ! type ninja; then
cfgargs+=("--with-system-qemu=/bin/false")
+19
View File
@@ -0,0 +1,19 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
import sys
if sys.version_info < (3, 8):
print("Python %d.%d.%d too old" %
(sys.version_info.major,
sys.version_info.minor,
sys.version_info.micro))
exit(1)
try:
import tomllib
except ImportError:
try:
import tomli
except ImportError:
print("No tomli")
exit(1)
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.