7:04 p.m.
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1062214982
Assumes that
https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/444
has been merged, which it hasn't yet, but I don't expect it to be
controversial.
I've added both macOS 13 and 14, doubling the amount of coverage. I'm
not aware of us being particularly tight on Cirrus CI credits, but if
that's the case we can just skip the macOS 13 patch.
The job environment is supposed to make the build system pick up
dependencies that are installed via Homebrew but can't be exposed by
default because they conflict with OS-supplied packages. Right now it
doesn't really do anything, because it hasn't been updated with the
switch to aarch64. I'm going to look into it later, but for now I've
left it as-is as reminder/documentation.
Andrea Bolognani (5):
ci: Update generated files
ci: Drop rpcgen override from macOS $PATH
ci: Add macOS 13
ci: Add macOS 14
ci: Drop macOS 12
ci/buildenv/almalinux-8.sh | 1 -
ci/buildenv/alpine-317.sh | 1 -
ci/buildenv/alpine-edge.sh | 1 -
ci/buildenv/centos-stream-8.sh | 1 -
ci/buildenv/centos-stream-9.sh | 1 -
ci/buildenv/debian-11-cross-aarch64.sh | 1 -
ci/buildenv/debian-11-cross-armv6l.sh | 1 -
ci/buildenv/debian-11-cross-armv7l.sh | 1 -
ci/buildenv/debian-11-cross-i686.sh | 1 -
ci/buildenv/debian-11-cross-mips64el.sh | 1 -
ci/buildenv/debian-11-cross-mipsel.sh | 1 -
ci/buildenv/debian-11-cross-ppc64le.sh | 1 -
ci/buildenv/debian-11-cross-s390x.sh | 1 -
ci/buildenv/debian-11.sh | 1 -
ci/buildenv/debian-12-cross-aarch64.sh | 1 -
ci/buildenv/debian-12-cross-armv6l.sh | 1 -
ci/buildenv/debian-12-cross-armv7l.sh | 1 -
ci/buildenv/debian-12-cross-i686.sh | 1 -
ci/buildenv/debian-12-cross-mips64el.sh | 1 -
ci/buildenv/debian-12-cross-mipsel.sh | 1 -
ci/buildenv/debian-12-cross-ppc64le.sh | 1 -
ci/buildenv/debian-12-cross-s390x.sh | 1 -
ci/buildenv/debian-12.sh | 1 -
ci/buildenv/debian-sid-cross-aarch64.sh | 1 -
ci/buildenv/debian-sid-cross-armv6l.sh | 1 -
ci/buildenv/debian-sid-cross-armv7l.sh | 1 -
ci/buildenv/debian-sid-cross-i686.sh | 1 -
ci/buildenv/debian-sid-cross-mips64el.sh | 1 -
ci/buildenv/debian-sid-cross-ppc64le.sh | 1 -
ci/buildenv/debian-sid-cross-s390x.sh | 1 -
ci/buildenv/debian-sid.sh | 1 -
ci/buildenv/fedora-37.sh | 1 -
ci/buildenv/fedora-38-cross-mingw32.sh | 2 +-
ci/buildenv/fedora-38-cross-mingw64.sh | 2 +-
ci/buildenv/fedora-38.sh | 1 -
ci/buildenv/fedora-rawhide-cross-mingw32.sh | 2 +-
ci/buildenv/fedora-rawhide-cross-mingw64.sh | 2 +-
ci/buildenv/fedora-rawhide.sh | 1 -
ci/buildenv/opensuse-leap-15.sh | 1 -
ci/buildenv/opensuse-tumbleweed.sh | 1 -
ci/buildenv/ubuntu-2004.sh | 1 -
ci/buildenv/ubuntu-2204.sh | 1 -
ci/cirrus/{macos-12.vars => macos-13.vars} | 2 +-
ci/cirrus/{macos-12.vars => macos-14.vars} | 2 +-
ci/containers/almalinux-8.Dockerfile | 1 -
ci/containers/alpine-317.Dockerfile | 1 -
ci/containers/alpine-edge.Dockerfile | 1 -
ci/containers/centos-stream-8.Dockerfile | 1 -
ci/containers/centos-stream-9.Dockerfile | 1 -
.../debian-11-cross-aarch64.Dockerfile | 1 -
.../debian-11-cross-armv6l.Dockerfile | 1 -
.../debian-11-cross-armv7l.Dockerfile | 1 -
ci/containers/debian-11-cross-i686.Dockerfile | 1 -
.../debian-11-cross-mips64el.Dockerfile | 1 -
.../debian-11-cross-mipsel.Dockerfile | 1 -
.../debian-11-cross-ppc64le.Dockerfile | 1 -
.../debian-11-cross-s390x.Dockerfile | 1 -
ci/containers/debian-11.Dockerfile | 1 -
.../debian-12-cross-aarch64.Dockerfile | 1 -
.../debian-12-cross-armv6l.Dockerfile | 1 -
.../debian-12-cross-armv7l.Dockerfile | 1 -
ci/containers/debian-12-cross-i686.Dockerfile | 1 -
.../debian-12-cross-mips64el.Dockerfile | 1 -
.../debian-12-cross-mipsel.Dockerfile | 1 -
.../debian-12-cross-ppc64le.Dockerfile | 1 -
.../debian-12-cross-s390x.Dockerfile | 1 -
ci/containers/debian-12.Dockerfile | 1 -
.../debian-sid-cross-aarch64.Dockerfile | 1 -
.../debian-sid-cross-armv6l.Dockerfile | 1 -
.../debian-sid-cross-armv7l.Dockerfile | 1 -
.../debian-sid-cross-i686.Dockerfile | 1 -
.../debian-sid-cross-mips64el.Dockerfile | 1 -
.../debian-sid-cross-ppc64le.Dockerfile | 1 -
.../debian-sid-cross-s390x.Dockerfile | 1 -
ci/containers/debian-sid.Dockerfile | 1 -
ci/containers/fedora-37.Dockerfile | 1 -
.../fedora-38-cross-mingw32.Dockerfile | 2 +-
.../fedora-38-cross-mingw64.Dockerfile | 2 +-
ci/containers/fedora-38.Dockerfile | 1 -
.../fedora-rawhide-cross-mingw32.Dockerfile | 2 +-
.../fedora-rawhide-cross-mingw64.Dockerfile | 2 +-
ci/containers/fedora-rawhide.Dockerfile | 1 -
ci/containers/opensuse-leap-15.Dockerfile | 1 -
ci/containers/opensuse-tumbleweed.Dockerfile | 1 -
ci/containers/ubuntu-2004.Dockerfile | 1 -
ci/containers/ubuntu-2204.Dockerfile | 1 -
ci/gitlab/builds.yml | 24 +++++++++++++++----
ci/manifest.yml | 11 +++++++--
88 files changed, 39 insertions(+), 92 deletions(-)
copy ci/cirrus/{macos-12.vars => macos-13.vars} (91%)
rename ci/cirrus/{macos-12.vars => macos-14.vars} (91%)
--
2.41.0
7:04 p.m.
New subject: [libvirt PATCH 1/5] ci: Update generated files
Gain native gettext for MinGW containers, lose rpcgen everywhere.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/buildenv/almalinux-8.sh | 1 -
ci/buildenv/alpine-317.sh | 1 -
ci/buildenv/alpine-edge.sh | 1 -
ci/buildenv/centos-stream-8.sh | 1 -
ci/buildenv/centos-stream-9.sh | 1 -
ci/buildenv/debian-11-cross-aarch64.sh | 1 -
ci/buildenv/debian-11-cross-armv6l.sh | 1 -
ci/buildenv/debian-11-cross-armv7l.sh | 1 -
ci/buildenv/debian-11-cross-i686.sh | 1 -
ci/buildenv/debian-11-cross-mips64el.sh | 1 -
ci/buildenv/debian-11-cross-mipsel.sh | 1 -
ci/buildenv/debian-11-cross-ppc64le.sh | 1 -
ci/buildenv/debian-11-cross-s390x.sh | 1 -
ci/buildenv/debian-11.sh | 1 -
ci/buildenv/debian-12-cross-aarch64.sh | 1 -
ci/buildenv/debian-12-cross-armv6l.sh | 1 -
ci/buildenv/debian-12-cross-armv7l.sh | 1 -
ci/buildenv/debian-12-cross-i686.sh | 1 -
ci/buildenv/debian-12-cross-mips64el.sh | 1 -
ci/buildenv/debian-12-cross-mipsel.sh | 1 -
ci/buildenv/debian-12-cross-ppc64le.sh | 1 -
ci/buildenv/debian-12-cross-s390x.sh | 1 -
ci/buildenv/debian-12.sh | 1 -
ci/buildenv/debian-sid-cross-aarch64.sh | 1 -
ci/buildenv/debian-sid-cross-armv6l.sh | 1 -
ci/buildenv/debian-sid-cross-armv7l.sh | 1 -
ci/buildenv/debian-sid-cross-i686.sh | 1 -
ci/buildenv/debian-sid-cross-mips64el.sh | 1 -
ci/buildenv/debian-sid-cross-ppc64le.sh | 1 -
ci/buildenv/debian-sid-cross-s390x.sh | 1 -
ci/buildenv/debian-sid.sh | 1 -
ci/buildenv/fedora-37.sh | 1 -
ci/buildenv/fedora-38-cross-mingw32.sh | 2 +-
ci/buildenv/fedora-38-cross-mingw64.sh | 2 +-
ci/buildenv/fedora-38.sh | 1 -
ci/buildenv/fedora-rawhide-cross-mingw32.sh | 2 +-
ci/buildenv/fedora-rawhide-cross-mingw64.sh | 2 +-
ci/buildenv/fedora-rawhide.sh | 1 -
ci/buildenv/opensuse-leap-15.sh | 1 -
ci/buildenv/opensuse-tumbleweed.sh | 1 -
ci/buildenv/ubuntu-2004.sh | 1 -
ci/buildenv/ubuntu-2204.sh | 1 -
ci/cirrus/macos-12.vars | 2 +-
ci/containers/almalinux-8.Dockerfile | 1 -
ci/containers/alpine-317.Dockerfile | 1 -
ci/containers/alpine-edge.Dockerfile | 1 -
ci/containers/centos-stream-8.Dockerfile | 1 -
ci/containers/centos-stream-9.Dockerfile | 1 -
ci/containers/debian-11-cross-aarch64.Dockerfile | 1 -
ci/containers/debian-11-cross-armv6l.Dockerfile | 1 -
ci/containers/debian-11-cross-armv7l.Dockerfile | 1 -
ci/containers/debian-11-cross-i686.Dockerfile | 1 -
ci/containers/debian-11-cross-mips64el.Dockerfile | 1 -
ci/containers/debian-11-cross-mipsel.Dockerfile | 1 -
ci/containers/debian-11-cross-ppc64le.Dockerfile | 1 -
ci/containers/debian-11-cross-s390x.Dockerfile | 1 -
ci/containers/debian-11.Dockerfile | 1 -
ci/containers/debian-12-cross-aarch64.Dockerfile | 1 -
ci/containers/debian-12-cross-armv6l.Dockerfile | 1 -
ci/containers/debian-12-cross-armv7l.Dockerfile | 1 -
ci/containers/debian-12-cross-i686.Dockerfile | 1 -
ci/containers/debian-12-cross-mips64el.Dockerfile | 1 -
ci/containers/debian-12-cross-mipsel.Dockerfile | 1 -
ci/containers/debian-12-cross-ppc64le.Dockerfile | 1 -
ci/containers/debian-12-cross-s390x.Dockerfile | 1 -
ci/containers/debian-12.Dockerfile | 1 -
ci/containers/debian-sid-cross-aarch64.Dockerfile | 1 -
ci/containers/debian-sid-cross-armv6l.Dockerfile | 1 -
ci/containers/debian-sid-cross-armv7l.Dockerfile | 1 -
ci/containers/debian-sid-cross-i686.Dockerfile | 1 -
ci/containers/debian-sid-cross-mips64el.Dockerfile | 1 -
ci/containers/debian-sid-cross-ppc64le.Dockerfile | 1 -
ci/containers/debian-sid-cross-s390x.Dockerfile | 1 -
ci/containers/debian-sid.Dockerfile | 1 -
ci/containers/fedora-37.Dockerfile | 1 -
ci/containers/fedora-38-cross-mingw32.Dockerfile | 2 +-
ci/containers/fedora-38-cross-mingw64.Dockerfile | 2 +-
ci/containers/fedora-38.Dockerfile | 1 -
ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 2 +-
ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 2 +-
ci/containers/fedora-rawhide.Dockerfile | 1 -
ci/containers/opensuse-leap-15.Dockerfile | 1 -
ci/containers/opensuse-tumbleweed.Dockerfile | 1 -
ci/containers/ubuntu-2004.Dockerfile | 1 -
ci/containers/ubuntu-2204.Dockerfile | 1 -
85 files changed, 9 insertions(+), 85 deletions(-)
diff --git a/ci/buildenv/almalinux-8.sh b/ci/buildenv/almalinux-8.sh
index e3c0909557..f127c0dc5a 100644
--- a/ci/buildenv/almalinux-8.sh
+++ b/ci/buildenv/almalinux-8.sh
@@ -75,7 +75,6 @@ function install_buildenv() {
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/buildenv/alpine-317.sh b/ci/buildenv/alpine-317.sh
index e3f36ff8c6..975914a7c2 100644
--- a/ci/buildenv/alpine-317.sh
+++ b/ci/buildenv/alpine-317.sh
@@ -60,7 +60,6 @@ function install_buildenv() {
python3 \
qemu-img \
readline-dev \
- rpcgen \
samurai \
sed \
util-linux-dev \
diff --git a/ci/buildenv/alpine-edge.sh b/ci/buildenv/alpine-edge.sh
index e3f36ff8c6..975914a7c2 100644
--- a/ci/buildenv/alpine-edge.sh
+++ b/ci/buildenv/alpine-edge.sh
@@ -60,7 +60,6 @@ function install_buildenv() {
python3 \
qemu-img \
readline-dev \
- rpcgen \
samurai \
sed \
util-linux-dev \
diff --git a/ci/buildenv/centos-stream-8.sh b/ci/buildenv/centos-stream-8.sh
index f6de8ee7f7..0ccc86156a 100644
--- a/ci/buildenv/centos-stream-8.sh
+++ b/ci/buildenv/centos-stream-8.sh
@@ -76,7 +76,6 @@ function install_buildenv() {
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/buildenv/centos-stream-9.sh b/ci/buildenv/centos-stream-9.sh
index d6657425a2..475ee48e76 100644
--- a/ci/buildenv/centos-stream-9.sh
+++ b/ci/buildenv/centos-stream-9.sh
@@ -72,7 +72,6 @@ function install_buildenv() {
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/buildenv/debian-11-cross-aarch64.sh
b/ci/buildenv/debian-11-cross-aarch64.sh
index 6b03b2ea59..fdf9344d6c 100644
--- a/ci/buildenv/debian-11-cross-aarch64.sh
+++ b/ci/buildenv/debian-11-cross-aarch64.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/buildenv/debian-11-cross-armv6l.sh
b/ci/buildenv/debian-11-cross-armv6l.sh
index 51dc4ce88a..a9e7328981 100644
--- a/ci/buildenv/debian-11-cross-armv6l.sh
+++ b/ci/buildenv/debian-11-cross-armv6l.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/buildenv/debian-11-cross-armv7l.sh
b/ci/buildenv/debian-11-cross-armv7l.sh
index ecd1453bff..0f0f6ade82 100644
--- a/ci/buildenv/debian-11-cross-armv7l.sh
+++ b/ci/buildenv/debian-11-cross-armv7l.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/buildenv/debian-11-cross-i686.sh b/ci/buildenv/debian-11-cross-i686.sh
index 3922591cd8..687c1491a8 100644
--- a/ci/buildenv/debian-11-cross-i686.sh
+++ b/ci/buildenv/debian-11-cross-i686.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/buildenv/debian-11-cross-mips64el.sh
b/ci/buildenv/debian-11-cross-mips64el.sh
index 6a6250ac03..ab66269862 100644
--- a/ci/buildenv/debian-11-cross-mips64el.sh
+++ b/ci/buildenv/debian-11-cross-mips64el.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/buildenv/debian-11-cross-mipsel.sh
b/ci/buildenv/debian-11-cross-mipsel.sh
index 4b60a97704..d7ac79cb9c 100644
--- a/ci/buildenv/debian-11-cross-mipsel.sh
+++ b/ci/buildenv/debian-11-cross-mipsel.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/buildenv/debian-11-cross-ppc64le.sh
b/ci/buildenv/debian-11-cross-ppc64le.sh
index c1fd55b55d..65c452db0b 100644
--- a/ci/buildenv/debian-11-cross-ppc64le.sh
+++ b/ci/buildenv/debian-11-cross-ppc64le.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/buildenv/debian-11-cross-s390x.sh b/ci/buildenv/debian-11-cross-s390x.sh
index 563eb98ef7..4b7be31880 100644
--- a/ci/buildenv/debian-11-cross-s390x.sh
+++ b/ci/buildenv/debian-11-cross-s390x.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/buildenv/debian-11.sh b/ci/buildenv/debian-11.sh
index fce0b59f5d..4cf08c45a7 100644
--- a/ci/buildenv/debian-11.sh
+++ b/ci/buildenv/debian-11.sh
@@ -33,7 +33,6 @@ function install_buildenv() {
libattr1-dev \
libaudit-dev \
libblkid-dev \
- libc-dev-bin \
libc6-dev \
libcap-ng-dev \
libcurl4-gnutls-dev \
diff --git a/ci/buildenv/debian-12-cross-aarch64.sh
b/ci/buildenv/debian-12-cross-aarch64.sh
index 7d762ac668..859c63dbc5 100644
--- a/ci/buildenv/debian-12-cross-aarch64.sh
+++ b/ci/buildenv/debian-12-cross-aarch64.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-12-cross-armv6l.sh
b/ci/buildenv/debian-12-cross-armv6l.sh
index e3d0619808..97cf5d7b77 100644
--- a/ci/buildenv/debian-12-cross-armv6l.sh
+++ b/ci/buildenv/debian-12-cross-armv6l.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-12-cross-armv7l.sh
b/ci/buildenv/debian-12-cross-armv7l.sh
index fe7d55f194..785020b095 100644
--- a/ci/buildenv/debian-12-cross-armv7l.sh
+++ b/ci/buildenv/debian-12-cross-armv7l.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh
index 362ed4d450..ddcbbcaa92 100644
--- a/ci/buildenv/debian-12-cross-i686.sh
+++ b/ci/buildenv/debian-12-cross-i686.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-12-cross-mips64el.sh
b/ci/buildenv/debian-12-cross-mips64el.sh
index e38a68106e..2260e2f953 100644
--- a/ci/buildenv/debian-12-cross-mips64el.sh
+++ b/ci/buildenv/debian-12-cross-mips64el.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-12-cross-mipsel.sh
b/ci/buildenv/debian-12-cross-mipsel.sh
index 90dac8c22a..f34ec9c04d 100644
--- a/ci/buildenv/debian-12-cross-mipsel.sh
+++ b/ci/buildenv/debian-12-cross-mipsel.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh
b/ci/buildenv/debian-12-cross-ppc64le.sh
index b314d12f1a..68e5144614 100644
--- a/ci/buildenv/debian-12-cross-ppc64le.sh
+++ b/ci/buildenv/debian-12-cross-ppc64le.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh
index 03b6cdadf2..093dafedcb 100644
--- a/ci/buildenv/debian-12-cross-s390x.sh
+++ b/ci/buildenv/debian-12-cross-s390x.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh
index 5976fc0815..781e61492f 100644
--- a/ci/buildenv/debian-12.sh
+++ b/ci/buildenv/debian-12.sh
@@ -33,7 +33,6 @@ function install_buildenv() {
libattr1-dev \
libaudit-dev \
libblkid-dev \
- libc-dev-bin \
libc6-dev \
libcap-ng-dev \
libcurl4-gnutls-dev \
diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh
b/ci/buildenv/debian-sid-cross-aarch64.sh
index 7d762ac668..859c63dbc5 100644
--- a/ci/buildenv/debian-sid-cross-aarch64.sh
+++ b/ci/buildenv/debian-sid-cross-aarch64.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh
b/ci/buildenv/debian-sid-cross-armv6l.sh
index e3d0619808..97cf5d7b77 100644
--- a/ci/buildenv/debian-sid-cross-armv6l.sh
+++ b/ci/buildenv/debian-sid-cross-armv6l.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh
b/ci/buildenv/debian-sid-cross-armv7l.sh
index fe7d55f194..785020b095 100644
--- a/ci/buildenv/debian-sid-cross-armv7l.sh
+++ b/ci/buildenv/debian-sid-cross-armv7l.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh
index 362ed4d450..ddcbbcaa92 100644
--- a/ci/buildenv/debian-sid-cross-i686.sh
+++ b/ci/buildenv/debian-sid-cross-i686.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh
b/ci/buildenv/debian-sid-cross-mips64el.sh
index e38a68106e..2260e2f953 100644
--- a/ci/buildenv/debian-sid-cross-mips64el.sh
+++ b/ci/buildenv/debian-sid-cross-mips64el.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh
b/ci/buildenv/debian-sid-cross-ppc64le.sh
index b314d12f1a..68e5144614 100644
--- a/ci/buildenv/debian-sid-cross-ppc64le.sh
+++ b/ci/buildenv/debian-sid-cross-ppc64le.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-sid-cross-s390x.sh
b/ci/buildenv/debian-sid-cross-s390x.sh
index 03b6cdadf2..093dafedcb 100644
--- a/ci/buildenv/debian-sid-cross-s390x.sh
+++ b/ci/buildenv/debian-sid-cross-s390x.sh
@@ -26,7 +26,6 @@ function install_buildenv() {
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh
index 5976fc0815..781e61492f 100644
--- a/ci/buildenv/debian-sid.sh
+++ b/ci/buildenv/debian-sid.sh
@@ -33,7 +33,6 @@ function install_buildenv() {
libattr1-dev \
libaudit-dev \
libblkid-dev \
- libc-dev-bin \
libc6-dev \
libcap-ng-dev \
libcurl4-gnutls-dev \
diff --git a/ci/buildenv/fedora-37.sh b/ci/buildenv/fedora-37.sh
index 5308bc685d..89a32cd7d1 100644
--- a/ci/buildenv/fedora-37.sh
+++ b/ci/buildenv/fedora-37.sh
@@ -72,7 +72,6 @@ function install_buildenv() {
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/buildenv/fedora-38-cross-mingw32.sh
b/ci/buildenv/fedora-38-cross-mingw32.sh
index babfa6450a..05f1046239 100644
--- a/ci/buildenv/fedora-38-cross-mingw32.sh
+++ b/ci/buildenv/fedora-38-cross-mingw32.sh
@@ -18,6 +18,7 @@ function install_buildenv() {
dwarves \
ebtables \
firewalld-filesystem \
+ gettext \
git \
glibc-langpack-en \
grep \
@@ -41,7 +42,6 @@ function install_buildenv() {
python3-docutils \
python3-flake8 \
qemu-img \
- rpcgen \
rpm-build \
scrub \
sed \
diff --git a/ci/buildenv/fedora-38-cross-mingw64.sh
b/ci/buildenv/fedora-38-cross-mingw64.sh
index 18ae4c3f3d..b41439b2b3 100644
--- a/ci/buildenv/fedora-38-cross-mingw64.sh
+++ b/ci/buildenv/fedora-38-cross-mingw64.sh
@@ -18,6 +18,7 @@ function install_buildenv() {
dwarves \
ebtables \
firewalld-filesystem \
+ gettext \
git \
glibc-langpack-en \
grep \
@@ -41,7 +42,6 @@ function install_buildenv() {
python3-docutils \
python3-flake8 \
qemu-img \
- rpcgen \
rpm-build \
scrub \
sed \
diff --git a/ci/buildenv/fedora-38.sh b/ci/buildenv/fedora-38.sh
index 5308bc685d..89a32cd7d1 100644
--- a/ci/buildenv/fedora-38.sh
+++ b/ci/buildenv/fedora-38.sh
@@ -72,7 +72,6 @@ function install_buildenv() {
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/buildenv/fedora-rawhide-cross-mingw32.sh
b/ci/buildenv/fedora-rawhide-cross-mingw32.sh
index 218159f17d..72ef56aa67 100644
--- a/ci/buildenv/fedora-rawhide-cross-mingw32.sh
+++ b/ci/buildenv/fedora-rawhide-cross-mingw32.sh
@@ -19,6 +19,7 @@ function install_buildenv() {
dwarves \
ebtables \
firewalld-filesystem \
+ gettext \
git \
glibc-langpack-en \
grep \
@@ -42,7 +43,6 @@ function install_buildenv() {
python3-docutils \
python3-flake8 \
qemu-img \
- rpcgen \
rpm-build \
scrub \
sed \
diff --git a/ci/buildenv/fedora-rawhide-cross-mingw64.sh
b/ci/buildenv/fedora-rawhide-cross-mingw64.sh
index 42a3df41f5..77f2c3a2b4 100644
--- a/ci/buildenv/fedora-rawhide-cross-mingw64.sh
+++ b/ci/buildenv/fedora-rawhide-cross-mingw64.sh
@@ -19,6 +19,7 @@ function install_buildenv() {
dwarves \
ebtables \
firewalld-filesystem \
+ gettext \
git \
glibc-langpack-en \
grep \
@@ -42,7 +43,6 @@ function install_buildenv() {
python3-docutils \
python3-flake8 \
qemu-img \
- rpcgen \
rpm-build \
scrub \
sed \
diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh
index ed69d9cdf9..56d8199f70 100644
--- a/ci/buildenv/fedora-rawhide.sh
+++ b/ci/buildenv/fedora-rawhide.sh
@@ -73,7 +73,6 @@ function install_buildenv() {
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh
index e649f8c093..fd42033ac3 100644
--- a/ci/buildenv/opensuse-leap-15.sh
+++ b/ci/buildenv/opensuse-leap-15.sh
@@ -74,7 +74,6 @@ function install_buildenv() {
python3-flake8 \
qemu-tools \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/buildenv/opensuse-tumbleweed.sh b/ci/buildenv/opensuse-tumbleweed.sh
index a67aae46c1..0c57fc43f1 100644
--- a/ci/buildenv/opensuse-tumbleweed.sh
+++ b/ci/buildenv/opensuse-tumbleweed.sh
@@ -74,7 +74,6 @@ function install_buildenv() {
python39-flake8 \
qemu-tools \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/buildenv/ubuntu-2004.sh b/ci/buildenv/ubuntu-2004.sh
index d28a16018d..c034e79cef 100644
--- a/ci/buildenv/ubuntu-2004.sh
+++ b/ci/buildenv/ubuntu-2004.sh
@@ -33,7 +33,6 @@ function install_buildenv() {
libattr1-dev \
libaudit-dev \
libblkid-dev \
- libc-dev-bin \
libc6-dev \
libcap-ng-dev \
libcurl4-gnutls-dev \
diff --git a/ci/buildenv/ubuntu-2204.sh b/ci/buildenv/ubuntu-2204.sh
index 8d70f2fa5f..9f0fb1a545 100644
--- a/ci/buildenv/ubuntu-2204.sh
+++ b/ci/buildenv/ubuntu-2204.sh
@@ -33,7 +33,6 @@ function install_buildenv() {
libattr1-dev \
libaudit-dev \
libblkid-dev \
- libc-dev-bin \
libc6-dev \
libcap-ng-dev \
libcurl4-gnutls-dev \
diff --git a/ci/cirrus/macos-12.vars b/ci/cirrus/macos-12.vars
index 8ecc9c4450..33fc86e1f5 100644
--- a/ci/cirrus/macos-12.vars
+++ b/ci/cirrus/macos-12.vars
@@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
NINJA='/opt/homebrew/bin/ninja'
PACKAGING_COMMAND='brew'
PIP3='/opt/homebrew/bin/pip3'
-PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8
gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make
meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
+PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8
gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make
meson ninja perl pkg-config python3 qemu readline scrub yajl'
PYPI_PKGS=''
PYTHON='/opt/homebrew/bin/python3'
diff --git a/ci/containers/almalinux-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile
index f3e2086e42..3114dc2a7a 100644
--- a/ci/containers/almalinux-8.Dockerfile
+++ b/ci/containers/almalinux-8.Dockerfile
@@ -76,7 +76,6 @@ RUN dnf update -y && \
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/containers/alpine-317.Dockerfile b/ci/containers/alpine-317.Dockerfile
index 162ae5671b..ff24996366 100644
--- a/ci/containers/alpine-317.Dockerfile
+++ b/ci/containers/alpine-317.Dockerfile
@@ -61,7 +61,6 @@ RUN apk update && \
python3 \
qemu-img \
readline-dev \
- rpcgen \
samurai \
sed \
util-linux-dev \
diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile
index 34e895573c..d06563de15 100644
--- a/ci/containers/alpine-edge.Dockerfile
+++ b/ci/containers/alpine-edge.Dockerfile
@@ -61,7 +61,6 @@ RUN apk update && \
python3 \
qemu-img \
readline-dev \
- rpcgen \
samurai \
sed \
util-linux-dev \
diff --git a/ci/containers/centos-stream-8.Dockerfile
b/ci/containers/centos-stream-8.Dockerfile
index 984ccf3a81..285e7275ba 100644
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -77,7 +77,6 @@ RUN dnf distro-sync -y && \
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/containers/centos-stream-9.Dockerfile
b/ci/containers/centos-stream-9.Dockerfile
index 10940b27df..fb6e41fd27 100644
--- a/ci/containers/centos-stream-9.Dockerfile
+++ b/ci/containers/centos-stream-9.Dockerfile
@@ -73,7 +73,6 @@ RUN dnf distro-sync -y && \
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile
b/ci/containers/debian-11-cross-aarch64.Dockerfile
index 429f58b45b..43425c59e3 100644
--- a/ci/containers/debian-11-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-11-cross-aarch64.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile
b/ci/containers/debian-11-cross-armv6l.Dockerfile
index 85af350e04..0f63edd5cb 100644
--- a/ci/containers/debian-11-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv6l.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile
b/ci/containers/debian-11-cross-armv7l.Dockerfile
index 77ff18a513..8b2be0fcc7 100644
--- a/ci/containers/debian-11-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv7l.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/containers/debian-11-cross-i686.Dockerfile
b/ci/containers/debian-11-cross-i686.Dockerfile
index bdb4c44a42..064f32a49b 100644
--- a/ci/containers/debian-11-cross-i686.Dockerfile
+++ b/ci/containers/debian-11-cross-i686.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile
b/ci/containers/debian-11-cross-mips64el.Dockerfile
index 6c1fd4ca77..76408d73bc 100644
--- a/ci/containers/debian-11-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-11-cross-mips64el.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile
b/ci/containers/debian-11-cross-mipsel.Dockerfile
index 5b0767f368..2421938da9 100644
--- a/ci/containers/debian-11-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-11-cross-mipsel.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile
b/ci/containers/debian-11-cross-ppc64le.Dockerfile
index 600d5b34b2..7f219e1e4f 100644
--- a/ci/containers/debian-11-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile
b/ci/containers/debian-11-cross-s390x.Dockerfile
index d11c966c27..22149e66b9 100644
--- a/ci/containers/debian-11-cross-s390x.Dockerfile
+++ b/ci/containers/debian-11-cross-s390x.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libxml2-utils \
locales \
lvm2 \
diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile
index 3de4061bf4..5981f3841f 100644
--- a/ci/containers/debian-11.Dockerfile
+++ b/ci/containers/debian-11.Dockerfile
@@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libattr1-dev \
libaudit-dev \
libblkid-dev \
- libc-dev-bin \
libc6-dev \
libcap-ng-dev \
libcurl4-gnutls-dev \
diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile
b/ci/containers/debian-12-cross-aarch64.Dockerfile
index fa71e6ce1a..bbd5f3e329 100644
--- a/ci/containers/debian-12-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-12-cross-aarch64.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile
b/ci/containers/debian-12-cross-armv6l.Dockerfile
index 0a1927e449..98ada6e45a 100644
--- a/ci/containers/debian-12-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-12-cross-armv6l.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile
b/ci/containers/debian-12-cross-armv7l.Dockerfile
index eced26b6fc..fdd853e84a 100644
--- a/ci/containers/debian-12-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-12-cross-armv7l.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-12-cross-i686.Dockerfile
b/ci/containers/debian-12-cross-i686.Dockerfile
index 0adac546c5..680a76a0e1 100644
--- a/ci/containers/debian-12-cross-i686.Dockerfile
+++ b/ci/containers/debian-12-cross-i686.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile
b/ci/containers/debian-12-cross-mips64el.Dockerfile
index a10720d46f..94504776d5 100644
--- a/ci/containers/debian-12-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-12-cross-mips64el.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile
b/ci/containers/debian-12-cross-mipsel.Dockerfile
index 21cb174825..66a1bc278b 100644
--- a/ci/containers/debian-12-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-12-cross-mipsel.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile
b/ci/containers/debian-12-cross-ppc64le.Dockerfile
index db3ea27999..63afe6f18c 100644
--- a/ci/containers/debian-12-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile
b/ci/containers/debian-12-cross-s390x.Dockerfile
index 4a753d7859..ca707e2ec1 100644
--- a/ci/containers/debian-12-cross-s390x.Dockerfile
+++ b/ci/containers/debian-12-cross-s390x.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile
index 8e7fddfed9..4e1155bcf6 100644
--- a/ci/containers/debian-12.Dockerfile
+++ b/ci/containers/debian-12.Dockerfile
@@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libattr1-dev \
libaudit-dev \
libblkid-dev \
- libc-dev-bin \
libc6-dev \
libcap-ng-dev \
libcurl4-gnutls-dev \
diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile
b/ci/containers/debian-sid-cross-aarch64.Dockerfile
index 52de106555..d5d4659d67 100644
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile
b/ci/containers/debian-sid-cross-armv6l.Dockerfile
index 3c5f7f5e09..2b6b2cfd0f 100644
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile
b/ci/containers/debian-sid-cross-armv7l.Dockerfile
index 62a26cfeaa..ccd7b74496 100644
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile
b/ci/containers/debian-sid-cross-i686.Dockerfile
index 36d38f0b77..25a956ccaa 100644
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile
b/ci/containers/debian-sid-cross-mips64el.Dockerfile
index 260c3cd5f4..bedce7d2f1 100644
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
index f2f11cb68c..0ca0847267 100644
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile
b/ci/containers/debian-sid-cross-s390x.Dockerfile
index 4b38e597d6..55aa2c9f36 100644
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
iproute2 \
iptables \
kmod \
- libc-dev-bin \
libnbd-dev \
libxml2-utils \
locales \
diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
index 956f6254d9..9b1af19e08 100644
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libattr1-dev \
libaudit-dev \
libblkid-dev \
- libc-dev-bin \
libc6-dev \
libcap-ng-dev \
libcurl4-gnutls-dev \
diff --git a/ci/containers/fedora-37.Dockerfile b/ci/containers/fedora-37.Dockerfile
index 967e210d53..35bb52b2a0 100644
--- a/ci/containers/fedora-37.Dockerfile
+++ b/ci/containers/fedora-37.Dockerfile
@@ -83,7 +83,6 @@ exec "$@"\n' > /usr/bin/nosync && \
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/containers/fedora-38-cross-mingw32.Dockerfile
b/ci/containers/fedora-38-cross-mingw32.Dockerfile
index 7d3267b0f8..34c8a5003d 100644
--- a/ci/containers/fedora-38-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-38-cross-mingw32.Dockerfile
@@ -29,6 +29,7 @@ exec "$@"\n' > /usr/bin/nosync && \
dwarves \
ebtables \
firewalld-filesystem \
+ gettext \
git \
glibc-langpack-en \
grep \
@@ -52,7 +53,6 @@ exec "$@"\n' > /usr/bin/nosync && \
python3-docutils \
python3-flake8 \
qemu-img \
- rpcgen \
rpm-build \
scrub \
sed \
diff --git a/ci/containers/fedora-38-cross-mingw64.Dockerfile
b/ci/containers/fedora-38-cross-mingw64.Dockerfile
index 286b22c434..d76b04d942 100644
--- a/ci/containers/fedora-38-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-38-cross-mingw64.Dockerfile
@@ -29,6 +29,7 @@ exec "$@"\n' > /usr/bin/nosync && \
dwarves \
ebtables \
firewalld-filesystem \
+ gettext \
git \
glibc-langpack-en \
grep \
@@ -52,7 +53,6 @@ exec "$@"\n' > /usr/bin/nosync && \
python3-docutils \
python3-flake8 \
qemu-img \
- rpcgen \
rpm-build \
scrub \
sed \
diff --git a/ci/containers/fedora-38.Dockerfile b/ci/containers/fedora-38.Dockerfile
index 95d4d0780d..6b2672463f 100644
--- a/ci/containers/fedora-38.Dockerfile
+++ b/ci/containers/fedora-38.Dockerfile
@@ -83,7 +83,6 @@ exec "$@"\n' > /usr/bin/nosync && \
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
index 113e18159b..d0f56e1c17 100644
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@@ -30,6 +30,7 @@ exec "$@"\n' > /usr/bin/nosync && \
dwarves \
ebtables \
firewalld-filesystem \
+ gettext \
git \
glibc-langpack-en \
grep \
@@ -53,7 +54,6 @@ exec "$@"\n' > /usr/bin/nosync && \
python3-docutils \
python3-flake8 \
qemu-img \
- rpcgen \
rpm-build \
scrub \
sed \
diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
index 19408fd177..5fdb20b752 100644
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@@ -30,6 +30,7 @@ exec "$@"\n' > /usr/bin/nosync && \
dwarves \
ebtables \
firewalld-filesystem \
+ gettext \
git \
glibc-langpack-en \
grep \
@@ -53,7 +54,6 @@ exec "$@"\n' > /usr/bin/nosync && \
python3-docutils \
python3-flake8 \
qemu-img \
- rpcgen \
rpm-build \
scrub \
sed \
diff --git a/ci/containers/fedora-rawhide.Dockerfile
b/ci/containers/fedora-rawhide.Dockerfile
index 2cba6a3a38..eafbd550e0 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -84,7 +84,6 @@ exec "$@"\n' > /usr/bin/nosync && \
python3-flake8 \
qemu-img \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/containers/opensuse-leap-15.Dockerfile
b/ci/containers/opensuse-leap-15.Dockerfile
index 110692173e..642eef70eb 100644
--- a/ci/containers/opensuse-leap-15.Dockerfile
+++ b/ci/containers/opensuse-leap-15.Dockerfile
@@ -75,7 +75,6 @@ RUN zypper update -y && \
python3-flake8 \
qemu-tools \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile
b/ci/containers/opensuse-tumbleweed.Dockerfile
index d4b68e25c4..0f1db78281 100644
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -75,7 +75,6 @@ RUN zypper dist-upgrade -y && \
python39-flake8 \
qemu-tools \
readline-devel \
- rpcgen \
rpm-build \
sanlock-devel \
scrub \
diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index 7fe54d4636..830b9aad83 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libattr1-dev \
libaudit-dev \
libblkid-dev \
- libc-dev-bin \
libc6-dev \
libcap-ng-dev \
libcurl4-gnutls-dev \
diff --git a/ci/containers/ubuntu-2204.Dockerfile b/ci/containers/ubuntu-2204.Dockerfile
index 7d7b549a36..3d403baa31 100644
--- a/ci/containers/ubuntu-2204.Dockerfile
+++ b/ci/containers/ubuntu-2204.Dockerfile
@@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libattr1-dev \
libaudit-dev \
libblkid-dev \
- libc-dev-bin \
libc6-dev \
libcap-ng-dev \
libcurl4-gnutls-dev \
--
2.41.0
7:04 p.m.
New subject: [libvirt PATCH 2/5] ci: Drop rpcgen override from macOS $PATH
We no longer use rpcgen.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/gitlab/builds.yml | 2 +-
ci/manifest.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 2beca51767..8297adbc5f 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -1066,7 +1066,7 @@ aarch64-macos-12:
CIRRUS_VM_INSTANCE_TYPE: macos_instance
INSTALL_COMMAND: brew install
NAME: macos-12
- PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
+ PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
UPDATE_COMMAND: brew update
UPGRADE_COMMAND: brew upgrade
diff --git a/ci/manifest.yml b/ci/manifest.yml
index e115f45b2c..3ff2eb70dc 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -215,7 +215,7 @@ targets:
jobs:
- arch: aarch64
variables:
- PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
+ PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
ubuntu-2004:
--
2.41.0
8:43 p.m.
New subject: [libvirt PATCH 2/5] ci: Drop rpcgen override from macOS $PATH
On Mon, Nov 06, 2023 at 12:04:11PM +0100, Andrea Bolognani wrote:
We no longer use rpcgen.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/gitlab/builds.yml | 2 +-
ci/manifest.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
7:04 p.m.
New subject: [libvirt PATCH 3/5] ci: Add macOS 13
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/cirrus/macos-13.vars | 16 ++++++++++++++++
ci/gitlab/builds.yml | 16 ++++++++++++++++
ci/manifest.yml | 7 +++++++
3 files changed, 39 insertions(+)
create mode 100644 ci/cirrus/macos-13.vars
diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-13.vars
new file mode 100644
index 0000000000..33fc86e1f5
--- /dev/null
+++ b/ci/cirrus/macos-13.vars
@@ -0,0 +1,16 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+CCACHE='/opt/homebrew/bin/ccache'
+CPAN_PKGS=''
+CROSS_PKGS=''
+MAKE='/opt/homebrew/bin/gmake'
+NINJA='/opt/homebrew/bin/ninja'
+PACKAGING_COMMAND='brew'
+PIP3='/opt/homebrew/bin/pip3'
+PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8
gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make
meson ninja perl pkg-config python3 qemu readline scrub yajl'
+PYPI_PKGS=''
+PYTHON='/opt/homebrew/bin/python3'
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 8297adbc5f..51b57c4ea5 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -1070,3 +1070,19 @@ aarch64-macos-12:
PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
UPDATE_COMMAND: brew update
UPGRADE_COMMAND: brew upgrade
+
+
+aarch64-macos-13:
+ extends: .cirrus_build_job
+ needs: []
+ allow_failure: false
+ variables:
+ CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest
+ CIRRUS_VM_IMAGE_SELECTOR: image
+ CIRRUS_VM_INSTANCE_TYPE: macos_instance
+ INSTALL_COMMAND: brew install
+ NAME: macos-13
+ PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
+ PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+ UPDATE_COMMAND: brew update
+ UPGRADE_COMMAND: brew upgrade
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 3ff2eb70dc..a40f448162 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -218,6 +218,13 @@ targets:
PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+ macos-13:
+ jobs:
+ - arch: aarch64
+ variables:
+ PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
+ PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+
ubuntu-2004:
jobs:
- arch: x86_64
--
2.41.0
8:44 p.m.
New subject: [libvirt PATCH 3/5] ci: Add macOS 13
On Mon, Nov 06, 2023 at 12:04:12PM +0100, Andrea Bolognani wrote:
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/cirrus/macos-13.vars | 16 ++++++++++++++++
ci/gitlab/builds.yml | 16 ++++++++++++++++
ci/manifest.yml | 7 +++++++
3 files changed, 39 insertions(+)
create mode 100644 ci/cirrus/macos-13.vars
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
7:04 p.m.
New subject: [libvirt PATCH 4/5] ci: Add macOS 14
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/cirrus/macos-14.vars | 16 ++++++++++++++++
ci/gitlab/builds.yml | 16 ++++++++++++++++
ci/manifest.yml | 7 +++++++
3 files changed, 39 insertions(+)
create mode 100644 ci/cirrus/macos-14.vars
diff --git a/ci/cirrus/macos-14.vars b/ci/cirrus/macos-14.vars
new file mode 100644
index 0000000000..33fc86e1f5
--- /dev/null
+++ b/ci/cirrus/macos-14.vars
@@ -0,0 +1,16 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+CCACHE='/opt/homebrew/bin/ccache'
+CPAN_PKGS=''
+CROSS_PKGS=''
+MAKE='/opt/homebrew/bin/gmake'
+NINJA='/opt/homebrew/bin/ninja'
+PACKAGING_COMMAND='brew'
+PIP3='/opt/homebrew/bin/pip3'
+PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8
gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make
meson ninja perl pkg-config python3 qemu readline scrub yajl'
+PYPI_PKGS=''
+PYTHON='/opt/homebrew/bin/python3'
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 51b57c4ea5..f83f6c7f68 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -1086,3 +1086,19 @@ aarch64-macos-13:
PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
UPDATE_COMMAND: brew update
UPGRADE_COMMAND: brew upgrade
+
+
+aarch64-macos-14:
+ extends: .cirrus_build_job
+ needs: []
+ allow_failure: false
+ variables:
+ CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest
+ CIRRUS_VM_IMAGE_SELECTOR: image
+ CIRRUS_VM_INSTANCE_TYPE: macos_instance
+ INSTALL_COMMAND: brew install
+ NAME: macos-14
+ PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
+ PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+ UPDATE_COMMAND: brew update
+ UPGRADE_COMMAND: brew upgrade
diff --git a/ci/manifest.yml b/ci/manifest.yml
index a40f448162..5dd00985b5 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -225,6 +225,13 @@ targets:
PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+ macos-14:
+ jobs:
+ - arch: aarch64
+ variables:
+ PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
+ PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+
ubuntu-2004:
jobs:
- arch: x86_64
--
2.41.0
8:44 p.m.
New subject: [libvirt PATCH 4/5] ci: Add macOS 14
On Mon, Nov 06, 2023 at 12:04:13PM +0100, Andrea Bolognani wrote:
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/cirrus/macos-14.vars | 16 ++++++++++++++++
ci/gitlab/builds.yml | 16 ++++++++++++++++
ci/manifest.yml | 7 +++++++
3 files changed, 39 insertions(+)
create mode 100644 ci/cirrus/macos-14.vars
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
7:04 p.m.
New subject: [libvirt PATCH 5/5] ci: Drop macOS 12
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/cirrus/macos-12.vars | 16 ----------------
ci/gitlab/builds.yml | 16 ----------------
ci/manifest.yml | 7 -------
3 files changed, 39 deletions(-)
delete mode 100644 ci/cirrus/macos-12.vars
diff --git a/ci/cirrus/macos-12.vars b/ci/cirrus/macos-12.vars
deleted file mode 100644
index 33fc86e1f5..0000000000
--- a/ci/cirrus/macos-12.vars
+++ /dev/null
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-CCACHE='/opt/homebrew/bin/ccache'
-CPAN_PKGS=''
-CROSS_PKGS=''
-MAKE='/opt/homebrew/bin/gmake'
-NINJA='/opt/homebrew/bin/ninja'
-PACKAGING_COMMAND='brew'
-PIP3='/opt/homebrew/bin/pip3'
-PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8
gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make
meson ninja perl pkg-config python3 qemu readline scrub yajl'
-PYPI_PKGS=''
-PYTHON='/opt/homebrew/bin/python3'
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index f83f6c7f68..4cb338fac9 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -1056,22 +1056,6 @@ x86_64-freebsd-13:
UPGRADE_COMMAND: pkg upgrade -y
-aarch64-macos-12:
- extends: .cirrus_build_job
- needs: []
- allow_failure: false
- variables:
- CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest
- CIRRUS_VM_IMAGE_SELECTOR: image
- CIRRUS_VM_INSTANCE_TYPE: macos_instance
- INSTALL_COMMAND: brew install
- NAME: macos-12
- PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
- PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
- UPDATE_COMMAND: brew update
- UPGRADE_COMMAND: brew upgrade
-
-
aarch64-macos-13:
extends: .cirrus_build_job
needs: []
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 5dd00985b5..afb1fa007d 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -211,13 +211,6 @@ targets:
variables:
RPM: skip
- macos-12:
- jobs:
- - arch: aarch64
- variables:
- PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
- PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
-
macos-13:
jobs:
- arch: aarch64
--
2.41.0
8:44 p.m.
New subject: [libvirt PATCH 5/5] ci: Drop macOS 12
On Mon, Nov 06, 2023 at 12:04:14PM +0100, Andrea Bolognani wrote:
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/cirrus/macos-12.vars | 16 ----------------
ci/gitlab/builds.yml | 16 ----------------
ci/manifest.yml | 7 -------
3 files changed, 39 deletions(-)
delete mode 100644 ci/cirrus/macos-12.vars
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
8:42 p.m.
On Mon, Nov 06, 2023 at 12:04:09PM +0100, Andrea Bolognani wrote:
Test pipeline:
https://gitlab.com/abologna/libvirt/-/pipelines/1062214982
Assumes that
https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/444
has been merged, which it hasn't yet, but I don't expect it to be
controversial.
You missed 442, which does the rpcgen change, and also fixes the
missing glusterfs packages on 32-bit debian. Can you review that,
since it'll impact the very first patch here.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
11:38 p.m.
On Mon, Nov 06, 2023 at 12:42:58PM +0000, Daniel P. Berrangé wrote:
On Mon, Nov 06, 2023 at 12:04:09PM +0100, Andrea Bolognani wrote:
> Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1062214982
>
> Assumes that
>
> https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/444
>
> has been merged, which it hasn't yet, but I don't expect it to be
> controversial.
You missed 442, which does the rpcgen change, and also fixes the
missing glusterfs packages on 32-bit debian. Can you review that,
since it'll impact the very first patch here.
Done.
Below is the range-diff output, are you okay with me squashing those
changes in or do you want me to respin?
1: efaca61f0f ! 1: cb98ea5298 ci: Update generated files
@@ Metadata
## Commit message ##
ci: Update generated files
- Gain native gettext for MinGW containers, lose rpcgen everywhere.
+ Gain native gettext on MinGW, lose glusterfs on 32-bit
+ architectures and rpcgen everywhere.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
@@ ci/buildenv/debian-sid-cross-armv6l.sh: function install_buildenv() {
libnbd-dev \
libxml2-utils \
locales \
+@@ ci/buildenv/debian-sid-cross-armv6l.sh: function install_buildenv() {
+ libdevmapper-dev:armel \
+ libfuse-dev:armel \
+ libglib2.0-dev:armel \
+- libglusterfs-dev:armel \
+ libgnutls28-dev:armel \
+ libiscsi-dev:armel \
+ libnl-3-dev:armel \
## ci/buildenv/debian-sid-cross-armv7l.sh ##
@@ ci/buildenv/debian-sid-cross-armv7l.sh: function install_buildenv() {
@@ ci/buildenv/debian-sid-cross-armv7l.sh: function install_buildenv() {
libnbd-dev \
libxml2-utils \
locales \
+@@ ci/buildenv/debian-sid-cross-armv7l.sh: function install_buildenv() {
+ libdevmapper-dev:armhf \
+ libfuse-dev:armhf \
+ libglib2.0-dev:armhf \
+- libglusterfs-dev:armhf \
+ libgnutls28-dev:armhf \
+ libiscsi-dev:armhf \
+ libnl-3-dev:armhf \
## ci/buildenv/debian-sid-cross-i686.sh ##
@@ ci/buildenv/debian-sid-cross-i686.sh: function install_buildenv() {
@@ ci/buildenv/debian-sid-cross-i686.sh: function install_buildenv() {
libnbd-dev \
libxml2-utils \
locales \
+@@ ci/buildenv/debian-sid-cross-i686.sh: function install_buildenv() {
+ libdevmapper-dev:i386 \
+ libfuse-dev:i386 \
+ libglib2.0-dev:i386 \
+- libglusterfs-dev:i386 \
+ libgnutls28-dev:i386 \
+ libiscsi-dev:i386 \
+ libnl-3-dev:i386 \
## ci/buildenv/debian-sid-cross-mips64el.sh ##
@@ ci/buildenv/debian-sid-cross-mips64el.sh: function install_buildenv() {
@@ ci/containers/debian-sid-cross-armv6l.Dockerfile: RUN export
DEBIAN_FRONTEND=non
libnbd-dev \
libxml2-utils \
locales \
+@@ ci/containers/debian-sid-cross-armv6l.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
+ libdevmapper-dev:armel \
+ libfuse-dev:armel \
+ libglib2.0-dev:armel \
+- libglusterfs-dev:armel \
+ libgnutls28-dev:armel \
+ libiscsi-dev:armel \
+ libnl-3-dev:armel \
## ci/containers/debian-sid-cross-armv7l.Dockerfile ##
@@ ci/containers/debian-sid-cross-armv7l.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
@@ ci/containers/debian-sid-cross-armv7l.Dockerfile: RUN export
DEBIAN_FRONTEND=non
libnbd-dev \
libxml2-utils \
locales \
+@@ ci/containers/debian-sid-cross-armv7l.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
+ libdevmapper-dev:armhf \
+ libfuse-dev:armhf \
+ libglib2.0-dev:armhf \
+- libglusterfs-dev:armhf \
+ libgnutls28-dev:armhf \
+ libiscsi-dev:armhf \
+ libnl-3-dev:armhf \
## ci/containers/debian-sid-cross-i686.Dockerfile ##
@@ ci/containers/debian-sid-cross-i686.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
@@ ci/containers/debian-sid-cross-i686.Dockerfile: RUN export
DEBIAN_FRONTEND=nonin
libnbd-dev \
libxml2-utils \
locales \
+@@ ci/containers/debian-sid-cross-i686.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
+ libdevmapper-dev:i386 \
+ libfuse-dev:i386 \
+ libglib2.0-dev:i386 \
+- libglusterfs-dev:i386 \
+ libgnutls28-dev:i386 \
+ libiscsi-dev:i386 \
+ libnl-3-dev:i386 \
## ci/containers/debian-sid-cross-mips64el.Dockerfile ##
@@ ci/containers/debian-sid-cross-mips64el.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
--
Andrea Bolognani / Red Hat / Virtualization
11:45 p.m.
On Mon, Nov 06, 2023 at 07:38:13AM -0800, Andrea Bolognani wrote:
On Mon, Nov 06, 2023 at 12:42:58PM +0000, Daniel P. Berrangé wrote:
> On Mon, Nov 06, 2023 at 12:04:09PM +0100, Andrea Bolognani wrote:
> > Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1062214982
> >
> > Assumes that
> >
> > https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/444
> >
> > has been merged, which it hasn't yet, but I don't expect it to be
> > controversial.
>
> You missed 442, which does the rpcgen change, and also fixes the
> missing glusterfs packages on 32-bit debian. Can you review that,
> since it'll impact the very first patch here.
Done.
Below is the range-diff output, are you okay with me squashing those
changes in or do you want me to respin?
Nah, looks to match what i expected, so
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
360
days inactive
360
days old
12 comments
2 participants
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé