]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
ci: regenerate with 'lcitool manifest'
authorMichal Privoznik <mprivozn@redhat.com>
Thu, 28 May 2026 10:02:36 +0000 (12:02 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 2 Jun 2026 10:22:05 +0000 (12:22 +0200)
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 <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
27 files changed:
ci/buildenv/debian-12-cross-mips64el.sh [deleted file]
ci/buildenv/debian-12-cross-mipsel.sh [deleted file]
ci/buildenv/debian-13-cross-aarch64.sh [moved from ci/buildenv/debian-12-cross-aarch64.sh with 100% similarity]
ci/buildenv/debian-13-cross-armv6l.sh [moved from ci/buildenv/debian-12-cross-armv6l.sh with 98% similarity]
ci/buildenv/debian-13-cross-armv7l.sh [moved from ci/buildenv/debian-12-cross-armv7l.sh with 97% similarity]
ci/buildenv/debian-13-cross-i686.sh [moved from ci/buildenv/debian-12-cross-i686.sh with 98% similarity]
ci/buildenv/debian-13-cross-ppc64le.sh [moved from ci/buildenv/debian-12-cross-ppc64le.sh with 100% similarity]
ci/buildenv/debian-13-cross-riscv64.sh [new file with mode: 0644]
ci/buildenv/debian-13-cross-s390x.sh [moved from ci/buildenv/debian-12-cross-s390x.sh with 100% similarity]
ci/buildenv/debian-13.sh [moved from ci/buildenv/debian-12.sh with 100% similarity]
ci/buildenv/debian-sid-cross-mips64el.sh [deleted file]
ci/buildenv/debian-sid-cross-riscv64.sh [new file with mode: 0644]
ci/containers/debian-12-cross-mips64el.Dockerfile [deleted file]
ci/containers/debian-12-cross-mipsel.Dockerfile [deleted file]
ci/containers/debian-13-cross-aarch64.Dockerfile [moved from ci/containers/debian-12-cross-aarch64.Dockerfile with 99% similarity]
ci/containers/debian-13-cross-armv6l.Dockerfile [moved from ci/containers/debian-12-cross-armv6l.Dockerfile with 97% similarity]
ci/containers/debian-13-cross-armv7l.Dockerfile [moved from ci/containers/debian-12-cross-armv7l.Dockerfile with 96% similarity]
ci/containers/debian-13-cross-i686.Dockerfile [moved from ci/containers/debian-12-cross-i686.Dockerfile with 97% similarity]
ci/containers/debian-13-cross-ppc64le.Dockerfile [moved from ci/containers/debian-12-cross-ppc64le.Dockerfile with 99% similarity]
ci/containers/debian-13-cross-riscv64.Dockerfile [new file with mode: 0644]
ci/containers/debian-13-cross-s390x.Dockerfile [moved from ci/containers/debian-12-cross-s390x.Dockerfile with 99% similarity]
ci/containers/debian-13.Dockerfile [moved from ci/containers/debian-12.Dockerfile with 98% similarity]
ci/containers/debian-sid-cross-mips64el.Dockerfile [deleted file]
ci/containers/debian-sid-cross-riscv64.Dockerfile [new file with mode: 0644]
ci/gitlab/builds.yml
ci/gitlab/containers.yml
ci/manifest.yml

diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh
deleted file mode 100644 (file)
index a126acc..0000000
+++ /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 (file)
index 562bb3e..0000000
+++ /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"
similarity index 98%
rename from ci/buildenv/debian-12-cross-armv6l.sh
rename to ci/buildenv/debian-13-cross-armv6l.sh
index 5520e88be7a04d0264285f6583a53df3bc51584c..cad3f59aca1b0ae23b3f89bb294def892af5c2db 100644 (file)
@@ -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 \
similarity index 97%
rename from ci/buildenv/debian-12-cross-armv7l.sh
rename to ci/buildenv/debian-13-cross-armv7l.sh
index 5311e4ab722498d0a6a8a8edef0b85f71dd42518..87a93b1866fdfa84854044955826f5bd50006ee5 100644 (file)
@@ -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
similarity index 98%
rename from ci/buildenv/debian-12-cross-i686.sh
rename to ci/buildenv/debian-13-cross-i686.sh
index fcda471378c4f37cfe8c9d3a64431648bc2ce796..729f32540a0187109809bee13216fd61fb9a5baf 100644 (file)
@@ -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-13-cross-riscv64.sh b/ci/buildenv/debian-13-cross-riscv64.sh
new file mode 100644 (file)
index 0000000..7e1cc85
--- /dev/null
@@ -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-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh
deleted file mode 100644 (file)
index a126acc..0000000
+++ /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 (file)
index 0000000..7e1cc85
--- /dev/null
@@ -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 (file)
index 51abdb4..0000000
+++ /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 (file)
index 09c115b..0000000
+++ /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"
similarity index 99%
rename from ci/containers/debian-12-cross-aarch64.Dockerfile
rename to ci/containers/debian-13-cross-aarch64.Dockerfile
index 88253a89dc70eef5b85dac7fb68323995a68a176..6293715d29700ec0eed32650b7573482966c06a2 100644 (file)
@@ -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 && \
similarity index 97%
rename from ci/containers/debian-12-cross-armv6l.Dockerfile
rename to ci/containers/debian-13-cross-armv6l.Dockerfile
index dfb48adb78791c127fe5953f2eec43a963a744c6..8c54391915ae21d87974b628c1d0487c83bf441d 100644 (file)
@@ -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 \
similarity index 96%
rename from ci/containers/debian-12-cross-armv7l.Dockerfile
rename to ci/containers/debian-13-cross-armv7l.Dockerfile
index b70f2475c176ffb6a0550fe9412a2d018eaee611..fd54af86498e12c47c78dfaab6d0c05a99aef881 100644 (file)
@@ -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 && \
similarity index 97%
rename from ci/containers/debian-12-cross-i686.Dockerfile
rename to ci/containers/debian-13-cross-i686.Dockerfile
index 863d2849fcc37ad1c9e6e699f8333e7bd094a85b..3cb098e30f80e58bcb6813742d04b554d9c8f6bc 100644 (file)
@@ -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 \
similarity index 99%
rename from ci/containers/debian-12-cross-ppc64le.Dockerfile
rename to ci/containers/debian-13-cross-ppc64le.Dockerfile
index aa12740271b2be3f21abd38f16d7dc32060ca9cc..e18dcc93569fc9ab3435588207ed78ecaf8009c6 100644 (file)
@@ -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 (file)
index 0000000..1901c89
--- /dev/null
@@ -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"
similarity index 99%
rename from ci/containers/debian-12-cross-s390x.Dockerfile
rename to ci/containers/debian-13-cross-s390x.Dockerfile
index 4ffa2c4591ac991d39e757b728416b711a555667..99f55321b61444e88ee2db6db5019f37106ba46b 100644 (file)
@@ -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 && \
similarity index 98%
rename from ci/containers/debian-12.Dockerfile
rename to ci/containers/debian-13.Dockerfile
index e5ab0f2a3b5b9d815c99f9af1f0e7abe531d261c..c07fd4fac1585c4fb62fef01b9d3dbf8840e6707 100644 (file)
@@ -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 (file)
index cc8924d..0000000
+++ /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 (file)
index 0000000..77ca513
--- /dev/null
@@ -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"
index d215b23b7dd0526d5f2d8070b87fafcaf43dc9db..69c10472431bdcf634eaf0f693a5974e0d543acc 100644 (file)
@@ -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
+    - job: ppc64le-debian-13-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
+    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
 
 
-ppc64le-debian-12:
+riscv64-debian-13:
   extends: .cross_build_job
   needs:
-    - job: ppc64le-debian-12-container
+    - job: riscv64-debian-13-container
       optional: true
   allow_failure: false
   variables:
-    CROSS: ppc64le
+    CROSS: riscv64
     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:
+s390x-debian-13:
   extends: .cross_build_job
   needs:
-    - job: s390x-debian-12-container
+    - 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,27 +405,27 @@ i686-debian-sid:
     TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
 
 
-mips64el-debian-sid:
+ppc64le-debian-sid:
   extends: .cross_build_job
   needs:
-    - job: mips64el-debian-sid-container
+    - job: ppc64le-debian-sid-container
       optional: true
   allow_failure: true
   variables:
-    CROSS: mips64el
+    CROSS: ppc64le
     JOB_OPTIONAL: 1
     NAME: debian-sid
     TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
 
 
-ppc64le-debian-sid:
+riscv64-debian-sid:
   extends: .cross_build_job
   needs:
-    - job: ppc64le-debian-sid-container
+    - job: riscv64-debian-sid-container
       optional: true
   allow_failure: true
   variables:
-    CROSS: ppc64le
+    CROSS: riscv64
     JOB_OPTIONAL: 1
     NAME: debian-sid
     TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
index 1383c6388e12955ee5650e52e0447b96e1ac62a8..c74443f5653df74ef096bc93c38c04823fbc3fc8 100644 (file)
@@ -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,20 +202,20 @@ i686-debian-sid-container:
     NAME: debian-sid-cross-i686
 
 
-mips64el-debian-sid-container:
+ppc64le-debian-sid-container:
   extends: .container_job
   allow_failure: true
   variables:
     JOB_OPTIONAL: 1
-    NAME: debian-sid-cross-mips64el
+    NAME: debian-sid-cross-ppc64le
 
 
-ppc64le-debian-sid-container:
+riscv64-debian-sid-container:
   extends: .container_job
   allow_failure: true
   variables:
     JOB_OPTIONAL: 1
-    NAME: debian-sid-cross-ppc64le
+    NAME: debian-sid-cross-riscv64
 
 
 s390x-debian-sid-container:
index 94639cf0b8877a9dc95e95e973d11d299345f580..2a48735a7d3c60733af96d498d761e481f237ec2 100644 (file)
@@ -55,7 +55,7 @@ targets:
           paths:
             - libvirt-rpms
 
-  debian-12:
+  debian-13:
     jobs:
       - arch: x86_64
 
@@ -76,15 +76,11 @@ targets:
         containers: false
         builds: false
 
-      - arch: mips64el
+      - arch: ppc64le
         containers: false
         builds: false
 
-      - arch: mipsel
-        containers: false
-        builds: false
-
-      - arch: ppc64le
+      - arch: riscv64
         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