We certainly didn't generate the armhf list via lcitool as it couldn't deal with ubuntu or foreign layers. Now we can properly generate the list.
Fixes: 1417704564a (tests/lcitool: generate package lists for ansible) Signed-off-by: Alex Bennée <[email protected]> --- ...armhf-cross.yml => ubuntu-2404-armhf.yaml} | 65 +++---------------- tests/lcitool/refresh | 11 ++++ 2 files changed, 20 insertions(+), 56 deletions(-) rename scripts/ci/setup/ubuntu/{ubuntu-2204-armhf-cross.yml => ubuntu-2404-armhf.yaml} (65%) diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml b/scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml similarity index 65% rename from scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml rename to scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml index 0cc34cd10b9..f06f95514bd 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml @@ -1,64 +1,13 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables --cross-arch armv7l ubuntu-2204 qemu +# $ lcitool variables --host-arch aarch64 --cross-arch armv7l ubuntu-2404 qemu # # https://gitlab.com/libvirt/libvirt-ci packages: - - bash - - bc - - bison - - bsdextrautils - - bzip2 - - ca-certificates - - ccache - - dbus - - debianutils - - diffutils - - exuberant-ctags - - findutils - - flex - - gcc - - gcovr - - gettext - - git - - hostname - - libglib2.0-dev - - libpcre2-dev - - libsndio-dev - - libspice-protocol-dev - - llvm - - locales - - make - - meson - - mtools - - ncat - - ninja-build - - openssh-client - - pkgconf - - python3 - - python3-numpy - - python3-opencv - - python3-pillow - - python3-pip - - python3-sphinx - - python3-sphinx-rtd-theme - - python3-tomli - - python3-venv - - python3-yaml - - rpm2cpio - - sed - - socat - - sparse - - swtpm - - tar - - tesseract-ocr - - tesseract-ocr-eng - - xorriso - - zstd - gcc-arm-linux-gnueabihf - libaio-dev:armhf - - libasan6:armhf + - libasan8:armhf - libasound2-dev:armhf - libattr1-dev:armhf - libbpf-dev:armhf @@ -68,6 +17,7 @@ packages: - libcacard-dev:armhf - libcap-ng-dev:armhf - libcapstone-dev:armhf + - libcbor-dev:armhf - libcmocka-dev:armhf - libcurl4-gnutls-dev:armhf - libdaxctl-dev:armhf @@ -82,7 +32,7 @@ packages: - libglusterfs-dev:armhf - libgnutls28-dev:armhf - libgtk-3-dev:armhf - - libibumad-dev:armhf + - libgtk-vnc-2.0-dev:armhf - libibverbs-dev:armhf - libiscsi-dev:armhf - libjemalloc-dev:armhf @@ -94,11 +44,11 @@ packages: - libnfs-dev:armhf - libnuma-dev:armhf - libpam0g-dev:armhf + - libpcre2-dev:armhf - libpipewire-0.3-dev:armhf - libpixman-1-dev:armhf - libpng-dev:armhf - libpulse-dev:armhf - - librbd-dev:armhf - librdmacm-dev:armhf - libsasl2-dev:armhf - libsdl2-dev:armhf @@ -107,8 +57,11 @@ packages: - libselinux1-dev:armhf - libslirp-dev:armhf - libsnappy-dev:armhf + - libsndio-dev:armhf + - libspice-protocol-dev:armhf - libspice-server-dev:armhf - libssh-dev:armhf + - libstd-rust-dev:armhf - libsystemd-dev:armhf - libtasn1-6-dev:armhf - libubsan1:armhf @@ -119,7 +72,7 @@ packages: - libvdeplug-dev:armhf - libvirglrenderer-dev:armhf - libvte-2.91-dev:armhf - - libxen-dev:armhf + - libxdp-dev:armhf - libzstd-dev:armhf - nettle-dev:armhf - systemtap-sdt-dev:armhf diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 056cfb6e9d7..8ad45da19c1 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -99,6 +99,16 @@ def generate_yaml(os, target, arch, trailer=None): arch, target, "qemu"] generate(filename, cmd, trailer) +# an overlay file only cares about the additional packages for cross +# so we can skip all the host packages needed. +def generate_cross_overlay_yaml(os, target, arch, name, cross, trailer=None): + filename = Path(src_dir, "scripts", "ci", "setup", os, f"{target}-{name}.yaml") + cmd = lcitool_cmd + ["variables", "--format", "yaml", + "--layer", "foreign", + "-a", arch, "--cross", cross, + target, "qemu"] + generate(filename, cmd, trailer) + alpine_extras = [ "# https://gitlab.alpinelinux.org/alpine/aports/-/issues/17463\n";, @@ -271,6 +281,7 @@ try: # Ansible package lists # generate_yaml("ubuntu", "ubuntu-2404", "aarch64") + generate_cross_overlay_yaml("ubuntu", "ubuntu-2404", "aarch64", "armhf", cross="armv7l") generate_yaml("ubuntu", "ubuntu-2404", "s390x") -- 2.47.3
