From: Michal Privoznik <[email protected]> This drops Debian 12 and introduces Debian 13, since Debian 12 reached its EOL on 2026-06-10 [1]. However, Debian 13 dropped official support for mipsel and mips64el, but introduced riscv64 support. Reflect this changes in supported arches in the manifest file and regenerate with the latest lcitool.
1: https://www.debian.org/releases/ Signed-off-by: Michal Privoznik <[email protected]> --- ci/buildenv/debian-12-cross-mips64el.sh | 109 --------------- ci/buildenv/debian-12-cross-mipsel.sh | 109 --------------- ...-aarch64.sh => debian-13-cross-aarch64.sh} | 0 ...ss-armv6l.sh => debian-13-cross-armv6l.sh} | 2 - ...ss-armv7l.sh => debian-13-cross-armv7l.sh} | 3 - ...-cross-i686.sh => debian-13-cross-i686.sh} | 2 - ...-ppc64le.sh => debian-13-cross-ppc64le.sh} | 0 ci/buildenv/debian-13-cross-riscv64.sh | 109 +++++++++++++++ ...ross-s390x.sh => debian-13-cross-s390x.sh} | 0 ci/buildenv/{debian-12.sh => debian-13.sh} | 0 ci/buildenv/debian-sid-cross-mips64el.sh | 109 --------------- ci/buildenv/debian-sid-cross-riscv64.sh | 109 +++++++++++++++ .../debian-12-cross-mips64el.Dockerfile | 115 ---------------- .../debian-12-cross-mipsel.Dockerfile | 115 ---------------- ...ile => debian-13-cross-aarch64.Dockerfile} | 2 +- ...file => debian-13-cross-armv6l.Dockerfile} | 4 +- ...file => debian-13-cross-armv7l.Dockerfile} | 5 +- ...erfile => debian-13-cross-i686.Dockerfile} | 4 +- ...ile => debian-13-cross-ppc64le.Dockerfile} | 2 +- .../debian-13-cross-riscv64.Dockerfile | 115 ++++++++++++++++ ...rfile => debian-13-cross-s390x.Dockerfile} | 2 +- ...ian-12.Dockerfile => debian-13.Dockerfile} | 2 +- .../debian-sid-cross-mips64el.Dockerfile | 115 ---------------- .../debian-sid-cross-riscv64.Dockerfile | 115 ++++++++++++++++ ci/gitlab/builds.yml | 129 ++++++++---------- ci/gitlab/containers.yml | 56 ++++---- ci/manifest.yml | 18 +-- 27 files changed, 544 insertions(+), 807 deletions(-) delete mode 100644 ci/buildenv/debian-12-cross-mips64el.sh delete mode 100644 ci/buildenv/debian-12-cross-mipsel.sh rename ci/buildenv/{debian-12-cross-aarch64.sh => debian-13-cross-aarch64.sh} (100%) rename ci/buildenv/{debian-12-cross-armv6l.sh => debian-13-cross-armv6l.sh} (98%) rename ci/buildenv/{debian-12-cross-armv7l.sh => debian-13-cross-armv7l.sh} (97%) rename ci/buildenv/{debian-12-cross-i686.sh => debian-13-cross-i686.sh} (98%) rename ci/buildenv/{debian-12-cross-ppc64le.sh => debian-13-cross-ppc64le.sh} (100%) create mode 100644 ci/buildenv/debian-13-cross-riscv64.sh rename ci/buildenv/{debian-12-cross-s390x.sh => debian-13-cross-s390x.sh} (100%) rename ci/buildenv/{debian-12.sh => debian-13.sh} (100%) delete mode 100644 ci/buildenv/debian-sid-cross-mips64el.sh create mode 100644 ci/buildenv/debian-sid-cross-riscv64.sh delete mode 100644 ci/containers/debian-12-cross-mips64el.Dockerfile delete mode 100644 ci/containers/debian-12-cross-mipsel.Dockerfile rename ci/containers/{debian-12-cross-aarch64.Dockerfile => debian-13-cross-aarch64.Dockerfile} (99%) rename ci/containers/{debian-12-cross-armv6l.Dockerfile => debian-13-cross-armv6l.Dockerfile} (97%) rename ci/containers/{debian-12-cross-armv7l.Dockerfile => debian-13-cross-armv7l.Dockerfile} (96%) rename ci/containers/{debian-12-cross-i686.Dockerfile => debian-13-cross-i686.Dockerfile} (97%) rename ci/containers/{debian-12-cross-ppc64le.Dockerfile => debian-13-cross-ppc64le.Dockerfile} (99%) create mode 100644 ci/containers/debian-13-cross-riscv64.Dockerfile rename ci/containers/{debian-12-cross-s390x.Dockerfile => debian-13-cross-s390x.Dockerfile} (99%) rename ci/containers/{debian-12.Dockerfile => debian-13.Dockerfile} (98%) delete mode 100644 ci/containers/debian-sid-cross-mips64el.Dockerfile create mode 100644 ci/containers/debian-sid-cross-riscv64.Dockerfile diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh deleted file mode 100644 index a126accfd4..0000000000 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ /dev/null @@ -1,109 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - export DEBIAN_FRONTEND=noninteractive - dpkg --add-architecture mips64el - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y dpkg-dev - apt-get install --no-install-recommends -y \ - gcc-mips64el-linux-gnuabi64 \ - libacl1-dev:mips64el \ - libapparmor-dev:mips64el \ - libattr1-dev:mips64el \ - libaudit-dev:mips64el \ - libblkid-dev:mips64el \ - libc6-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdevmapper-dev:mips64el \ - libfuse3-dev:mips64el \ - libglib2.0-dev:mips64el \ - libglusterfs-dev:mips64el \ - libgnutls28-dev:mips64el \ - libiscsi-dev:mips64el \ - libjson-c-dev:mips64el \ - libnl-3-dev:mips64el \ - libnl-route-3-dev:mips64el \ - libnuma-dev:mips64el \ - libparted-dev:mips64el \ - libpcap0.8-dev:mips64el \ - libpciaccess-dev:mips64el \ - librbd-dev:mips64el \ - libreadline-dev:mips64el \ - libsanlock-dev:mips64el \ - libsasl2-dev:mips64el \ - libselinux1-dev:mips64el \ - libssh-dev:mips64el \ - libssh2-1-dev:mips64el \ - libtirpc-dev:mips64el \ - libudev-dev:mips64el \ - libxml2-dev:mips64el \ - systemtap-sdt-dev:mips64el - mkdir -p /usr/local/share/meson/cross - printf "[binaries]\n\ -c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ -ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ -strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ -pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'mips64'\n\ -cpu = 'mips64el'\n\ -endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" - -export ABI="mips64el-linux-gnuabi64" -export MESON_OPTS="--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh deleted file mode 100644 index 562bb3e2f1..0000000000 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ /dev/null @@ -1,109 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - export DEBIAN_FRONTEND=noninteractive - dpkg --add-architecture mipsel - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y dpkg-dev - apt-get install --no-install-recommends -y \ - gcc-mipsel-linux-gnu \ - libacl1-dev:mipsel \ - libapparmor-dev:mipsel \ - libattr1-dev:mipsel \ - libaudit-dev:mipsel \ - libblkid-dev:mipsel \ - libc6-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdevmapper-dev:mipsel \ - libfuse3-dev:mipsel \ - libglib2.0-dev:mipsel \ - libglusterfs-dev:mipsel \ - libgnutls28-dev:mipsel \ - libiscsi-dev:mipsel \ - libjson-c-dev:mipsel \ - libnl-3-dev:mipsel \ - libnl-route-3-dev:mipsel \ - libnuma-dev:mipsel \ - libparted-dev:mipsel \ - libpcap0.8-dev:mipsel \ - libpciaccess-dev:mipsel \ - librbd-dev:mipsel \ - libreadline-dev:mipsel \ - libsanlock-dev:mipsel \ - libsasl2-dev:mipsel \ - libselinux1-dev:mipsel \ - libssh-dev:mipsel \ - libssh2-1-dev:mipsel \ - libtirpc-dev:mipsel \ - libudev-dev:mipsel \ - libxml2-dev:mipsel \ - systemtap-sdt-dev:mipsel - mkdir -p /usr/local/share/meson/cross - printf "[binaries]\n\ -c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ -ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/mipsel-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'mips'\n\ -cpu = 'mipsel'\n\ -endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" - -export ABI="mipsel-linux-gnu" -export MESON_OPTS="--cross-file=mipsel-linux-gnu" diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-13-cross-aarch64.sh similarity index 100% rename from ci/buildenv/debian-12-cross-aarch64.sh rename to ci/buildenv/debian-13-cross-aarch64.sh diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-13-cross-armv6l.sh similarity index 98% rename from ci/buildenv/debian-12-cross-armv6l.sh rename to ci/buildenv/debian-13-cross-armv6l.sh index 5520e88be7..cad3f59aca 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-13-cross-armv6l.sh @@ -60,7 +60,6 @@ function install_buildenv() { libdevmapper-dev:armel \ libfuse3-dev:armel \ libglib2.0-dev:armel \ - libglusterfs-dev:armel \ libgnutls28-dev:armel \ libiscsi-dev:armel \ libjson-c-dev:armel \ @@ -70,7 +69,6 @@ function install_buildenv() { libparted-dev:armel \ libpcap0.8-dev:armel \ libpciaccess-dev:armel \ - librbd-dev:armel \ libreadline-dev:armel \ libsanlock-dev:armel \ libsasl2-dev:armel \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-13-cross-armv7l.sh similarity index 97% rename from ci/buildenv/debian-12-cross-armv7l.sh rename to ci/buildenv/debian-13-cross-armv7l.sh index 5311e4ab72..87a93b1866 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-13-cross-armv7l.sh @@ -60,7 +60,6 @@ function install_buildenv() { libdevmapper-dev:armhf \ libfuse3-dev:armhf \ libglib2.0-dev:armhf \ - libglusterfs-dev:armhf \ libgnutls28-dev:armhf \ libiscsi-dev:armhf \ libjson-c-dev:armhf \ @@ -70,7 +69,6 @@ function install_buildenv() { libparted-dev:armhf \ libpcap0.8-dev:armhf \ libpciaccess-dev:armhf \ - librbd-dev:armhf \ libreadline-dev:armhf \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ @@ -79,7 +77,6 @@ function install_buildenv() { libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ - libxen-dev:armhf \ libxml2-dev:armhf \ systemtap-sdt-dev:armhf mkdir -p /usr/local/share/meson/cross diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-13-cross-i686.sh similarity index 98% rename from ci/buildenv/debian-12-cross-i686.sh rename to ci/buildenv/debian-13-cross-i686.sh index fcda471378..729f32540a 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-13-cross-i686.sh @@ -60,7 +60,6 @@ function install_buildenv() { libdevmapper-dev:i386 \ libfuse3-dev:i386 \ libglib2.0-dev:i386 \ - libglusterfs-dev:i386 \ libgnutls28-dev:i386 \ libiscsi-dev:i386 \ libjson-c-dev:i386 \ @@ -70,7 +69,6 @@ function install_buildenv() { libparted-dev:i386 \ libpcap0.8-dev:i386 \ libpciaccess-dev:i386 \ - librbd-dev:i386 \ libreadline-dev:i386 \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-13-cross-ppc64le.sh similarity index 100% rename from ci/buildenv/debian-12-cross-ppc64le.sh rename to ci/buildenv/debian-13-cross-ppc64le.sh diff --git a/ci/buildenv/debian-13-cross-riscv64.sh b/ci/buildenv/debian-13-cross-riscv64.sh new file mode 100644 index 0000000000..7e1cc85ffe --- /dev/null +++ b/ci/buildenv/debian-13-cross-riscv64.sh @@ -0,0 +1,109 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + export DEBIAN_FRONTEND=noninteractive + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y \ + augeas-lenses \ + augeas-tools \ + bash-completion \ + black \ + ca-certificates \ + ccache \ + codespell \ + cpp \ + diffutils \ + dwarves \ + ebtables \ + flake8 \ + gettext \ + git \ + grep \ + libclang-rt-dev \ + libnbd-dev \ + libxml2-utils \ + locales \ + make \ + meson \ + ninja-build \ + perl-base \ + pkgconf \ + python3 \ + python3-docutils \ + python3-pytest \ + qemu-utils \ + sed \ + xsltproc + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen + dpkg-reconfigure locales + rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED + export DEBIAN_FRONTEND=noninteractive + dpkg --add-architecture riscv64 + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y dpkg-dev + apt-get install --no-install-recommends -y \ + gcc-riscv64-linux-gnu \ + libacl1-dev:riscv64 \ + libapparmor-dev:riscv64 \ + libattr1-dev:riscv64 \ + libaudit-dev:riscv64 \ + libblkid-dev:riscv64 \ + libc6-dev:riscv64 \ + libcap-ng-dev:riscv64 \ + libcurl4-gnutls-dev:riscv64 \ + libdevmapper-dev:riscv64 \ + libfuse3-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libglusterfs-dev:riscv64 \ + libgnutls28-dev:riscv64 \ + libiscsi-dev:riscv64 \ + libjson-c-dev:riscv64 \ + libnl-3-dev:riscv64 \ + libnl-route-3-dev:riscv64 \ + libnuma-dev:riscv64 \ + libparted-dev:riscv64 \ + libpcap0.8-dev:riscv64 \ + libpciaccess-dev:riscv64 \ + librbd-dev:riscv64 \ + libreadline-dev:riscv64 \ + libsanlock-dev:riscv64 \ + libsasl2-dev:riscv64 \ + libselinux1-dev:riscv64 \ + libssh-dev:riscv64 \ + libssh2-1-dev:riscv64 \ + libtirpc-dev:riscv64 \ + libudev-dev:riscv64 \ + libxml2-dev:riscv64 \ + systemtap-sdt-dev:riscv64 + mkdir -p /usr/local/share/meson/cross + printf "[binaries]\n\ +c = '/usr/bin/riscv64-linux-gnu-gcc'\n\ +ar = '/usr/bin/riscv64-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/riscv64-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/riscv64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'riscv64'\n\ +cpu = 'riscv64'\n\ +endian = 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt + mkdir -p /usr/libexec/ccache-wrappers + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-cc + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-gcc +} + +export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +export LANG="en_US.UTF-8" +export MAKE="/usr/bin/make" +export NINJA="/usr/bin/ninja" +export PYTHON="/usr/bin/python3" + +export ABI="riscv64-linux-gnu" +export MESON_OPTS="--cross-file=riscv64-linux-gnu" diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-13-cross-s390x.sh similarity index 100% rename from ci/buildenv/debian-12-cross-s390x.sh rename to ci/buildenv/debian-13-cross-s390x.sh diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-13.sh similarity index 100% rename from ci/buildenv/debian-12.sh rename to ci/buildenv/debian-13.sh diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh deleted file mode 100644 index a126accfd4..0000000000 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ /dev/null @@ -1,109 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - export DEBIAN_FRONTEND=noninteractive - dpkg --add-architecture mips64el - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y dpkg-dev - apt-get install --no-install-recommends -y \ - gcc-mips64el-linux-gnuabi64 \ - libacl1-dev:mips64el \ - libapparmor-dev:mips64el \ - libattr1-dev:mips64el \ - libaudit-dev:mips64el \ - libblkid-dev:mips64el \ - libc6-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdevmapper-dev:mips64el \ - libfuse3-dev:mips64el \ - libglib2.0-dev:mips64el \ - libglusterfs-dev:mips64el \ - libgnutls28-dev:mips64el \ - libiscsi-dev:mips64el \ - libjson-c-dev:mips64el \ - libnl-3-dev:mips64el \ - libnl-route-3-dev:mips64el \ - libnuma-dev:mips64el \ - libparted-dev:mips64el \ - libpcap0.8-dev:mips64el \ - libpciaccess-dev:mips64el \ - librbd-dev:mips64el \ - libreadline-dev:mips64el \ - libsanlock-dev:mips64el \ - libsasl2-dev:mips64el \ - libselinux1-dev:mips64el \ - libssh-dev:mips64el \ - libssh2-1-dev:mips64el \ - libtirpc-dev:mips64el \ - libudev-dev:mips64el \ - libxml2-dev:mips64el \ - systemtap-sdt-dev:mips64el - mkdir -p /usr/local/share/meson/cross - printf "[binaries]\n\ -c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ -ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ -strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ -pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'mips64'\n\ -cpu = 'mips64el'\n\ -endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" - -export ABI="mips64el-linux-gnuabi64" -export MESON_OPTS="--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/buildenv/debian-sid-cross-riscv64.sh b/ci/buildenv/debian-sid-cross-riscv64.sh new file mode 100644 index 0000000000..7e1cc85ffe --- /dev/null +++ b/ci/buildenv/debian-sid-cross-riscv64.sh @@ -0,0 +1,109 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + export DEBIAN_FRONTEND=noninteractive + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y \ + augeas-lenses \ + augeas-tools \ + bash-completion \ + black \ + ca-certificates \ + ccache \ + codespell \ + cpp \ + diffutils \ + dwarves \ + ebtables \ + flake8 \ + gettext \ + git \ + grep \ + libclang-rt-dev \ + libnbd-dev \ + libxml2-utils \ + locales \ + make \ + meson \ + ninja-build \ + perl-base \ + pkgconf \ + python3 \ + python3-docutils \ + python3-pytest \ + qemu-utils \ + sed \ + xsltproc + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen + dpkg-reconfigure locales + rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED + export DEBIAN_FRONTEND=noninteractive + dpkg --add-architecture riscv64 + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y dpkg-dev + apt-get install --no-install-recommends -y \ + gcc-riscv64-linux-gnu \ + libacl1-dev:riscv64 \ + libapparmor-dev:riscv64 \ + libattr1-dev:riscv64 \ + libaudit-dev:riscv64 \ + libblkid-dev:riscv64 \ + libc6-dev:riscv64 \ + libcap-ng-dev:riscv64 \ + libcurl4-gnutls-dev:riscv64 \ + libdevmapper-dev:riscv64 \ + libfuse3-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libglusterfs-dev:riscv64 \ + libgnutls28-dev:riscv64 \ + libiscsi-dev:riscv64 \ + libjson-c-dev:riscv64 \ + libnl-3-dev:riscv64 \ + libnl-route-3-dev:riscv64 \ + libnuma-dev:riscv64 \ + libparted-dev:riscv64 \ + libpcap0.8-dev:riscv64 \ + libpciaccess-dev:riscv64 \ + librbd-dev:riscv64 \ + libreadline-dev:riscv64 \ + libsanlock-dev:riscv64 \ + libsasl2-dev:riscv64 \ + libselinux1-dev:riscv64 \ + libssh-dev:riscv64 \ + libssh2-1-dev:riscv64 \ + libtirpc-dev:riscv64 \ + libudev-dev:riscv64 \ + libxml2-dev:riscv64 \ + systemtap-sdt-dev:riscv64 + mkdir -p /usr/local/share/meson/cross + printf "[binaries]\n\ +c = '/usr/bin/riscv64-linux-gnu-gcc'\n\ +ar = '/usr/bin/riscv64-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/riscv64-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/riscv64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'riscv64'\n\ +cpu = 'riscv64'\n\ +endian = 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt + mkdir -p /usr/libexec/ccache-wrappers + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-cc + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-gcc +} + +export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +export LANG="en_US.UTF-8" +export MAKE="/usr/bin/make" +export NINJA="/usr/bin/ninja" +export PYTHON="/usr/bin/python3" + +export ABI="riscv64-linux-gnu" +export MESON_OPTS="--cross-file=riscv64-linux-gnu" diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile deleted file mode 100644 index 51abdb4469..0000000000 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ /dev/null @@ -1,115 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:12-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - -ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -ENV LANG="en_US.UTF-8" -ENV MAKE="/usr/bin/make" -ENV NINJA="/usr/bin/ninja" -ENV PYTHON="/usr/bin/python3" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture mips64el && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mips64el-linux-gnuabi64 \ - libacl1-dev:mips64el \ - libapparmor-dev:mips64el \ - libattr1-dev:mips64el \ - libaudit-dev:mips64el \ - libblkid-dev:mips64el \ - libc6-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdevmapper-dev:mips64el \ - libfuse3-dev:mips64el \ - libglib2.0-dev:mips64el \ - libglusterfs-dev:mips64el \ - libgnutls28-dev:mips64el \ - libiscsi-dev:mips64el \ - libjson-c-dev:mips64el \ - libnl-3-dev:mips64el \ - libnl-route-3-dev:mips64el \ - libnuma-dev:mips64el \ - libparted-dev:mips64el \ - libpcap0.8-dev:mips64el \ - libpciaccess-dev:mips64el \ - librbd-dev:mips64el \ - libreadline-dev:mips64el \ - libsanlock-dev:mips64el \ - libsasl2-dev:mips64el \ - libselinux1-dev:mips64el \ - libssh-dev:mips64el \ - libssh2-1-dev:mips64el \ - libtirpc-dev:mips64el \ - libudev-dev:mips64el \ - libxml2-dev:mips64el \ - systemtap-sdt-dev:mips64el && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ -ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ -strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ -pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'mips64'\n\ -cpu = 'mips64el'\n\ -endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc - -ENV ABI="mips64el-linux-gnuabi64" -ENV MESON_OPTS="--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile deleted file mode 100644 index 09c115b460..0000000000 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ /dev/null @@ -1,115 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:12-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - -ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -ENV LANG="en_US.UTF-8" -ENV MAKE="/usr/bin/make" -ENV NINJA="/usr/bin/ninja" -ENV PYTHON="/usr/bin/python3" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture mipsel && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mipsel-linux-gnu \ - libacl1-dev:mipsel \ - libapparmor-dev:mipsel \ - libattr1-dev:mipsel \ - libaudit-dev:mipsel \ - libblkid-dev:mipsel \ - libc6-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdevmapper-dev:mipsel \ - libfuse3-dev:mipsel \ - libglib2.0-dev:mipsel \ - libglusterfs-dev:mipsel \ - libgnutls28-dev:mipsel \ - libiscsi-dev:mipsel \ - libjson-c-dev:mipsel \ - libnl-3-dev:mipsel \ - libnl-route-3-dev:mipsel \ - libnuma-dev:mipsel \ - libparted-dev:mipsel \ - libpcap0.8-dev:mipsel \ - libpciaccess-dev:mipsel \ - librbd-dev:mipsel \ - libreadline-dev:mipsel \ - libsanlock-dev:mipsel \ - libsasl2-dev:mipsel \ - libselinux1-dev:mipsel \ - libssh-dev:mipsel \ - libssh2-1-dev:mipsel \ - libtirpc-dev:mipsel \ - libudev-dev:mipsel \ - libxml2-dev:mipsel \ - systemtap-sdt-dev:mipsel && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ -ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/mipsel-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'mips'\n\ -cpu = 'mipsel'\n\ -endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc - -ENV ABI="mipsel-linux-gnu" -ENV MESON_OPTS="--cross-file=mipsel-linux-gnu" diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-13-cross-aarch64.Dockerfile similarity index 99% rename from ci/containers/debian-12-cross-aarch64.Dockerfile rename to ci/containers/debian-13-cross-aarch64.Dockerfile index 88253a89dc..6293715d29 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-13-cross-aarch64.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-13-cross-armv6l.Dockerfile similarity index 97% rename from ci/containers/debian-12-cross-armv6l.Dockerfile rename to ci/containers/debian-13-cross-armv6l.Dockerfile index dfb48adb78..8c54391915 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-13-cross-armv6l.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -71,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libdevmapper-dev:armel \ libfuse3-dev:armel \ libglib2.0-dev:armel \ - libglusterfs-dev:armel \ libgnutls28-dev:armel \ libiscsi-dev:armel \ libjson-c-dev:armel \ @@ -81,7 +80,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libparted-dev:armel \ libpcap0.8-dev:armel \ libpciaccess-dev:armel \ - librbd-dev:armel \ libreadline-dev:armel \ libsanlock-dev:armel \ libsasl2-dev:armel \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-13-cross-armv7l.Dockerfile similarity index 96% rename from ci/containers/debian-12-cross-armv7l.Dockerfile rename to ci/containers/debian-13-cross-armv7l.Dockerfile index b70f2475c1..fd54af8649 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-13-cross-armv7l.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -71,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libdevmapper-dev:armhf \ libfuse3-dev:armhf \ libglib2.0-dev:armhf \ - libglusterfs-dev:armhf \ libgnutls28-dev:armhf \ libiscsi-dev:armhf \ libjson-c-dev:armhf \ @@ -81,7 +80,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libparted-dev:armhf \ libpcap0.8-dev:armhf \ libpciaccess-dev:armhf \ - librbd-dev:armhf \ libreadline-dev:armhf \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ @@ -90,7 +88,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ - libxen-dev:armhf \ libxml2-dev:armhf \ systemtap-sdt-dev:armhf && \ eatmydata apt-get autoremove -y && \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-13-cross-i686.Dockerfile similarity index 97% rename from ci/containers/debian-12-cross-i686.Dockerfile rename to ci/containers/debian-13-cross-i686.Dockerfile index 863d2849fc..3cb098e30f 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-13-cross-i686.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -71,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libdevmapper-dev:i386 \ libfuse3-dev:i386 \ libglib2.0-dev:i386 \ - libglusterfs-dev:i386 \ libgnutls28-dev:i386 \ libiscsi-dev:i386 \ libjson-c-dev:i386 \ @@ -81,7 +80,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libparted-dev:i386 \ libpcap0.8-dev:i386 \ libpciaccess-dev:i386 \ - librbd-dev:i386 \ libreadline-dev:i386 \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-13-cross-ppc64le.Dockerfile similarity index 99% rename from ci/containers/debian-12-cross-ppc64le.Dockerfile rename to ci/containers/debian-13-cross-ppc64le.Dockerfile index aa12740271..e18dcc9356 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-13-cross-ppc64le.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ diff --git a/ci/containers/debian-13-cross-riscv64.Dockerfile b/ci/containers/debian-13-cross-riscv64.Dockerfile new file mode 100644 index 0000000000..1901c8996c --- /dev/null +++ b/ci/containers/debian-13-cross-riscv64.Dockerfile @@ -0,0 +1,115 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:13-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + augeas-lenses \ + augeas-tools \ + bash-completion \ + black \ + ca-certificates \ + ccache \ + codespell \ + cpp \ + diffutils \ + dwarves \ + ebtables \ + flake8 \ + gettext \ + git \ + grep \ + libclang-rt-dev \ + libnbd-dev \ + libxml2-utils \ + locales \ + make \ + meson \ + ninja-build \ + perl-base \ + pkgconf \ + python3 \ + python3-docutils \ + python3-pytest \ + qemu-utils \ + sed \ + xsltproc && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED + +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV MAKE="/usr/bin/make" +ENV NINJA="/usr/bin/ninja" +ENV PYTHON="/usr/bin/python3" + +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture riscv64 && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + gcc-riscv64-linux-gnu \ + libacl1-dev:riscv64 \ + libapparmor-dev:riscv64 \ + libattr1-dev:riscv64 \ + libaudit-dev:riscv64 \ + libblkid-dev:riscv64 \ + libc6-dev:riscv64 \ + libcap-ng-dev:riscv64 \ + libcurl4-gnutls-dev:riscv64 \ + libdevmapper-dev:riscv64 \ + libfuse3-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libglusterfs-dev:riscv64 \ + libgnutls28-dev:riscv64 \ + libiscsi-dev:riscv64 \ + libjson-c-dev:riscv64 \ + libnl-3-dev:riscv64 \ + libnl-route-3-dev:riscv64 \ + libnuma-dev:riscv64 \ + libparted-dev:riscv64 \ + libpcap0.8-dev:riscv64 \ + libpciaccess-dev:riscv64 \ + librbd-dev:riscv64 \ + libreadline-dev:riscv64 \ + libsanlock-dev:riscv64 \ + libsasl2-dev:riscv64 \ + libselinux1-dev:riscv64 \ + libssh-dev:riscv64 \ + libssh2-1-dev:riscv64 \ + libtirpc-dev:riscv64 \ + libudev-dev:riscv64 \ + libxml2-dev:riscv64 \ + systemtap-sdt-dev:riscv64 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + printf "[binaries]\n\ +c = '/usr/bin/riscv64-linux-gnu-gcc'\n\ +ar = '/usr/bin/riscv64-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/riscv64-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/riscv64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'riscv64'\n\ +cpu = 'riscv64'\n\ +endian = 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-gcc + +ENV ABI="riscv64-linux-gnu" +ENV MESON_OPTS="--cross-file=riscv64-linux-gnu" diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-13-cross-s390x.Dockerfile similarity index 99% rename from ci/containers/debian-12-cross-s390x.Dockerfile rename to ci/containers/debian-13-cross-s390x.Dockerfile index 4ffa2c4591..99f55321b6 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-13-cross-s390x.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-13.Dockerfile similarity index 98% rename from ci/containers/debian-12.Dockerfile rename to ci/containers/debian-13.Dockerfile index e5ab0f2a3b..c07fd4fac1 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-13.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:12-slim +FROM docker.io/library/debian:13-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile deleted file mode 100644 index cc8924daa5..0000000000 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ /dev/null @@ -1,115 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:sid-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - ca-certificates \ - ccache \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - libclang-rt-dev \ - libnbd-dev \ - libxml2-utils \ - locales \ - make \ - meson \ - ninja-build \ - perl-base \ - pkgconf \ - python3 \ - python3-docutils \ - python3-pytest \ - qemu-utils \ - sed \ - xsltproc && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - -ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -ENV LANG="en_US.UTF-8" -ENV MAKE="/usr/bin/make" -ENV NINJA="/usr/bin/ninja" -ENV PYTHON="/usr/bin/python3" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture mips64el && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mips64el-linux-gnuabi64 \ - libacl1-dev:mips64el \ - libapparmor-dev:mips64el \ - libattr1-dev:mips64el \ - libaudit-dev:mips64el \ - libblkid-dev:mips64el \ - libc6-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdevmapper-dev:mips64el \ - libfuse3-dev:mips64el \ - libglib2.0-dev:mips64el \ - libglusterfs-dev:mips64el \ - libgnutls28-dev:mips64el \ - libiscsi-dev:mips64el \ - libjson-c-dev:mips64el \ - libnl-3-dev:mips64el \ - libnl-route-3-dev:mips64el \ - libnuma-dev:mips64el \ - libparted-dev:mips64el \ - libpcap0.8-dev:mips64el \ - libpciaccess-dev:mips64el \ - librbd-dev:mips64el \ - libreadline-dev:mips64el \ - libsanlock-dev:mips64el \ - libsasl2-dev:mips64el \ - libselinux1-dev:mips64el \ - libssh-dev:mips64el \ - libssh2-1-dev:mips64el \ - libtirpc-dev:mips64el \ - libudev-dev:mips64el \ - libxml2-dev:mips64el \ - systemtap-sdt-dev:mips64el && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ -ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ -strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ -pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'mips64'\n\ -cpu = 'mips64el'\n\ -endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc - -ENV ABI="mips64el-linux-gnuabi64" -ENV MESON_OPTS="--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/containers/debian-sid-cross-riscv64.Dockerfile b/ci/containers/debian-sid-cross-riscv64.Dockerfile new file mode 100644 index 0000000000..77ca513dfd --- /dev/null +++ b/ci/containers/debian-sid-cross-riscv64.Dockerfile @@ -0,0 +1,115 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:sid-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + augeas-lenses \ + augeas-tools \ + bash-completion \ + black \ + ca-certificates \ + ccache \ + codespell \ + cpp \ + diffutils \ + dwarves \ + ebtables \ + flake8 \ + gettext \ + git \ + grep \ + libclang-rt-dev \ + libnbd-dev \ + libxml2-utils \ + locales \ + make \ + meson \ + ninja-build \ + perl-base \ + pkgconf \ + python3 \ + python3-docutils \ + python3-pytest \ + qemu-utils \ + sed \ + xsltproc && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED + +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV MAKE="/usr/bin/make" +ENV NINJA="/usr/bin/ninja" +ENV PYTHON="/usr/bin/python3" + +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture riscv64 && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + gcc-riscv64-linux-gnu \ + libacl1-dev:riscv64 \ + libapparmor-dev:riscv64 \ + libattr1-dev:riscv64 \ + libaudit-dev:riscv64 \ + libblkid-dev:riscv64 \ + libc6-dev:riscv64 \ + libcap-ng-dev:riscv64 \ + libcurl4-gnutls-dev:riscv64 \ + libdevmapper-dev:riscv64 \ + libfuse3-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libglusterfs-dev:riscv64 \ + libgnutls28-dev:riscv64 \ + libiscsi-dev:riscv64 \ + libjson-c-dev:riscv64 \ + libnl-3-dev:riscv64 \ + libnl-route-3-dev:riscv64 \ + libnuma-dev:riscv64 \ + libparted-dev:riscv64 \ + libpcap0.8-dev:riscv64 \ + libpciaccess-dev:riscv64 \ + librbd-dev:riscv64 \ + libreadline-dev:riscv64 \ + libsanlock-dev:riscv64 \ + libsasl2-dev:riscv64 \ + libselinux1-dev:riscv64 \ + libssh-dev:riscv64 \ + libssh2-1-dev:riscv64 \ + libtirpc-dev:riscv64 \ + libudev-dev:riscv64 \ + libxml2-dev:riscv64 \ + systemtap-sdt-dev:riscv64 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + printf "[binaries]\n\ +c = '/usr/bin/riscv64-linux-gnu-gcc'\n\ +ar = '/usr/bin/riscv64-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/riscv64-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/riscv64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'riscv64'\n\ +cpu = 'riscv64'\n\ +endian = 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-gcc + +ENV ABI="riscv64-linux-gnu" +ENV MESON_OPTS="--cross-file=riscv64-linux-gnu" diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index d215b23b7d..69c1047243 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -111,26 +111,26 @@ x86_64-centos-stream-10: - libvirt-rpms -x86_64-debian-12: +x86_64-debian-13: extends: .native_build_job needs: - - job: x86_64-debian-12-container + - job: x86_64-debian-13-container optional: true allow_failure: false variables: - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim -x86_64-debian-12-clang: +x86_64-debian-13-clang: extends: .native_build_job needs: - - job: x86_64-debian-12-container + - job: x86_64-debian-13-container optional: true allow_failure: false variables: - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim x86_64-debian-sid: @@ -263,107 +263,94 @@ x86_64-ubuntu-2604-clang: # Cross build jobs -aarch64-debian-12: +aarch64-debian-13: extends: .cross_build_job needs: - - job: aarch64-debian-12-container + - job: aarch64-debian-13-container optional: true allow_failure: false variables: CROSS: aarch64 JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim -armv6l-debian-12: +armv6l-debian-13: extends: .cross_build_job needs: - - job: armv6l-debian-12-container + - job: armv6l-debian-13-container optional: true allow_failure: false variables: CROSS: armv6l JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim -armv7l-debian-12: +armv7l-debian-13: extends: .cross_build_job needs: - - job: armv7l-debian-12-container + - job: armv7l-debian-13-container optional: true allow_failure: false variables: CROSS: armv7l - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim -i686-debian-12: +i686-debian-13: extends: .cross_build_job needs: - - job: i686-debian-12-container + - job: i686-debian-13-container optional: true allow_failure: false variables: CROSS: i686 JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim -mips64el-debian-12: +ppc64le-debian-13: extends: .cross_build_job needs: - - job: mips64el-debian-12-container - optional: true - allow_failure: false - variables: - CROSS: mips64el - JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim - - -mipsel-debian-12: - extends: .cross_build_job - needs: - - job: mipsel-debian-12-container - optional: true - allow_failure: false - variables: - CROSS: mipsel - JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim - - -ppc64le-debian-12: - extends: .cross_build_job - needs: - - job: ppc64le-debian-12-container + - job: ppc64le-debian-13-container optional: true allow_failure: false variables: CROSS: ppc64le JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim -s390x-debian-12: +riscv64-debian-13: extends: .cross_build_job needs: - - job: s390x-debian-12-container + - job: riscv64-debian-13-container + optional: true + allow_failure: false + variables: + CROSS: riscv64 + JOB_OPTIONAL: 1 + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim + + +s390x-debian-13: + extends: .cross_build_job + needs: + - job: s390x-debian-13-container optional: true allow_failure: false variables: CROSS: s390x JOB_OPTIONAL: 1 - NAME: debian-12 - TARGET_BASE_IMAGE: docker.io/library/debian:12-slim + NAME: debian-13 + TARGET_BASE_IMAGE: docker.io/library/debian:13-slim aarch64-debian-sid: @@ -418,19 +405,6 @@ i686-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -mips64el-debian-sid: - extends: .cross_build_job - needs: - - job: mips64el-debian-sid-container - optional: true - allow_failure: true - variables: - CROSS: mips64el - JOB_OPTIONAL: 1 - NAME: debian-sid - TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim - - ppc64le-debian-sid: extends: .cross_build_job needs: @@ -444,6 +418,19 @@ ppc64le-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim +riscv64-debian-sid: + extends: .cross_build_job + needs: + - job: riscv64-debian-sid-container + optional: true + allow_failure: true + variables: + CROSS: riscv64 + JOB_OPTIONAL: 1 + NAME: debian-sid + TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim + + s390x-debian-sid: extends: .cross_build_job needs: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 1383c6388e..c74443f565 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -49,11 +49,11 @@ x86_64-centos-stream-10-container: NAME: centos-stream-10 -x86_64-debian-12-container: +x86_64-debian-13-container: extends: .container_job allow_failure: false variables: - NAME: debian-12 + NAME: debian-13 x86_64-debian-sid-container: @@ -115,67 +115,59 @@ x86_64-ubuntu-2604-container: # Cross container jobs -aarch64-debian-12-container: +aarch64-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-aarch64 + NAME: debian-13-cross-aarch64 -armv6l-debian-12-container: +armv6l-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-armv6l + NAME: debian-13-cross-armv6l -armv7l-debian-12-container: +armv7l-debian-13-container: extends: .container_job allow_failure: false variables: - NAME: debian-12-cross-armv7l + NAME: debian-13-cross-armv7l -i686-debian-12-container: +i686-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-i686 + NAME: debian-13-cross-i686 -mips64el-debian-12-container: +ppc64le-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-mips64el + NAME: debian-13-cross-ppc64le -mipsel-debian-12-container: +riscv64-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-mipsel + NAME: debian-13-cross-riscv64 -ppc64le-debian-12-container: +s390x-debian-13-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: debian-12-cross-ppc64le - - -s390x-debian-12-container: - extends: .container_job - allow_failure: false - variables: - JOB_OPTIONAL: 1 - NAME: debian-12-cross-s390x + NAME: debian-13-cross-s390x aarch64-debian-sid-container: @@ -210,14 +202,6 @@ i686-debian-sid-container: NAME: debian-sid-cross-i686 -mips64el-debian-sid-container: - extends: .container_job - allow_failure: true - variables: - JOB_OPTIONAL: 1 - NAME: debian-sid-cross-mips64el - - ppc64le-debian-sid-container: extends: .container_job allow_failure: true @@ -226,6 +210,14 @@ ppc64le-debian-sid-container: NAME: debian-sid-cross-ppc64le +riscv64-debian-sid-container: + extends: .container_job + allow_failure: true + variables: + JOB_OPTIONAL: 1 + NAME: debian-sid-cross-riscv64 + + s390x-debian-sid-container: extends: .container_job allow_failure: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 94639cf0b8..2a48735a7d 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -55,7 +55,7 @@ targets: paths: - libvirt-rpms - debian-12: + debian-13: jobs: - arch: x86_64 @@ -76,18 +76,14 @@ targets: containers: false builds: false - - arch: mips64el - containers: false - builds: false - - - arch: mipsel - containers: false - builds: false - - arch: ppc64le containers: false builds: false + - arch: riscv64 + containers: false + builds: false + - arch: s390x containers: false builds: false @@ -113,11 +109,11 @@ targets: containers: false builds: false - - arch: mips64el + - arch: ppc64le containers: false builds: false - - arch: ppc64le + - arch: riscv64 containers: false builds: false -- 2.53.0
