[libvirt PATCH 0/2] meson: Fix cross-building of dtrace probes
We didn't spot this issue before simply because we're not installing dtrace in the cross-building environments. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/244473178 libvirt-ci MR: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/82 Andrea Bolognani (1): ci: Refresh dockerfiles Helmut Grohne (1): meson: Fix cross-building of dtrace probes ci/containers/ci-centos-7.Dockerfile | 2 +- ci/containers/ci-centos-8.Dockerfile | 2 +- ci/containers/ci-centos-stream.Dockerfile | 2 +- ci/containers/ci-debian-10-cross-aarch64.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-armv6l.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-armv7l.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-i686.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-mips.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-mips64el.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-mipsel.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-ppc64le.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-s390x.Dockerfile | 3 ++- ci/containers/ci-debian-10.Dockerfile | 2 +- ci/containers/ci-debian-sid-cross-aarch64.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-armv6l.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-armv7l.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-i686.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-mips64el.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-mipsel.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-s390x.Dockerfile | 3 ++- ci/containers/ci-debian-sid.Dockerfile | 2 +- ci/containers/ci-fedora-32.Dockerfile | 2 +- ci/containers/ci-fedora-33.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide.Dockerfile | 2 +- ci/containers/ci-opensuse-152.Dockerfile | 2 +- ci/containers/ci-ubuntu-1804.Dockerfile | 2 +- ci/containers/ci-ubuntu-2004.Dockerfile | 2 +- meson.build | 1 + src/meson.build | 4 ++-- src/qemu/meson.build | 4 ++-- 33 files changed, 52 insertions(+), 34 deletions(-) -- 2.26.2
From: Helmut Grohne <helmut@subdivi.de> dtrace invokes the C compiler, so when cross-building we need to make sure that $CC is set in the environment and that it points to the cross-compiler rather than the native one. Until https://github.com/mesonbuild/meson/issues/266 is addressed, the workaround is to call dtrace via env(1). https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980334 Signed-off-by: Helmut Grohne <helmut@subdivi.de> Reviewed-by: Andrea Bolognani <abologna@redhat.com> --- meson.build | 1 + src/meson.build | 4 ++-- src/qemu/meson.build | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index d8a63baac9..1c36b10390 100644 --- a/meson.build +++ b/meson.build @@ -2022,6 +2022,7 @@ if host_machine.system() == 'linux' if dtrace_prog.found() conf.set('WITH_DTRACE_PROBES', 1) endif + dtrace_command = [ 'env', 'CC=' + ' '.join(meson.get_compiler('c').cmd_array()), dtrace_prog ] endif if not get_option('host_validate').disabled() and host_machine.system() != 'windows' diff --git a/src/meson.build b/src/meson.build index 7c478219d6..56e71f4456 100644 --- a/src/meson.build +++ b/src/meson.build @@ -60,14 +60,14 @@ if conf.has('WITH_DTRACE_PROBES') out_h, input: infile, output: out_h, - command: [ dtrace_prog, '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ], + command: dtrace_command + [ '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ], ) dtrace_gen_objects += custom_target( out_o, input: infile, output: out_o, - command: [ dtrace_prog, '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ], + command: dtrace_command + [ '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ], ) custom_target( diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 90640b03c6..e3065c3507 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -56,14 +56,14 @@ if conf.has('WITH_DTRACE_PROBES') out_h, input: infile, output: out_h, - command: [ dtrace_prog, '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ], + command: dtrace_command + [ '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ], ) qemu_dtrace_gen_objects += custom_target( out_o, input: infile, output: out_o, - command: [ dtrace_prog, '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ], + command: dtrace_command + [ '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ], ) qemu_dtrace_gen_stp = custom_target( -- 2.26.2
dtrace is now also installed when cross-building. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ci/containers/ci-centos-7.Dockerfile | 2 +- ci/containers/ci-centos-8.Dockerfile | 2 +- ci/containers/ci-centos-stream.Dockerfile | 2 +- ci/containers/ci-debian-10-cross-aarch64.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-armv6l.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-armv7l.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-i686.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-mips.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-mips64el.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-mipsel.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-ppc64le.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-s390x.Dockerfile | 3 ++- ci/containers/ci-debian-10.Dockerfile | 2 +- ci/containers/ci-debian-sid-cross-aarch64.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-armv6l.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-armv7l.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-i686.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-mips64el.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-mipsel.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-s390x.Dockerfile | 3 ++- ci/containers/ci-debian-sid.Dockerfile | 2 +- ci/containers/ci-fedora-32.Dockerfile | 2 +- ci/containers/ci-fedora-33.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide.Dockerfile | 2 +- ci/containers/ci-opensuse-152.Dockerfile | 2 +- ci/containers/ci-ubuntu-1804.Dockerfile | 2 +- ci/containers/ci-ubuntu-2004.Dockerfile | 2 +- 30 files changed, 47 insertions(+), 30 deletions(-) diff --git a/ci/containers/ci-centos-7.Dockerfile b/ci/containers/ci-centos-7.Dockerfile index a40b9d158c..67276f475e 100644 --- a/ci/containers/ci-centos-7.Dockerfile +++ b/ci/containers/ci-centos-7.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-7 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/centos:7 RUN yum update -y && \ diff --git a/ci/containers/ci-centos-8.Dockerfile b/ci/containers/ci-centos-8.Dockerfile index 551401635f..d0f9a5b510 100644 --- a/ci/containers/ci-centos-8.Dockerfile +++ b/ci/containers/ci-centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/centos:8 RUN dnf update -y && \ diff --git a/ci/containers/ci-centos-stream.Dockerfile b/ci/containers/ci-centos-stream.Dockerfile index 868e8a4486..47425be791 100644 --- a/ci/containers/ci-centos-stream.Dockerfile +++ b/ci/containers/ci-centos-stream.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-stream libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/centos:8 RUN dnf install -y centos-release-stream && \ diff --git a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile b/ci/containers/ci-debian-10-cross-aarch64.Dockerfile index 6ae1d3c390..c38c18452f 100644 --- a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/ci-debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -99,6 +99,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxen-dev:arm64 \ libxml2-dev:arm64 \ libyajl-dev:arm64 \ + systemtap-sdt-dev:arm64 \ xfslibs-dev:arm64 && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile b/ci/containers/ci-debian-10-cross-armv6l.Dockerfile index b099245bf1..02d4499f47 100644 --- a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/ci-debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:armel \ libxml2-dev:armel \ libyajl-dev:armel \ + systemtap-sdt-dev:armel \ xfslibs-dev:armel && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile b/ci/containers/ci-debian-10-cross-armv7l.Dockerfile index bae0fc7f80..e8fd3856d9 100644 --- a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/ci-debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -99,6 +99,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxen-dev:armhf \ libxml2-dev:armhf \ libyajl-dev:armhf \ + systemtap-sdt-dev:armhf \ xfslibs-dev:armhf && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-10-cross-i686.Dockerfile b/ci/containers/ci-debian-10-cross-i686.Dockerfile index 94b3a85d16..43102dd160 100644 --- a/ci/containers/ci-debian-10-cross-i686.Dockerfile +++ b/ci/containers/ci-debian-10-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:i386 \ libxml2-dev:i386 \ libyajl-dev:i386 \ + systemtap-sdt-dev:i386 \ xfslibs-dev:i386 && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-10-cross-mips.Dockerfile b/ci/containers/ci-debian-10-cross-mips.Dockerfile index 07a22f80ec..937505dd10 100644 --- a/ci/containers/ci-debian-10-cross-mips.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mips.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:mips \ libxml2-dev:mips \ libyajl-dev:mips \ + systemtap-sdt-dev:mips \ xfslibs-dev:mips && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile b/ci/containers/ci-debian-10-cross-mips64el.Dockerfile index 9bb278e33e..6d7e6ad651 100644 --- a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:mips64el \ libxml2-dev:mips64el \ libyajl-dev:mips64el \ + systemtap-sdt-dev:mips64el \ xfslibs-dev:mips64el && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile b/ci/containers/ci-debian-10-cross-mipsel.Dockerfile index b912b096ba..c6e94e377b 100644 --- a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:mipsel \ libxml2-dev:mipsel \ libyajl-dev:mipsel \ + systemtap-sdt-dev:mipsel \ xfslibs-dev:mipsel && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile b/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile index 8f2098db5f..7c43740295 100644 --- a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:ppc64el \ libxml2-dev:ppc64el \ libyajl-dev:ppc64el \ + systemtap-sdt-dev:ppc64el \ xfslibs-dev:ppc64el && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-10-cross-s390x.Dockerfile b/ci/containers/ci-debian-10-cross-s390x.Dockerfile index 5c4f61f188..64bd22010c 100644 --- a/ci/containers/ci-debian-10-cross-s390x.Dockerfile +++ b/ci/containers/ci-debian-10-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:s390x \ libxml2-dev:s390x \ libyajl-dev:s390x \ + systemtap-sdt-dev:s390x \ xfslibs-dev:s390x && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-10.Dockerfile b/ci/containers/ci-debian-10.Dockerfile index 92ae3e6e0f..b7d6c51d11 100644 --- a/ci/containers/ci-debian-10.Dockerfile +++ b/ci/containers/ci-debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile b/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile index bd3ed32017..c61e6845e9 100644 --- a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -97,6 +97,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxen-dev:arm64 \ libxml2-dev:arm64 \ libyajl-dev:arm64 \ + systemtap-sdt-dev:arm64 \ xfslibs-dev:arm64 && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile b/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile index 1032cd91fc..27711a48c6 100644 --- a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:armel \ libxml2-dev:armel \ libyajl-dev:armel \ + systemtap-sdt-dev:armel \ xfslibs-dev:armel && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile b/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile index 01eb0dd51a..445c873fa3 100644 --- a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -97,6 +97,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxen-dev:armhf \ libxml2-dev:armhf \ libyajl-dev:armhf \ + systemtap-sdt-dev:armhf \ xfslibs-dev:armhf && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-sid-cross-i686.Dockerfile b/ci/containers/ci-debian-sid-cross-i686.Dockerfile index fa751c5c25..46b1cd2c43 100644 --- a/ci/containers/ci-debian-sid-cross-i686.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:i386 \ libxml2-dev:i386 \ libyajl-dev:i386 \ + systemtap-sdt-dev:i386 \ xfslibs-dev:i386 && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile b/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile index 332ac393a6..eaf16b9fe3 100644 --- a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:mips64el \ libxml2-dev:mips64el \ libyajl-dev:mips64el \ + systemtap-sdt-dev:mips64el \ xfslibs-dev:mips64el && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile b/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile index 762c4eed8a..92035697ea 100644 --- a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:mipsel \ libxml2-dev:mipsel \ libyajl-dev:mipsel \ + systemtap-sdt-dev:mipsel \ xfslibs-dev:mipsel && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile b/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile index 0bdd9bb6c8..228f0a9bbf 100644 --- a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:ppc64el \ libxml2-dev:ppc64el \ libyajl-dev:ppc64el \ + systemtap-sdt-dev:ppc64el \ xfslibs-dev:ppc64el && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile b/ci/containers/ci-debian-sid-cross-s390x.Dockerfile index a3cfbd8d65..bb159570e9 100644 --- a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libudev-dev:s390x \ libxml2-dev:s390x \ libyajl-dev:s390x \ + systemtap-sdt-dev:s390x \ xfslibs-dev:s390x && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ diff --git a/ci/containers/ci-debian-sid.Dockerfile b/ci/containers/ci-debian-sid.Dockerfile index a390eff1ff..4eea16f5d3 100644 --- a/ci/containers/ci-debian-sid.Dockerfile +++ b/ci/containers/ci-debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-fedora-32.Dockerfile b/ci/containers/ci-fedora-32.Dockerfile index 6f4896ff2a..14e547c975 100644 --- a/ci/containers/ci-fedora-32.Dockerfile +++ b/ci/containers/ci-fedora-32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-32 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM registry.fedoraproject.org/fedora:32 RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-fedora-33.Dockerfile b/ci/containers/ci-fedora-33.Dockerfile index 4f02ff315c..d19890dc55 100644 --- a/ci/containers/ci-fedora-33.Dockerfile +++ b/ci/containers/ci-fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM registry.fedoraproject.org/fedora:33 RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile index 7339189fb8..2d4462a39c 100644 --- a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM registry.fedoraproject.org/fedora:rawhide RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile index 93eabb4bd4..c1330fb2bb 100644 --- a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM registry.fedoraproject.org/fedora:rawhide RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-fedora-rawhide.Dockerfile b/ci/containers/ci-fedora-rawhide.Dockerfile index 6bae8f4b7a..db8606ac5e 100644 --- a/ci/containers/ci-fedora-rawhide.Dockerfile +++ b/ci/containers/ci-fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM registry.fedoraproject.org/fedora:rawhide RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-opensuse-152.Dockerfile b/ci/containers/ci-opensuse-152.Dockerfile index 7f97c3ab70..ecd41e3bac 100644 --- a/ci/containers/ci-opensuse-152.Dockerfile +++ b/ci/containers/ci-opensuse-152.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-152 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM registry.opensuse.org/opensuse/leap:15.2 RUN zypper update -y && \ diff --git a/ci/containers/ci-ubuntu-1804.Dockerfile b/ci/containers/ci-ubuntu-1804.Dockerfile index 1a5dfe8c21..074437398a 100644 --- a/ci/containers/ci-ubuntu-1804.Dockerfile +++ b/ci/containers/ci-ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/ubuntu:18.04 RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-ubuntu-2004.Dockerfile b/ci/containers/ci-ubuntu-2004.Dockerfile index ef6526e46e..bb62d5bbd4 100644 --- a/ci/containers/ci-ubuntu-2004.Dockerfile +++ b/ci/containers/ci-ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f7192223fb... FROM docker.io/library/ubuntu:20.04 RUN export DEBIAN_FRONTEND=noninteractive && \ -- 2.26.2
On Wed, 2021-01-20 at 17:54 +0100, Andrea Bolognani wrote:
We didn't spot this issue before simply because we're not installing dtrace in the cross-building environments.
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/244473178 libvirt-ci MR: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/82
Andrea Bolognani (1): ci: Refresh dockerfiles
Helmut Grohne (1): meson: Fix cross-building of dtrace probes
Ping? I'm keen on merging this sooner rather than later because the libvirt-ci change has already been merged and so, if for some unrelated reason we will need to refresh the Dockerfiles, without these Meson changes that will result in all cross-builds suddenly failing. -- Andrea Bolognani / Red Hat / Virtualization
On Wed, Jan 20, 2021 at 05:54:03PM +0100, Andrea Bolognani wrote:
We didn't spot this issue before simply because we're not installing dtrace in the cross-building environments.
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/244473178 libvirt-ci MR: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/82
Andrea Bolognani (1): ci: Refresh dockerfiles
Helmut Grohne (1): meson: Fix cross-building of dtrace probes
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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)
-
Andrea Bolognani -
Daniel P. Berrangé