From nobody Mon Apr 29 04:47:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611161688; cv=none; d=zohomail.com; s=zohoarc; b=RZ5bFzLPzqgKtMAWbabDDN4WfZrK81YiLjtrZL6S7jQwJAANJk3JMYy5hkSQgBqjiHYrwk5NRudJtsq+1rCvKQzv/xMa2qYsvbga8+KKKml0YpB/uqFu0wNAyXSOOSI6pSMFnp/zxVMBF2kvAyTVU/pK/v1lHvgZg+fWM8EeF7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611161688; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XW7EgpP8ZAlUflavQDZwU9l/hUJi83rXOCHObL5rCgs=; b=dgFOWDQeWOEXTp7r0FS6fdOYZYjWxCwPTr2maDox8YOtdnwYQvFlW1LL6TWASDUZ+CYCRfSVuEquf1Mre3PkNQStCa1IlCq57CNu//Am0MLDUtxmNam5gFMYNDy3EOOl1XqYGbEDm4QNq4JIYTsDhs/HuFTs1T44cBhjAeH1fcg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611161688176646.3343893719524; Wed, 20 Jan 2021 08:54:48 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-255-79xdRH5rP0qd0zK6BMz9JA-1; Wed, 20 Jan 2021 11:54:44 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A3874802B40; Wed, 20 Jan 2021 16:54:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5395A27C3F; Wed, 20 Jan 2021 16:54:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 834B31809CA1; Wed, 20 Jan 2021 16:54:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10KGsCLM004690 for ; Wed, 20 Jan 2021 11:54:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id D89C45D9D5; Wed, 20 Jan 2021 16:54:12 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 38FE85D9C2 for ; Wed, 20 Jan 2021 16:54:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611161687; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XW7EgpP8ZAlUflavQDZwU9l/hUJi83rXOCHObL5rCgs=; b=M1YfixvxwQ7fuSN0VZMgM7bnYPdndH48Sio7s/z0kLpkTJfXCx02I/V/ZpfUpbIUW0hDuK ZeAEyXlVK4SIwMvbuV/wSdVT8Pj4UvuwLABImZFR8N5mVGBTvsUjdldyD7TSS99c7V3rlJ X3kKgaXREiFK30zcmCldIhwITkl+XuM= X-MC-Unique: 79xdRH5rP0qd0zK6BMz9JA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] meson: Fix cross-building of dtrace probes Date: Wed, 20 Jan 2021 17:54:04 +0100 Message-Id: <20210120165405.247294-2-abologna@redhat.com> In-Reply-To: <20210120165405.247294-1-abologna@redhat.com> References: <20210120165405.247294-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Helmut Grohne 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=3D980334 Signed-off-by: Helmut Grohne Reviewed-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- 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() =3D=3D 'linux' if dtrace_prog.found() conf.set('WITH_DTRACE_PROBES', 1) endif + dtrace_command =3D [ 'env', 'CC=3D' + ' '.join(meson.get_compiler('c').c= md_array()), dtrace_prog ] endif =20 if not get_option('host_validate').disabled() and host_machine.system() != =3D '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@' ], ) =20 dtrace_gen_objects +=3D 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@' ], ) =20 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@' ], ) =20 qemu_dtrace_gen_objects +=3D 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@' ], ) =20 qemu_dtrace_gen_stp =3D custom_target( --=20 2.26.2 From nobody Mon Apr 29 04:47:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611161692; cv=none; d=zohomail.com; s=zohoarc; b=af9SZvsWtWmVVVB/SxNHYCSDfFGCRelsD+5QYMkLeZIZbOHy4I+ngRBNYXpZxcpIcmSEoAk69VfpsjJPUOq60U62WEpdw7RDAiG7j2cz3WrJXH4vv/sdjvpllCb4D34mGHRx4TmNhBm7rhZsNhSQXRv+tp97yTOLpHhu6fOWBxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611161692; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ayp21fGBQWoXKcM7F2R06J863Kf5BLV1RHfB79yrSB0=; b=QDzt5rYEbAnDZAbt2DIJG4uRsvIT2oEGEzigVm3cxOQzXsT2Nblt7InCZQ1AEG/WUIg0OvDBRXxl2Wk2B1Q5EhhxXvSFcOXIO0R3NqjTkkisBRniDtIUk82A3SdACmtU9LbpA8ybPlW5qNFGLPi+XVGbnDaf1L77eAh01K75pL8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611161692409277.9859981423135; Wed, 20 Jan 2021 08:54:52 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-103-ZDDJUJufNpemsf0RGUms2A-1; Wed, 20 Jan 2021 11:54:47 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7EEB94DC4; Wed, 20 Jan 2021 16:54:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C354A1B47B; Wed, 20 Jan 2021 16:54:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 871404A7C6; Wed, 20 Jan 2021 16:54:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10KGsHVV004711 for ; Wed, 20 Jan 2021 11:54:17 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2E60F5D9DD; Wed, 20 Jan 2021 16:54:17 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF1605D9E8 for ; Wed, 20 Jan 2021 16:54:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611161691; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ayp21fGBQWoXKcM7F2R06J863Kf5BLV1RHfB79yrSB0=; b=eeXs3FYJbBFV3V5bQbc8+nThBYHvWloQZgzTEgUdZIbxanaK4RUrH8Fpk/c0N3XsLWEuB+ 7ECtlNcszVTvE0Jv13fpyC4k5Tb9dWGmgA1f7Clq/I0/gmrIjWoMavrFRH8vuiZ4J5Q22V WuqZPm+NB3byQtGYFeWAO4HriZMbYw8= X-MC-Unique: ZDDJUJufNpemsf0RGUms2A-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] ci: Refresh dockerfiles Date: Wed, 20 Jan 2021 17:54:05 +0100 Message-Id: <20210120165405.247294-3-abologna@redhat.com> In-Reply-To: <20210120165405.247294-1-abologna@redhat.com> References: <20210120165405.247294-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" dtrace is now also installed when cross-building. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- 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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/centos:7 =20 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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/centos:8 =20 RUN dnf update -y && \ diff --git a/ci/containers/ci-centos-stream.Dockerfile b/ci/containers/ci-c= entos-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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/centos:8 =20 RUN dnf install -y centos-release-stream && \ diff --git a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile b/ci/conta= iners/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -99,6 +99,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/contai= ners/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/contai= ners/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -99,6 +99,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/containe= rs/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/containe= rs/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/cont= ainers/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/contai= ners/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/conta= iners/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/contain= ers/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -98,6 +98,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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-debia= n-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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:10-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ diff --git a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile b/ci/cont= ainers/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -97,6 +97,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/conta= iners/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/conta= iners/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -97,6 +97,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/contain= ers/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/con= tainers/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/conta= iners/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/cont= ainers/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/contai= ners/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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ @@ -96,6 +96,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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-debi= an-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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/debian:sid-slim =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ diff --git a/ci/containers/ci-fedora-32.Dockerfile b/ci/containers/ci-fedor= a-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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM registry.fedoraproject.org/fedora:32 =20 RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-fedora-33.Dockerfile b/ci/containers/ci-fedor= a-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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM registry.fedoraproject.org/fedora:33 =20 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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM registry.fedoraproject.org/fedora:rawhide =20 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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM registry.fedoraproject.org/fedora:rawhide =20 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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-opensuse-152.Dockerfile b/ci/containers/ci-op= ensuse-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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM registry.opensuse.org/opensuse/leap:15.2 =20 RUN zypper update -y && \ diff --git a/ci/containers/ci-ubuntu-1804.Dockerfile b/ci/containers/ci-ubu= ntu-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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/ubuntu:18.04 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ diff --git a/ci/containers/ci-ubuntu-2004.Dockerfile b/ci/containers/ci-ubu= ntu-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/d527e0c012f476c293f3bc801= b7da08bc85f98ef +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6226ef038c9b5cb6334f71922= 23fb64f5a1fa960 FROM docker.io/library/ubuntu:20.04 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ --=20 2.26.2