[PATCH 0/5] ci: various CI fixes
This fixes various issues with CI across multiple platforms, debian, Fedora and macOS. Daniel P. Berrangé (5): meson: unconditionally enable polkit on non-Windows ci: drop polkit from build deps tests: stop stubbing libselinux APIs for purpose of data overrides wireshark: drop gmodule.h include to avoid glib warnings ci: update macOS versions under test ci/buildenv/almalinux-9.sh | 1 - ci/buildenv/alpine-319.sh | 1 - ci/buildenv/alpine-edge.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-39.sh | 1 - ci/buildenv/fedora-40-cross-mingw32.sh | 1 - ci/buildenv/fedora-40-cross-mingw64.sh | 1 - ci/buildenv/fedora-40.sh | 1 - ci/buildenv/fedora-rawhide-cross-mingw32.sh | 1 - ci/buildenv/fedora-rawhide-cross-mingw64.sh | 1 - ci/buildenv/fedora-rawhide.sh | 1 - ci/buildenv/opensuse-leap-15.sh | 2 +- ci/buildenv/opensuse-tumbleweed.sh | 1 - ci/buildenv/ubuntu-2204.sh | 1 - ci/buildenv/ubuntu-2404.sh | 1 - ci/cirrus/build.yml | 2 ++ ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-14.vars | 2 +- ci/cirrus/macos-13.vars | 16 ------------ ci/containers/almalinux-9.Dockerfile | 1 - ci/containers/alpine-319.Dockerfile | 1 - ci/containers/alpine-edge.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-39.Dockerfile | 1 - .../fedora-40-cross-mingw32.Dockerfile | 1 - .../fedora-40-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-40.Dockerfile | 1 - .../fedora-rawhide-cross-mingw32.Dockerfile | 1 - .../fedora-rawhide-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-rawhide.Dockerfile | 1 - ci/containers/opensuse-leap-15.Dockerfile | 2 +- ci/containers/opensuse-tumbleweed.Dockerfile | 1 - ci/containers/ubuntu-2204.Dockerfile | 1 - ci/containers/ubuntu-2404.Dockerfile | 1 - ci/gitlab/builds.yml | 12 +++++---- ci/lcitool/projects/libvirt.yml | 1 - ci/manifest.yml | 9 ++++--- meson.build | 5 ---- tests/securityselinuxhelper.c | 25 ------------------- tests/securityselinuxlabeltest.c | 5 +++- tests/securityselinuxtest.c | 2 +- tests/viridentitytest.c | 4 +-- tools/wireshark/src/plugin.c | 2 -- 95 files changed, 25 insertions(+), 146 deletions(-) delete mode 100644 ci/cirrus/macos-13.vars -- 2.46.0
The polkit code does not have a build time dependancy on any system headers or libraries. It can be safely enabled on any non-Windows platform. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- meson.build | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meson.build b/meson.build index 5eb3f24181..2ce8fac4a1 100644 --- a/meson.build +++ b/meson.build @@ -1433,11 +1433,6 @@ endif if not get_option('polkit').disabled() polkit_enable = true - if get_option('polkit').auto() - pkcheck_prog = find_program('pkcheck', required: false, dirs: libvirt_sbin_path) - polkit_enable = pkcheck_prog.found() - endif - if host_machine.system() == 'windows' polkit_enable = false if get_option('polkit').enabled() -- 2.46.0
On Tue, Oct 15, 2024 at 12:19:20 +0100, Daniel P. Berrangé wrote:
The polkit code does not have a build time dependancy on any system headers or libraries. It can be safely enabled on any non-Windows platform.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- meson.build | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/meson.build b/meson.build index 5eb3f24181..2ce8fac4a1 100644 --- a/meson.build +++ b/meson.build @@ -1433,11 +1433,6 @@ endif if not get_option('polkit').disabled() polkit_enable = true
- if get_option('polkit').auto() - pkcheck_prog = find_program('pkcheck', required: false, dirs: libvirt_sbin_path) - polkit_enable = pkcheck_prog.found() - endif
So while this doesn't have build-time problems this will change the default authentication method for the daemon sockets for builds in absence of polkit. Is this intended side effect? If yes you should mention it in the commit message as well as in the NEWS.rst file. Historically we added a "Packaging changes" section for that.
- if host_machine.system() == 'windows' polkit_enable = false if get_option('polkit').enabled() -- 2.46.0
On Tue, Oct 15, 2024 at 01:38:12PM +0200, Peter Krempa wrote:
On Tue, Oct 15, 2024 at 12:19:20 +0100, Daniel P. Berrangé wrote:
The polkit code does not have a build time dependancy on any system headers or libraries. It can be safely enabled on any non-Windows platform.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- meson.build | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/meson.build b/meson.build index 5eb3f24181..2ce8fac4a1 100644 --- a/meson.build +++ b/meson.build @@ -1433,11 +1433,6 @@ endif if not get_option('polkit').disabled() polkit_enable = true
- if get_option('polkit').auto() - pkcheck_prog = find_program('pkcheck', required: false, dirs: libvirt_sbin_path) - polkit_enable = pkcheck_prog.found() - endif
So while this doesn't have build-time problems this will change the default authentication method for the daemon sockets for builds in absence of polkit.
Is this intended side effect? If yes you should mention it in the commit message as well as in the NEWS.rst file. Historically we added a "Packaging changes" section for that.
Oh, I forgot that we re-wrote the default config file auth scheme based on this test. While polkit is available for macOS/FreeBSD, I don't really want to force enable it by default, so I think this patch is not good. 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 :|
Now that we unconditionally enable polkit, we don't need a dummy install of 'pkcheck' to trigger detection in meson. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- ci/buildenv/almalinux-9.sh | 1 - ci/buildenv/alpine-319.sh | 1 - ci/buildenv/alpine-edge.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-39.sh | 1 - ci/buildenv/fedora-40-cross-mingw32.sh | 1 - ci/buildenv/fedora-40-cross-mingw64.sh | 1 - ci/buildenv/fedora-40.sh | 1 - ci/buildenv/fedora-rawhide-cross-mingw32.sh | 1 - ci/buildenv/fedora-rawhide-cross-mingw64.sh | 1 - ci/buildenv/fedora-rawhide.sh | 1 - ci/buildenv/opensuse-leap-15.sh | 2 +- ci/buildenv/opensuse-tumbleweed.sh | 1 - ci/buildenv/ubuntu-2204.sh | 1 - ci/buildenv/ubuntu-2404.sh | 1 - ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-14.vars | 2 +- ci/containers/almalinux-9.Dockerfile | 1 - ci/containers/alpine-319.Dockerfile | 1 - ci/containers/alpine-edge.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-39.Dockerfile | 1 - ci/containers/fedora-40-cross-mingw32.Dockerfile | 1 - ci/containers/fedora-40-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-40.Dockerfile | 1 - ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 1 - ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-rawhide.Dockerfile | 1 - ci/containers/opensuse-leap-15.Dockerfile | 2 +- ci/containers/opensuse-tumbleweed.Dockerfile | 1 - ci/containers/ubuntu-2204.Dockerfile | 1 - ci/containers/ubuntu-2404.Dockerfile | 1 - ci/lcitool/projects/libvirt.yml | 1 - 85 files changed, 4 insertions(+), 85 deletions(-) diff --git a/ci/buildenv/almalinux-9.sh b/ci/buildenv/almalinux-9.sh index 3f3993229e..b87ef73fde 100644 --- a/ci/buildenv/almalinux-9.sh +++ b/ci/buildenv/almalinux-9.sh @@ -68,7 +68,6 @@ function install_buildenv() { parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-docutils \ python3-flake8 \ diff --git a/ci/buildenv/alpine-319.sh b/ci/buildenv/alpine-319.sh index d2149a6def..d327a6fe7e 100644 --- a/ci/buildenv/alpine-319.sh +++ b/ci/buildenv/alpine-319.sh @@ -56,7 +56,6 @@ function install_buildenv() { parted-dev \ perl \ pkgconf \ - polkit \ py3-docutils \ py3-flake8 \ py3-pytest \ diff --git a/ci/buildenv/alpine-edge.sh b/ci/buildenv/alpine-edge.sh index d2149a6def..d327a6fe7e 100644 --- a/ci/buildenv/alpine-edge.sh +++ b/ci/buildenv/alpine-edge.sh @@ -56,7 +56,6 @@ function install_buildenv() { parted-dev \ perl \ pkgconf \ - polkit \ py3-docutils \ py3-flake8 \ py3-pytest \ diff --git a/ci/buildenv/centos-stream-9.sh b/ci/buildenv/centos-stream-9.sh index cb67c3cdcc..5ae06c82d9 100644 --- a/ci/buildenv/centos-stream-9.sh +++ b/ci/buildenv/centos-stream-9.sh @@ -69,7 +69,6 @@ function install_buildenv() { parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-docutils \ python3-flake8 \ diff --git a/ci/buildenv/debian-11-cross-aarch64.sh b/ci/buildenv/debian-11-cross-aarch64.sh index 6600b73e74..390ebbf683 100644 --- a/ci/buildenv/debian-11-cross-aarch64.sh +++ b/ci/buildenv/debian-11-cross-aarch64.sh @@ -39,7 +39,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-11-cross-armv6l.sh b/ci/buildenv/debian-11-cross-armv6l.sh index 761d813df0..8f63569fbc 100644 --- a/ci/buildenv/debian-11-cross-armv6l.sh +++ b/ci/buildenv/debian-11-cross-armv6l.sh @@ -39,7 +39,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-11-cross-armv7l.sh b/ci/buildenv/debian-11-cross-armv7l.sh index 6c016bd90b..0d1d49e0da 100644 --- a/ci/buildenv/debian-11-cross-armv7l.sh +++ b/ci/buildenv/debian-11-cross-armv7l.sh @@ -39,7 +39,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-11-cross-i686.sh b/ci/buildenv/debian-11-cross-i686.sh index b9705f1c3c..d7f93a94df 100644 --- a/ci/buildenv/debian-11-cross-i686.sh +++ b/ci/buildenv/debian-11-cross-i686.sh @@ -39,7 +39,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-11-cross-mips64el.sh b/ci/buildenv/debian-11-cross-mips64el.sh index 065c61ba57..341e48ea86 100644 --- a/ci/buildenv/debian-11-cross-mips64el.sh +++ b/ci/buildenv/debian-11-cross-mips64el.sh @@ -39,7 +39,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-11-cross-mipsel.sh b/ci/buildenv/debian-11-cross-mipsel.sh index 89a0a8904b..2978663b7c 100644 --- a/ci/buildenv/debian-11-cross-mipsel.sh +++ b/ci/buildenv/debian-11-cross-mipsel.sh @@ -39,7 +39,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-11-cross-ppc64le.sh b/ci/buildenv/debian-11-cross-ppc64le.sh index c898939f09..c3cd5441ce 100644 --- a/ci/buildenv/debian-11-cross-ppc64le.sh +++ b/ci/buildenv/debian-11-cross-ppc64le.sh @@ -39,7 +39,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-11-cross-s390x.sh b/ci/buildenv/debian-11-cross-s390x.sh index f1b94ac872..75443a5822 100644 --- a/ci/buildenv/debian-11-cross-s390x.sh +++ b/ci/buildenv/debian-11-cross-s390x.sh @@ -39,7 +39,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-11.sh b/ci/buildenv/debian-11.sh index 9ba9e80183..8381fb0f0f 100644 --- a/ci/buildenv/debian-11.sh +++ b/ci/buildenv/debian-11.sh @@ -74,7 +74,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh index 93288ae46f..1ad1253a29 100644 --- a/ci/buildenv/debian-12-cross-aarch64.sh +++ b/ci/buildenv/debian-12-cross-aarch64.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh index 37e743478d..9917bb8313 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-12-cross-armv6l.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh index 1b8e4f7019..f0a824805c 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-12-cross-armv7l.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh index 060b6ea75e..3d39cbd7eb 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-12-cross-i686.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh index 6da5920d1d..8b9788ffe5 100644 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ b/ci/buildenv/debian-12-cross-mips64el.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh index 5ad809c625..e9c65467e1 100644 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ b/ci/buildenv/debian-12-cross-mipsel.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh index eca66706fc..bf853ef6ed 100644 --- a/ci/buildenv/debian-12-cross-ppc64le.sh +++ b/ci/buildenv/debian-12-cross-ppc64le.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh index 65dc4ce545..cdef28e476 100644 --- a/ci/buildenv/debian-12-cross-s390x.sh +++ b/ci/buildenv/debian-12-cross-s390x.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh index d06f33af12..1c51e5d05b 100644 --- a/ci/buildenv/debian-12.sh +++ b/ci/buildenv/debian-12.sh @@ -74,7 +74,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh index 93288ae46f..1ad1253a29 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index f19ec82093..d6f7293142 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index 4ebf3126e3..a15f8df324 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index 43c02e784e..28e8324ed3 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh index 6da5920d1d..8b9788ffe5 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh index eca66706fc..bf853ef6ed 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh index 65dc4ce545..cdef28e476 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -40,7 +40,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh index d06f33af12..1c51e5d05b 100644 --- a/ci/buildenv/debian-sid.sh +++ b/ci/buildenv/debian-sid.sh @@ -74,7 +74,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/fedora-39.sh b/ci/buildenv/fedora-39.sh index e45ac2230f..d4ce88ca6b 100644 --- a/ci/buildenv/fedora-39.sh +++ b/ci/buildenv/fedora-39.sh @@ -68,7 +68,6 @@ function install_buildenv() { parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-40-cross-mingw32.sh b/ci/buildenv/fedora-40-cross-mingw32.sh index 9104b2e20e..75db9ce7a5 100644 --- a/ci/buildenv/fedora-40-cross-mingw32.sh +++ b/ci/buildenv/fedora-40-cross-mingw32.sh @@ -38,7 +38,6 @@ function install_buildenv() { ninja-build \ numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-40-cross-mingw64.sh b/ci/buildenv/fedora-40-cross-mingw64.sh index 35120064ec..f755cbdadd 100644 --- a/ci/buildenv/fedora-40-cross-mingw64.sh +++ b/ci/buildenv/fedora-40-cross-mingw64.sh @@ -38,7 +38,6 @@ function install_buildenv() { ninja-build \ numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-40.sh b/ci/buildenv/fedora-40.sh index e45ac2230f..d4ce88ca6b 100644 --- a/ci/buildenv/fedora-40.sh +++ b/ci/buildenv/fedora-40.sh @@ -68,7 +68,6 @@ function install_buildenv() { parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-rawhide-cross-mingw32.sh b/ci/buildenv/fedora-rawhide-cross-mingw32.sh index dadc40dc4e..cb41a73239 100644 --- a/ci/buildenv/fedora-rawhide-cross-mingw32.sh +++ b/ci/buildenv/fedora-rawhide-cross-mingw32.sh @@ -39,7 +39,6 @@ function install_buildenv() { ninja-build \ numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-rawhide-cross-mingw64.sh b/ci/buildenv/fedora-rawhide-cross-mingw64.sh index c484250272..1dd8b8e085 100644 --- a/ci/buildenv/fedora-rawhide-cross-mingw64.sh +++ b/ci/buildenv/fedora-rawhide-cross-mingw64.sh @@ -39,7 +39,6 @@ function install_buildenv() { ninja-build \ numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh index d6dcf86733..ecebcfff43 100644 --- a/ci/buildenv/fedora-rawhide.sh +++ b/ci/buildenv/fedora-rawhide.sh @@ -69,7 +69,6 @@ function install_buildenv() { parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh index 2a1c1e2314..b0dddbb199 100644 --- a/ci/buildenv/opensuse-leap-15.sh +++ b/ci/buildenv/opensuse-leap-15.sh @@ -6,6 +6,7 @@ function install_buildenv() { zypper update -y + zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:... zypper install -y \ audit-devel \ augeas \ @@ -69,7 +70,6 @@ function install_buildenv() { parted-devel \ perl-base \ pkgconfig \ - polkit \ python3-base \ python3-docutils \ python3-flake8 \ diff --git a/ci/buildenv/opensuse-tumbleweed.sh b/ci/buildenv/opensuse-tumbleweed.sh index b3175fe404..9831427fed 100644 --- a/ci/buildenv/opensuse-tumbleweed.sh +++ b/ci/buildenv/opensuse-tumbleweed.sh @@ -69,7 +69,6 @@ function install_buildenv() { parted-devel \ perl-base \ pkgconfig \ - polkit \ python3-base \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/ubuntu-2204.sh b/ci/buildenv/ubuntu-2204.sh index 95762d663c..8753e96834 100644 --- a/ci/buildenv/ubuntu-2204.sh +++ b/ci/buildenv/ubuntu-2204.sh @@ -75,7 +75,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/ubuntu-2404.sh b/ci/buildenv/ubuntu-2404.sh index 5ce8e74a91..4da992e022 100644 --- a/ci/buildenv/ubuntu-2404.sh +++ b/ci/buildenv/ubuntu-2404.sh @@ -75,7 +75,6 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index fbcd613095..6d9a6d8c6e 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-14.vars b/ci/cirrus/freebsd-14.vars index fbcd613095..6d9a6d8c6e 100644 --- a/ci/cirrus/freebsd-14.vars +++ b/ci/cirrus/freebsd-14.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/containers/almalinux-9.Dockerfile b/ci/containers/almalinux-9.Dockerfile index 576119542d..66fae02a2a 100644 --- a/ci/containers/almalinux-9.Dockerfile +++ b/ci/containers/almalinux-9.Dockerfile @@ -69,7 +69,6 @@ RUN dnf update -y && \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-docutils \ python3-flake8 \ diff --git a/ci/containers/alpine-319.Dockerfile b/ci/containers/alpine-319.Dockerfile index 2e4842ef3e..9fbd48858a 100644 --- a/ci/containers/alpine-319.Dockerfile +++ b/ci/containers/alpine-319.Dockerfile @@ -57,7 +57,6 @@ RUN apk update && \ parted-dev \ perl \ pkgconf \ - polkit \ py3-docutils \ py3-flake8 \ py3-pytest \ diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile index 83f160257f..2f951784c2 100644 --- a/ci/containers/alpine-edge.Dockerfile +++ b/ci/containers/alpine-edge.Dockerfile @@ -57,7 +57,6 @@ RUN apk update && \ parted-dev \ perl \ pkgconf \ - polkit \ py3-docutils \ py3-flake8 \ py3-pytest \ diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile index 1b21f9ea75..9baf09e90e 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -70,7 +70,6 @@ RUN dnf distro-sync -y && \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-docutils \ python3-flake8 \ diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile index f8d4ea8ed2..9e791e3f63 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -41,7 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile index f974163000..4ad7f3743d 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -41,7 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile index ced175c7c0..9f51342e7a 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -41,7 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile index c1ee60f3b6..b7b5b4362b 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -41,7 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile index 98c40beef4..e0dce28f1a 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -41,7 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile index e3531a9fac..76a41c6976 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -41,7 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile index 8f9f729909..be94ca2fea 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -41,7 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile index b09076b148..3cbdd2c83f 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -41,7 +41,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile index 1660bd9c52..ffa745ebe9 100644 --- a/ci/containers/debian-11.Dockerfile +++ b/ci/containers/debian-11.Dockerfile @@ -76,7 +76,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile index e57cbffaec..aabda74c11 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-12-cross-aarch64.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile index 9572f4d28f..892616c79c 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-12-cross-armv6l.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile index e29eea8a6b..df68441182 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-12-cross-armv7l.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile index 39f5e9ef8d..fd29905d3c 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-12-cross-i686.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile index af15c9c76a..d11d7db8c0 100644 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ b/ci/containers/debian-12-cross-mips64el.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile index 63caa15b20..a42392a605 100644 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ b/ci/containers/debian-12-cross-mipsel.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile index 6c6e747120..869c9061a9 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile index 4e124ca26a..11eb120b35 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-12-cross-s390x.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile index 682f8217f4..7f43efda25 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-12.Dockerfile @@ -76,7 +76,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 1932a7cfbe..a7978c7204 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index bd7b1a12a3..8d21e83ff4 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index a0ee83d25b..a2737b6dbc 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index b2f96a6c03..6dd6b89a85 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index bcb24e13ff..9434afeed5 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 66180dcb1e..e81a0b12cb 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 5f9fbc8ffd..8746bb0712 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 87aee59bbd..18c5e0067c 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -76,7 +76,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/fedora-39.Dockerfile b/ci/containers/fedora-39.Dockerfile index 2e35ca426d..0741122316 100644 --- a/ci/containers/fedora-39.Dockerfile +++ b/ci/containers/fedora-39.Dockerfile @@ -79,7 +79,6 @@ exec "$@"\n' > /usr/bin/nosync && \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-40-cross-mingw32.Dockerfile b/ci/containers/fedora-40-cross-mingw32.Dockerfile index ed8566f273..ad309a7acd 100644 --- a/ci/containers/fedora-40-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-40-cross-mingw32.Dockerfile @@ -49,7 +49,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ninja-build \ numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-40-cross-mingw64.Dockerfile b/ci/containers/fedora-40-cross-mingw64.Dockerfile index b030427e0c..48a999ffbb 100644 --- a/ci/containers/fedora-40-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-40-cross-mingw64.Dockerfile @@ -49,7 +49,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ninja-build \ numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-40.Dockerfile b/ci/containers/fedora-40.Dockerfile index b82a975bdb..d4d751a219 100644 --- a/ci/containers/fedora-40.Dockerfile +++ b/ci/containers/fedora-40.Dockerfile @@ -79,7 +79,6 @@ exec "$@"\n' > /usr/bin/nosync && \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 4e679991ef..ea8d0412df 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -50,7 +50,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ninja-build \ numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index bd2641548a..0b9eb89375 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -50,7 +50,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ninja-build \ numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index a1cb9ec978..bae7f1e770 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -80,7 +80,6 @@ exec "$@"\n' > /usr/bin/nosync && \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile index 38160bf7dc..7e7ef6da54 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -7,6 +7,7 @@ FROM registry.opensuse.org/opensuse/leap:15.6 RUN zypper update -y && \ + zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:... && \ zypper install -y \ audit-devel \ augeas \ @@ -70,7 +71,6 @@ RUN zypper update -y && \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3-base \ python3-docutils \ python3-flake8 \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index d7cbc88e1a..e7b2f9c886 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -70,7 +70,6 @@ RUN zypper dist-upgrade -y && \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3-base \ python3-black \ python3-docutils \ diff --git a/ci/containers/ubuntu-2204.Dockerfile b/ci/containers/ubuntu-2204.Dockerfile index 18555693d1..481387c05f 100644 --- a/ci/containers/ubuntu-2204.Dockerfile +++ b/ci/containers/ubuntu-2204.Dockerfile @@ -77,7 +77,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/ubuntu-2404.Dockerfile b/ci/containers/ubuntu-2404.Dockerfile index b2f461b629..3ce3273a32 100644 --- a/ci/containers/ubuntu-2404.Dockerfile +++ b/ci/containers/ubuntu-2404.Dockerfile @@ -77,7 +77,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/lcitool/projects/libvirt.yml b/ci/lcitool/projects/libvirt.yml index 9f8fc06ce4..1304ed7ccb 100644 --- a/ci/lcitool/projects/libvirt.yml +++ b/ci/lcitool/projects/libvirt.yml @@ -64,7 +64,6 @@ packages: - openwsman - perl - pkg-config - - polkit - portablexdr - python3 - python3-docutils -- 2.46.0
On Tue, Oct 15, 2024 at 12:19:21 +0100, Daniel P. Berrangé wrote:
Now that we unconditionally enable polkit, we don't need a dummy install of 'pkcheck' to trigger detection in meson.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> ---
If the consequences of the change in previous patch were intentional: Reviewed-by: Peter Krempa <pkrempa@redhat.com>
We currently create stub 'setcon', 'setcon_raw' and 'security_disable' APIs in the securityselinuxhelper.c mock, which set env variables to control how other mock'd libselinux APIs respond. These stubs merely set some env variables, and we have no need to call these stubs from the library code, only test code. The 'security_disable' API is now deprecated in libselinux, so we stubbing it generates compiler warnings. Rather than workaround that, just stop stubbing these APIs and set the required env variables directly. With this change, we now only mock API calls we actually use from the library code. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- tests/securityselinuxhelper.c | 25 ------------------------- tests/securityselinuxlabeltest.c | 5 ++++- tests/securityselinuxtest.c | 2 +- tests/viridentitytest.c | 4 ++-- 4 files changed, 7 insertions(+), 29 deletions(-) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index c32c90c17e..e5ded96485 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -131,21 +131,6 @@ int getpidcon(pid_t pid, char **context) return getpidcon_raw(pid, context); } -int setcon_raw(const char *context) -{ - if (!is_selinux_enabled()) { - errno = EINVAL; - return -1; - } - return g_setenv("FAKE_SELINUX_CONTEXT", context, TRUE) == TRUE ? 0 : -1; -} - -int setcon(const char *context) -{ - return setcon_raw(context); -} - - int setfilecon_raw(const char *path, const char *con) { const char *constr = con; @@ -209,16 +194,6 @@ int is_selinux_enabled(void) return getenv("FAKE_SELINUX_DISABLED") == NULL; } -int security_disable(void) -{ - if (!is_selinux_enabled()) { - errno = ENOENT; - return -1; - } - - return g_setenv("FAKE_SELINUX_DISABLED", "1", TRUE) == TRUE ? 0 : -1; -} - int security_getenforce(void) { if (!is_selinux_enabled()) { diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 43db128b3a..666e942630 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -333,7 +333,10 @@ mymain(void) if (virTestRun("Labelling " # name, testSELinuxLabeling, name) < 0) \ ret = -1; - setcon("system_r:system_u:libvirtd_t:s0:c0.c1023"); + if (!g_setenv("FAKE_SELINUX_CONTEXT", "system_r:system_u:libvirtd_t:s0:c0.c1023", TRUE)) { + perror("Cannot set process security context"); + return EXIT_FAILURE; + } DO_TEST_LABELING("disks"); DO_TEST_LABELING("kernel"); diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 6aadc6154f..a4b2c3683d 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -211,7 +211,7 @@ testSELinuxGenLabel(const void *opaque) context_t con = NULL; context_t imgcon = NULL; - if (setcon_raw(data->pidcon) < 0) { + if (!g_setenv("FAKE_SELINUX_CONTEXT", data->pidcon, TRUE)) { perror("Cannot set process security context"); return -1; } diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index 74e3a03619..a971f8bd18 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -124,7 +124,7 @@ static int testIdentityGetSystem(const void *data) static int testSetFakeSELinuxContext(const void *data G_GNUC_UNUSED) { #if WITH_SELINUX - return setcon_raw(data); + return g_setenv("FAKE_SELINUX_CONTEXT", data, TRUE) == TRUE ? 0 : -1; #else VIR_DEBUG("libvirt not compiled with SELinux, skipping this test"); return EXIT_AM_SKIP; @@ -134,7 +134,7 @@ static int testSetFakeSELinuxContext(const void *data G_GNUC_UNUSED) static int testDisableFakeSELinux(const void *data G_GNUC_UNUSED) { #if WITH_SELINUX - return security_disable(); + return g_setenv("FAKE_SELINUX_DISABLED", "1", TRUE) == TRUE ? 0 : -1; #else VIR_DEBUG("libvirt not compiled with SELinux, skipping this test"); return EXIT_AM_SKIP; -- 2.46.0
On Tue, Oct 15, 2024 at 12:19:22 +0100, Daniel P. Berrangé wrote:
We currently create stub 'setcon', 'setcon_raw' and 'security_disable' APIs in the securityselinuxhelper.c mock, which set env variables to control how other mock'd libselinux APIs respond. These stubs merely set some env variables, and we have no need to call these stubs from the library code, only test code.
The 'security_disable' API is now deprecated in libselinux, so we stubbing it generates compiler warnings. Rather than workaround that, just stop stubbing these APIs and set the required env variables directly. With this change, we now only mock API calls we actually use from the library code.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- tests/securityselinuxhelper.c | 25 ------------------------- tests/securityselinuxlabeltest.c | 5 ++++- tests/securityselinuxtest.c | 2 +- tests/viridentitytest.c | 4 ++-- 4 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index c32c90c17e..e5ded96485 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -131,21 +131,6 @@ int getpidcon(pid_t pid, char **context) return getpidcon_raw(pid, context); }
-int setcon_raw(const char *context) -{ - if (!is_selinux_enabled()) { - errno = EINVAL; - return -1; - } - return g_setenv("FAKE_SELINUX_CONTEXT", context, TRUE) == TRUE ? 0 : -1; -} - -int setcon(const char *context) -{ - return setcon_raw(context); -} - - int setfilecon_raw(const char *path, const char *con) { const char *constr = con; @@ -209,16 +194,6 @@ int is_selinux_enabled(void) return getenv("FAKE_SELINUX_DISABLED") == NULL; }
-int security_disable(void) -{ - if (!is_selinux_enabled()) { - errno = ENOENT; - return -1; - } - - return g_setenv("FAKE_SELINUX_DISABLED", "1", TRUE) == TRUE ? 0 : -1; -} - int security_getenforce(void) { if (!is_selinux_enabled()) { diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 43db128b3a..666e942630 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -333,7 +333,10 @@ mymain(void) if (virTestRun("Labelling " # name, testSELinuxLabeling, name) < 0) \a ret = -1;
- setcon("system_r:system_u:libvirtd_t:s0:c0.c1023"); + if (!g_setenv("FAKE_SELINUX_CONTEXT", "system_r:system_u:libvirtd_t:s0:c0.c1023", TRUE)) { + perror("Cannot set process security context");
"Cannot set fake process security context" ? So that it's obvious that it's a test problem.
+ return EXIT_FAILURE; + }
DO_TEST_LABELING("disks"); DO_TEST_LABELING("kernel"); diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 6aadc6154f..a4b2c3683d 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -211,7 +211,7 @@ testSELinuxGenLabel(const void *opaque) context_t con = NULL; context_t imgcon = NULL;
- if (setcon_raw(data->pidcon) < 0) { + if (!g_setenv("FAKE_SELINUX_CONTEXT", data->pidcon, TRUE)) { perror("Cannot set process security context");
Ah, nevermind I guess.
return -1; } diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index 74e3a03619..a971f8bd18 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -124,7 +124,7 @@ static int testIdentityGetSystem(const void *data) static int testSetFakeSELinuxContext(const void *data G_GNUC_UNUSED) { #if WITH_SELINUX - return setcon_raw(data); + return g_setenv("FAKE_SELINUX_CONTEXT", data, TRUE) == TRUE ? 0 : -1; #else VIR_DEBUG("libvirt not compiled with SELinux, skipping this test"); return EXIT_AM_SKIP; @@ -134,7 +134,7 @@ static int testSetFakeSELinuxContext(const void *data G_GNUC_UNUSED) static int testDisableFakeSELinux(const void *data G_GNUC_UNUSED) { #if WITH_SELINUX - return security_disable(); + return g_setenv("FAKE_SELINUX_DISABLED", "1", TRUE) == TRUE ? 0 : -1; #else VIR_DEBUG("libvirt not compiled with SELinux, skipping this test"); return EXIT_AM_SKIP; -- 2.46.0 a
Please also subsequentely close: https://gitlab.com/libvirt/libvirt/-/merge_requests/407 Reviewed-by: Peter Krempa <pkrempa@redhat.com>
The wireshark address.h header uses 'g_memdup2' but this triggers warnings under clang due to the max version cap: In file included from ../tools/wireshark/src/plugin.c:27: In file included from /usr/include/wireshark/epan/proto.h:30: In file included from /usr/include/wireshark/epan/packet_info.h:15: /usr/include/wireshark/epan/address.h:107:18: error: 'g_memdup2' is deprecated: Not available before 2.68 [-Werror,-Wdeprecated-declarations] 107 | addr->priv = g_memdup2(&val, sizeof(val)); | ^ /usr/include/glib-2.0/glib/gstrfuncs.h:341:1: note: 'g_memdup2' has been explicitly marked deprecated here 341 | GLIB_AVAILABLE_IN_2_68 | ^ /usr/include/glib-2.0/glib/glib-visibility.h:771:32: note: expanded from macro 'GLIB_AVAILABLE_IN_2_68' 771 | #define GLIB_AVAILABLE_IN_2_68 GLIB_UNAVAILABLE (2, 68) | ^ /usr/include/glib-2.0/glib/glib-visibility.h:32:35: note: expanded from macro 'GLIB_UNAVAILABLE' 32 | #define GLIB_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _GLIB_EXTERN | ^ /usr/include/glib-2.0/glib/gmacros.h:1285:47: note: expanded from macro 'G_UNAVAILABLE' 1285 | #define G_UNAVAILABLE(maj,min) __attribute__((deprecated("Not available before " #maj "." #min))) | ^ 1 error generated. It is unclear why clang warns, but gcc does not. Our plugin doesn't actually use the inline helper in address.h that references g_memdup2, but we get the warning regardless. Interestingly removing the 'gmodule.h' include avoids the warning. Since there is nothing in plugin.c that appears to need gmodule.h, removing it should be safe & done regardless. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- tools/wireshark/src/plugin.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/wireshark/src/plugin.c b/tools/wireshark/src/plugin.c index 13af1b6a73..9a83f2ca07 100644 --- a/tools/wireshark/src/plugin.c +++ b/tools/wireshark/src/plugin.c @@ -12,8 +12,6 @@ #include <config.h> -#include <gmodule.h> - #ifdef WITH_WS_VERSION # include <wireshark/ws_version.h> #else -- 2.46.0
On Tue, Oct 15, 2024 at 12:19:23 +0100, Daniel P. Berrangé wrote:
The wireshark address.h header uses 'g_memdup2' but this triggers warnings under clang due to the max version cap:
In file included from ../tools/wireshark/src/plugin.c:27: In file included from /usr/include/wireshark/epan/proto.h:30: In file included from /usr/include/wireshark/epan/packet_info.h:15: /usr/include/wireshark/epan/address.h:107:18: error: 'g_memdup2' is deprecated: Not available before 2.68 [-Werror,-Wdeprecated-declarations] 107 | addr->priv = g_memdup2(&val, sizeof(val)); | ^ /usr/include/glib-2.0/glib/gstrfuncs.h:341:1: note: 'g_memdup2' has been explicitly marked deprecated here 341 | GLIB_AVAILABLE_IN_2_68 | ^ /usr/include/glib-2.0/glib/glib-visibility.h:771:32: note: expanded from macro 'GLIB_AVAILABLE_IN_2_68' 771 | #define GLIB_AVAILABLE_IN_2_68 GLIB_UNAVAILABLE (2, 68) | ^ /usr/include/glib-2.0/glib/glib-visibility.h:32:35: note: expanded from macro 'GLIB_UNAVAILABLE' 32 | #define GLIB_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _GLIB_EXTERN | ^ /usr/include/glib-2.0/glib/gmacros.h:1285:47: note: expanded from macro 'G_UNAVAILABLE' 1285 | #define G_UNAVAILABLE(maj,min) __attribute__((deprecated("Not available before " #maj "." #min))) | ^ 1 error generated.
It is unclear why clang warns, but gcc does not. Our plugin doesn't actually use the inline helper in address.h that references g_memdup2, but we get the warning regardless.
Interestingly removing the 'gmodule.h' include avoids the warning. Since there is nothing in plugin.c that appears to need gmodule.h, removing it should be safe & done regardless.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- tools/wireshark/src/plugin.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/tools/wireshark/src/plugin.c b/tools/wireshark/src/plugin.c index 13af1b6a73..9a83f2ca07 100644 --- a/tools/wireshark/src/plugin.c +++ b/tools/wireshark/src/plugin.c @@ -12,8 +12,6 @@
#include <config.h>
-#include <gmodule.h> - #ifdef WITH_WS_VERSION # include <wireshark/ws_version.h> #else -- 2.46.0
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Cirrus CI has stoppped offering multiple versions of macOS images. There is now only 1 single image, but with multiple XCode versions pre-installed, selectable using the 'xcodes' app: $ xcodes list | grep Installed 15.2 (15C500b) (Installed) 15.3 (15E204a) (Installed) 15.4 (15F31d) (Installed, Selected) 16.0 (16A242d) (Installed) $ clang -v Apple clang version 15.0.0 (clang-1500.3.9.4) Target: arm64-apple-darwin23.6.0 Thread model: posix InstalledDir: /Applications/Xcode_15.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin $ xcodes select 16.0 xcodes requires superuser privileges to select an Xcode macOS User Password: Selected /Applications/Xcode_16.app/Contents/Developer $ clang -v Apple clang version 16.0.0 (clang-1600.0.26.3) Target: arm64-apple-darwin23.6.0 Thread model: posix InstalledDir: /Applications/Xcode_16.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin Any Cirrus CI jobs using an unsupported macOS image name will get forcably changed at runtime to bot the only permitted image, currently sonoma. IOW, our attempts to test multiple versions were not doing anything useful, as evidenced by this message shown in the Cirrus CI web pages for job tasks: "Only ghcr.io/cirruslabs/macos-runner:sonoma is allowed. Automatically upgraded." Replace (failed) testing of multiple macOS versions, with testing of multiple XCode versions - 15.4 and 16.0 Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- ci/cirrus/build.yml | 2 ++ ci/cirrus/macos-13.vars | 16 ---------------- ci/gitlab/builds.yml | 12 +++++++----- ci/manifest.yml | 9 +++++---- 4 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 ci/cirrus/macos-13.vars diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index c0ac05f4d9..110d426aad 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -10,6 +10,7 @@ env: PKG_CONFIG_PATH: "@PKG_CONFIG_PATH@" PYTHON: "@PYTHON@" MAKE: "@MAKE@" + XCODE: "@XCODE@" VIR_TEST_VERBOSE: "1" VIR_TEST_DEBUG: "1" @@ -24,6 +25,7 @@ build_task: - git fetch origin "${CI_MERGE_REQUEST_REF_PATH:-$CI_COMMIT_REF_NAME}" - git reset --hard "$CI_COMMIT_SHA" build_script: + - if test -n "$XCODE"; then xcodes select "$XCODE"; fi - if test "$(uname)" = "Darwin"; then meson setup build --optimization 0; else meson setup build; fi - meson dist -C build --no-tests - meson compile -C build diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-13.vars deleted file mode 100644 index d23fe3cd47..0000000000 --- a/ci/cirrus/macos-13.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 black ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep json-c libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline' -PYPI_PKGS='pytest' -PYTHON='/opt/homebrew/bin/python3' diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 214119b902..f9685e542d 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -624,28 +624,29 @@ x86_64-freebsd-14: UPGRADE_COMMAND: pkg upgrade -y -aarch64-macos-13: +aarch64-macos-14-xcode-15-4: extends: .cirrus_build_job needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_INSTANCE_TYPE: macos_instance INSTALL_COMMAND: brew install - NAME: macos-13 + 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 + XCODE: 15.4 -aarch64-macos-14: +aarch64-macos-14-xcode-16-0: extends: .cirrus_build_job needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_INSTANCE_TYPE: macos_instance INSTALL_COMMAND: brew install @@ -654,3 +655,4 @@ aarch64-macos-14: 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 + XCODE: 16 diff --git a/ci/manifest.yml b/ci/manifest.yml index 647510ed2f..6f8263f242 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -203,19 +203,20 @@ targets: variables: RPM: skip - macos-13: + macos-14: jobs: - arch: aarch64 + suffix: -xcode-15-4 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-14: - jobs: + XCODE: 15.4 - arch: aarch64 + suffix: -xcode-16-0 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 + XCODE: "16.0" ubuntu-2204: jobs: -- 2.46.0
On Tue, Oct 15, 2024 at 12:19:24PM +0100, Daniel P. Berrangé wrote:
Cirrus CI has stoppped offering multiple versions of macOS images.
There is now only 1 single image, but with multiple XCode versions pre-installed, selectable using the 'xcodes' app:
$ xcodes list | grep Installed 15.2 (15C500b) (Installed) 15.3 (15E204a) (Installed) 15.4 (15F31d) (Installed, Selected) 16.0 (16A242d) (Installed)
$ clang -v Apple clang version 15.0.0 (clang-1500.3.9.4) Target: arm64-apple-darwin23.6.0 Thread model: posix InstalledDir: /Applications/Xcode_15.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
$ xcodes select 16.0 xcodes requires superuser privileges to select an Xcode macOS User Password: Selected /Applications/Xcode_16.app/Contents/Developer
$ clang -v Apple clang version 16.0.0 (clang-1600.0.26.3) Target: arm64-apple-darwin23.6.0 Thread model: posix InstalledDir: /Applications/Xcode_16.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
Any Cirrus CI jobs using an unsupported macOS image name will get forcably changed at runtime to bot the only permitted image, currently sonoma. IOW, our attempts to test multiple versions were not doing anything useful, as evidenced by this message shown in the Cirrus CI web pages for job tasks:
"Only ghcr.io/cirruslabs/macos-runner:sonoma is allowed. Automatically upgraded."
Replace (failed) testing of multiple macOS versions, with testing of multiple XCode versions - 15.4 and 16.0
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- ci/cirrus/build.yml | 2 ++ ci/cirrus/macos-13.vars | 16 ---------------- ci/gitlab/builds.yml | 12 +++++++----- ci/manifest.yml | 9 +++++---- 4 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 ci/cirrus/macos-13.vars
NB, this patch depends on https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/508 which changes the cirrus CI image name for macOS 14. 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 :|
On Tue, Oct 15, 2024 at 12:19:24 +0100, Daniel P. Berrangé wrote:
Cirrus CI has stoppped offering multiple versions of macOS images.
There is now only 1 single image, but with multiple XCode versions pre-installed, selectable using the 'xcodes' app:
$ xcodes list | grep Installed 15.2 (15C500b) (Installed) 15.3 (15E204a) (Installed) 15.4 (15F31d) (Installed, Selected) 16.0 (16A242d) (Installed)
$ clang -v Apple clang version 15.0.0 (clang-1500.3.9.4) Target: arm64-apple-darwin23.6.0 Thread model: posix InstalledDir: /Applications/Xcode_15.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
$ xcodes select 16.0 xcodes requires superuser privileges to select an Xcode macOS User Password: Selected /Applications/Xcode_16.app/Contents/Developer
$ clang -v Apple clang version 16.0.0 (clang-1600.0.26.3) Target: arm64-apple-darwin23.6.0 Thread model: posix InstalledDir: /Applications/Xcode_16.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
Any Cirrus CI jobs using an unsupported macOS image name will get forcably changed at runtime to bot the only permitted image, currently sonoma. IOW, our attempts to test multiple versions were not doing anything useful, as evidenced by this message shown in the Cirrus CI web pages for job tasks:
"Only ghcr.io/cirruslabs/macos-runner:sonoma is allowed. Automatically upgraded."
Replace (failed) testing of multiple macOS versions, with testing of multiple XCode versions - 15.4 and 16.0
So are these so much different? I'm asking because I'm a bit annoyed of the CI minutes always running out towards the end of the month.
On Tue, Oct 15, 2024 at 01:58:00PM +0200, Peter Krempa wrote:
On Tue, Oct 15, 2024 at 12:19:24 +0100, Daniel P. Berrangé wrote:
Cirrus CI has stoppped offering multiple versions of macOS images.
There is now only 1 single image, but with multiple XCode versions pre-installed, selectable using the 'xcodes' app:
$ xcodes list | grep Installed 15.2 (15C500b) (Installed) 15.3 (15E204a) (Installed) 15.4 (15F31d) (Installed, Selected) 16.0 (16A242d) (Installed)
$ clang -v Apple clang version 15.0.0 (clang-1500.3.9.4) Target: arm64-apple-darwin23.6.0 Thread model: posix InstalledDir: /Applications/Xcode_15.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
$ xcodes select 16.0 xcodes requires superuser privileges to select an Xcode macOS User Password: Selected /Applications/Xcode_16.app/Contents/Developer
$ clang -v Apple clang version 16.0.0 (clang-1600.0.26.3) Target: arm64-apple-darwin23.6.0 Thread model: posix InstalledDir: /Applications/Xcode_16.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
Any Cirrus CI jobs using an unsupported macOS image name will get forcably changed at runtime to bot the only permitted image, currently sonoma. IOW, our attempts to test multiple versions were not doing anything useful, as evidenced by this message shown in the Cirrus CI web pages for job tasks:
"Only ghcr.io/cirruslabs/macos-runner:sonoma is allowed. Automatically upgraded."
Replace (failed) testing of multiple macOS versions, with testing of multiple XCode versions - 15.4 and 16.0
So are these so much different? I'm asking because I'm a bit annoyed of the CI minutes always running out towards the end of the month.
Basically corresponds to different clang versions. If we're reliably running out of CI minutes, then dropping down to just 1 job is our only way out which doesn't involve paying $$$ for more CI time. 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 :|
On Tue, Oct 15, 2024 at 13:09:57 +0100, Daniel P. Berrangé wrote:
On Tue, Oct 15, 2024 at 01:58:00PM +0200, Peter Krempa wrote:
On Tue, Oct 15, 2024 at 12:19:24 +0100, Daniel P. Berrangé wrote:
[...]
"Only ghcr.io/cirruslabs/macos-runner:sonoma is allowed. Automatically upgraded."
Replace (failed) testing of multiple macOS versions, with testing of multiple XCode versions - 15.4 and 16.0
So are these so much different? I'm asking because I'm a bit annoyed of the CI minutes always running out towards the end of the month.
Basically corresponds to different clang versions.
If we're reliably running out of CI minutes, then dropping down to just 1 job is our only way out which doesn't involve paying $$$ for more CI time.
I've went through the pipeline logs and we've run out of CI minutes on cirrus on following dates: 2024/09/23 2024/08/27 2024/07/30 2024/06/27 2024/05/28 It was okay in April and I didn't check earlier, but most likely this was the start of it, because in May I've also pushed patch decoupling the 'pages' job from the rest of the CI as our web didn't update due to CI minutes being out on Cirrus. It resets at the beginning of the month, so we're marginally over every month, so shedding one job might help.
On Tue, Oct 15, 2024 at 04:47:59PM +0200, Peter Krempa wrote:
On Tue, Oct 15, 2024 at 13:09:57 +0100, Daniel P. Berrangé wrote:
On Tue, Oct 15, 2024 at 01:58:00PM +0200, Peter Krempa wrote:
On Tue, Oct 15, 2024 at 12:19:24 +0100, Daniel P. Berrangé wrote:
[...]
"Only ghcr.io/cirruslabs/macos-runner:sonoma is allowed. Automatically upgraded."
Replace (failed) testing of multiple macOS versions, with testing of multiple XCode versions - 15.4 and 16.0
So are these so much different? I'm asking because I'm a bit annoyed of the CI minutes always running out towards the end of the month.
Basically corresponds to different clang versions.
If we're reliably running out of CI minutes, then dropping down to just 1 job is our only way out which doesn't involve paying $$$ for more CI time.
I've went through the pipeline logs and we've run out of CI minutes on cirrus on following dates:
2024/09/23 2024/08/27 2024/07/30 2024/06/27 2024/05/28
It was okay in April and I didn't check earlier, but most likely this was the start of it, because in May I've also pushed patch decoupling the 'pages' job from the rest of the CI as our web didn't update due to CI minutes being out on Cirrus.
It resets at the beginning of the month, so we're marginally over every month, so shedding one job might help.
The macOS jobs are massively more expensive on credits than FreeBSD jobs too, so definitely the most benefit is from shedding a macOS job. 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 :|
participants (2)
-
Daniel P. Berrangé -
Peter Krempa