b38d263bca
* add CI job using Fedora + Rust nightly * fix detection of ATOMIC128 on x86_64 * fix compilation with Sphinx 8.1.0 -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmcJEKUUHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroOSZQf+LlvZm9npHR6lZ9DEruhu/uf0c1gO 9+dBJiKQ1OWopSQOqEgOsLL0J123Ls4V8O3tzZwIDuuRofCB2+wKswad6CHoydJx 4p9rRXv6MLlnTqqGxemm/dPZqJ7+6L0poHoDKW+s7AgfVDshhj1RSbQfs8Ujh41F f1sdi3DzopVWtK4CE+8/UeLy5Cxlixke9SKhYQrFHrdsANARP81gxQjczKApMc1z v9qkrLtkM06VUyuvbPps7CHSHDpzx9mXcmkkPgLqLX9MfbCztzi44aVSaS9HYk5G y54dSKdY7VJEuGhG916G+GMDJyow4nhT9Gk6tWtk63TQN5nExVsoZMOmdw== =PFGL -----END PGP SIGNATURE----- Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging * first commit for Rust support * add CI job using Fedora + Rust nightly * fix detection of ATOMIC128 on x86_64 * fix compilation with Sphinx 8.1.0 # -----BEGIN PGP SIGNATURE----- # # iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmcJEKUUHHBib256aW5p # QHJlZGhhdC5jb20ACgkQv/vSX3jHroOSZQf+LlvZm9npHR6lZ9DEruhu/uf0c1gO # 9+dBJiKQ1OWopSQOqEgOsLL0J123Ls4V8O3tzZwIDuuRofCB2+wKswad6CHoydJx # 4p9rRXv6MLlnTqqGxemm/dPZqJ7+6L0poHoDKW+s7AgfVDshhj1RSbQfs8Ujh41F # f1sdi3DzopVWtK4CE+8/UeLy5Cxlixke9SKhYQrFHrdsANARP81gxQjczKApMc1z # v9qkrLtkM06VUyuvbPps7CHSHDpzx9mXcmkkPgLqLX9MfbCztzi44aVSaS9HYk5G # y54dSKdY7VJEuGhG916G+GMDJyow4nhT9Gk6tWtk63TQN5nExVsoZMOmdw== # =PFGL # -----END PGP SIGNATURE----- # gpg: Signature made Fri 11 Oct 2024 12:48:53 BST # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * tag 'for-upstream' of https://gitlab.com/bonzini/qemu: docs: use consistent markup for footnotes docs: avoid footnotes consisting of just URLs docs: fix invalid footnote syntax gitlab-ci: add Rust-enabled CI job dockerfiles: add a Dockerfile using a nightly Rust toolchain meson: ensure -mcx16 is passed when detecting ATOMIC128 meson: define qemu_isa_flags meson: fix machine option for x86_version rust: add PL011 device model rust: add utility procedural macro crate scripts/archive-source: find directory name for subprojects rust: add crate to expose bindings and interfaces meson.build: add HAVE_GLIB_WITH_ALIGNED_ALLOC flag .gitattributes: add Rust diff and merge attributes rust: add bindgen step as a meson dependency configure, meson: detect Rust toolchain build-sys: Add rust feature option Require meson version 1.5.0 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
250 lines
9.0 KiB
Python
Executable File
250 lines
9.0 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
#
|
|
# Re-generate container recipes
|
|
#
|
|
# This script uses the "lcitool" available from
|
|
#
|
|
# https://gitlab.com/libvirt/libvirt-ci
|
|
#
|
|
# Copyright (c) 2020 Red Hat Inc.
|
|
#
|
|
# This work is licensed under the terms of the GNU GPL, version 2
|
|
# or (at your option) any later version. See the COPYING file in
|
|
# the top-level directory.
|
|
|
|
import sys
|
|
import subprocess
|
|
|
|
from pathlib import Path
|
|
|
|
if len(sys.argv) != 1:
|
|
print("syntax: %s" % sys.argv[0], file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
self_dir = Path(__file__).parent
|
|
src_dir = self_dir.parent.parent
|
|
dockerfiles_dir = Path(src_dir, "tests", "docker", "dockerfiles")
|
|
|
|
lcitool_path = Path(self_dir, "libvirt-ci", "bin", "lcitool")
|
|
|
|
lcitool_cmd = [lcitool_path, "--data-dir", self_dir]
|
|
|
|
|
|
def atomic_write(filename, content):
|
|
tmp = filename.with_suffix(filename.suffix + ".tmp")
|
|
try:
|
|
with tmp.open("w") as fp:
|
|
print(content, file=fp, end="")
|
|
tmp.rename(filename)
|
|
except Exception as ex:
|
|
tmp.unlink()
|
|
raise
|
|
|
|
|
|
def generate(filename, cmd, trailer):
|
|
print("Generate %s" % filename)
|
|
lcitool = subprocess.run(cmd, capture_output=True, encoding='utf8')
|
|
|
|
if lcitool.returncode != 0:
|
|
raise Exception("Failed to generate %s: %s" % (filename, lcitool.stderr))
|
|
|
|
content = lcitool.stdout
|
|
if trailer is not None:
|
|
content += trailer
|
|
atomic_write(filename, content)
|
|
|
|
# Optional user setting, this will always be the last thing added
|
|
# so maximise the number of layers that are cached
|
|
add_user_mapping = [
|
|
"# As a final step configure the user (if env is defined)",
|
|
"ARG USER",
|
|
"ARG UID",
|
|
"RUN if [ \"${USER}\" ]; then \\",
|
|
" id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi\n"
|
|
]
|
|
|
|
def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None):
|
|
filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker")
|
|
cmd = lcitool_cmd + ["dockerfile"]
|
|
if cross is not None:
|
|
cmd.extend(["--cross", cross])
|
|
cmd.extend([target, project])
|
|
|
|
if trailer is not None:
|
|
trailer += "\n".join(add_user_mapping)
|
|
else:
|
|
trailer = "\n".join(add_user_mapping)
|
|
|
|
generate(filename, cmd, trailer)
|
|
|
|
|
|
def generate_cirrus(target, trailer=None):
|
|
filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars")
|
|
cmd = lcitool_cmd + ["variables", "--format", "shell", target, "qemu"]
|
|
generate(filename, cmd, trailer)
|
|
|
|
|
|
def generate_pkglist(vm, target):
|
|
filename = Path(src_dir, "tests", "vm", "generated", vm + ".json")
|
|
cmd = lcitool_cmd + ["variables", "--format", "json", target, "qemu"]
|
|
generate(filename, cmd, None)
|
|
|
|
|
|
def generate_yaml(os, target, arch, trailer=None):
|
|
filename = Path(src_dir, "scripts", "ci", "setup", os, f"{target}-{arch}.yaml")
|
|
cmd = lcitool_cmd + ["variables", "--format", "yaml", "-a",
|
|
arch, target, "qemu"]
|
|
generate(filename, cmd, trailer)
|
|
|
|
|
|
# Netmap still needs to be manually built as it is yet to be packaged
|
|
# into a distro. We also add cscope and gtags which are used in the CI
|
|
# test
|
|
debian12_extras = [
|
|
"# netmap/cscope/global\n",
|
|
"RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n",
|
|
" apt install -y --no-install-recommends \\\n",
|
|
" cscope\\\n",
|
|
" global\\\n",
|
|
" linux-headers-generic\n",
|
|
"RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap\n",
|
|
"RUN cd /usr/src/netmap && git checkout v11.3\n",
|
|
"RUN cd /usr/src/netmap/LINUX && \\\n",
|
|
" ./configure --no-drivers --no-apps \\\n",
|
|
" --kernel-dir=$(ls -d /usr/src/linux-headers-*-$(dpkg --print-architecture)) \\\n",
|
|
" && make install\n",
|
|
"ENV QEMU_CONFIGURE_OPTS --enable-netmap\n"
|
|
]
|
|
|
|
# Based on the hub.docker.com/library/rust Dockerfiles
|
|
fedora_rustup_nightly_extras = [
|
|
"RUN dnf install -y wget\n",
|
|
"ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo\n",
|
|
"ENV RUSTC=/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc\n",
|
|
"RUN set -eux && \\\n",
|
|
" rustArch='x86_64-unknown-linux-gnu' && \\\n",
|
|
" rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' && \\\n",
|
|
' url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" && \\\n',
|
|
' wget "$url" && \\\n',
|
|
' echo "${rustupSha256} *rustup-init" | sha256sum -c - && \\\n',
|
|
" chmod +x rustup-init && \\\n",
|
|
" ./rustup-init -y --no-modify-path --profile default --default-toolchain nightly --default-host ${rustArch} && \\\n",
|
|
" chmod -R a+w $RUSTUP_HOME $CARGO_HOME && \\\n",
|
|
" /usr/local/cargo/bin/rustup --version && \\\n",
|
|
" /usr/local/cargo/bin/rustup run nightly rustc --version && \\\n",
|
|
' test "$RUSTC" = "$(/usr/local/cargo/bin/rustup +nightly which rustc)"\n',
|
|
'ENV PATH=$CARGO_HOME/bin:$PATH\n',
|
|
'RUN /usr/local/cargo/bin/rustup run nightly cargo install bindgen-cli\n',
|
|
]
|
|
|
|
def cross_build(prefix, targets):
|
|
conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix)
|
|
targets = "ENV DEF_TARGET_LIST %s\n" % (targets)
|
|
return "".join([conf, targets])
|
|
|
|
#
|
|
# Update all the various build configurations.
|
|
# Please keep each group sorted alphabetically for easy reading.
|
|
#
|
|
|
|
try:
|
|
#
|
|
# Standard native builds
|
|
#
|
|
generate_dockerfile("alpine", "alpine-319")
|
|
generate_dockerfile("centos9", "centos-stream-9")
|
|
generate_dockerfile("debian", "debian-12",
|
|
trailer="".join(debian12_extras))
|
|
generate_dockerfile("fedora", "fedora-40")
|
|
generate_dockerfile("opensuse-leap", "opensuse-leap-15")
|
|
generate_dockerfile("ubuntu2204", "ubuntu-2204")
|
|
|
|
#
|
|
# Non-fatal Rust-enabled build
|
|
#
|
|
generate_dockerfile("fedora-rust-nightly", "fedora-40",
|
|
trailer="".join(fedora_rustup_nightly_extras))
|
|
|
|
#
|
|
# Cross compiling builds
|
|
#
|
|
generate_dockerfile("debian-amd64-cross", "debian-12",
|
|
cross="x86_64",
|
|
trailer=cross_build("x86_64-linux-gnu-",
|
|
"x86_64-softmmu,"
|
|
"x86_64-linux-user,"
|
|
"i386-softmmu,i386-linux-user"))
|
|
|
|
generate_dockerfile("debian-arm64-cross", "debian-12",
|
|
cross="aarch64",
|
|
trailer=cross_build("aarch64-linux-gnu-",
|
|
"aarch64-softmmu,aarch64-linux-user"))
|
|
|
|
generate_dockerfile("debian-armhf-cross", "debian-12",
|
|
cross="armv7l",
|
|
trailer=cross_build("arm-linux-gnueabihf-",
|
|
"arm-softmmu,arm-linux-user"))
|
|
|
|
generate_dockerfile("debian-i686-cross", "debian-12",
|
|
cross="i686",
|
|
trailer=cross_build("i686-linux-gnu-",
|
|
"x86_64-softmmu,"
|
|
"x86_64-linux-user,"
|
|
"i386-softmmu,i386-linux-user"))
|
|
|
|
generate_dockerfile("debian-mips64el-cross", "debian-12",
|
|
cross="mips64el",
|
|
trailer=cross_build("mips64el-linux-gnuabi64-",
|
|
"mips64el-softmmu,mips64el-linux-user"))
|
|
|
|
generate_dockerfile("debian-mipsel-cross", "debian-12",
|
|
cross="mipsel",
|
|
trailer=cross_build("mipsel-linux-gnu-",
|
|
"mipsel-softmmu,mipsel-linux-user"))
|
|
|
|
generate_dockerfile("debian-ppc64el-cross", "debian-12",
|
|
cross="ppc64le",
|
|
trailer=cross_build("powerpc64le-linux-gnu-",
|
|
"ppc64-softmmu,ppc64-linux-user"))
|
|
|
|
generate_dockerfile("debian-riscv64-cross", "debian-sid",
|
|
project="qemu-minimal",
|
|
cross="riscv64",
|
|
trailer=cross_build("riscv64-linux-gnu-",
|
|
"riscv64-softmmu,riscv64-linux-user"))
|
|
|
|
generate_dockerfile("debian-s390x-cross", "debian-12",
|
|
cross="s390x",
|
|
trailer=cross_build("s390x-linux-gnu-",
|
|
"s390x-softmmu,s390x-linux-user"))
|
|
|
|
generate_dockerfile("fedora-win64-cross", "fedora-40",
|
|
project='qemu,qemu-win-installer',
|
|
cross="mingw64",
|
|
trailer=cross_build("x86_64-w64-mingw32-",
|
|
"x86_64-softmmu"))
|
|
|
|
#
|
|
# Cirrus packages lists for GitLab
|
|
#
|
|
generate_cirrus("freebsd-14")
|
|
generate_cirrus("macos-14")
|
|
generate_cirrus("macos-15")
|
|
|
|
#
|
|
# VM packages lists
|
|
#
|
|
generate_pkglist("freebsd", "freebsd-14")
|
|
|
|
#
|
|
# Ansible package lists
|
|
#
|
|
generate_yaml("ubuntu", "ubuntu-2204", "aarch64")
|
|
generate_yaml("ubuntu", "ubuntu-2204", "s390x")
|
|
|
|
|
|
sys.exit(0)
|
|
except Exception as ex:
|
|
print(str(ex), file=sys.stderr)
|
|
sys.exit(1)
|