From patchwork Wed Sep 14 15:59:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605769 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp866640lth; Wed, 14 Sep 2022 09:46:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR5+YK7Q0hrEFIxO66vEEO6pnS/wXMjZ4Hhetg7JGoJHQ89Pi/gmz+pq/Qx9De6Y0g9uPdRo X-Received: by 2002:a37:a9ce:0:b0:6cb:bdee:c971 with SMTP id s197-20020a37a9ce000000b006cbbdeec971mr23272884qke.520.1663173981558; Wed, 14 Sep 2022 09:46:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173981; cv=none; d=google.com; s=arc-20160816; b=vnpVrCNI0BTLPd1UqyBRawc4ruziFjBxEsBtf1W6gKtIMOjHPAS9+GIThU0Vhy7H9b NHFy9V8MGKtgwyUJfKA9F//pkmSK9qf1vDE9WzAEz2hN+am9VJgPcuEh87j6O+fViTmS IiMHfYc0+l2Ofdxb7zYJMGF9wleH2C/V/uFHGbjP/uQSiu2njKYGWcnjdH2Dt5+JrU4A Xnppr9e+cGznGgDS3VjiBppXeTrSmefQTbUoE57bZDWMRor3WOCrvxiJQ3fE/Vt0OJgF OJUxrgmULECl5kvyJq5UD05H/oJR+AlyC7IAs925aDNKMMGixueJS2u9eMWk3oN8HuXZ ib/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DOBOInzSt+enCwl0nSHMUZYxdD3wfdAmUMtGktSPyVQ=; b=H6Yjp4RABZH4gIvhiWHY0BPvrYMPWWEo57wEalo9pEQVV1A9jYcv6sMcO0F/9zjaX1 OKoAn/9H7+8rj9cbq44AD4r5jLQRul57xRtMW2XoF/IUFmdBR2xP3sM5BEOxXRAqhcFF tsnKHdSJtY+D5N+1hZLFD1h2cJpuvFZfI1GKwfxM6tZXW6H9Zim5nX/36uJDhRHAHG9m LWmFs7rkYGFPhYV5GR/Zu5eqU1HO5W9HY8IuvAADB590DsFKhNnTk28WkwMg2xWi5WTs LkArTH+oA1dh+x8hef0uzh7KZyly3Sw6nrmFQBUTD8XEfYNxrmTTIW6BcMMhKh6ptBGy 2ITA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ms2OlgqP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id cq7-20020a05622a424700b0035b8c96d89bsi517920qtb.164.2022.09.14.09.46.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:46:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ms2OlgqP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVWn-0005XL-0m for patch@linaro.org; Wed, 14 Sep 2022 12:46:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUu5-0001Yd-Rc for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:27 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:46039) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUu3-0003s2-QQ for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:21 -0400 Received: by mail-wr1-x432.google.com with SMTP id bj14so26424583wrb.12 for ; Wed, 14 Sep 2022 09:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=DOBOInzSt+enCwl0nSHMUZYxdD3wfdAmUMtGktSPyVQ=; b=Ms2OlgqPhxLSrLKJ8GVJXi/RLjtyAeWzBexO2WcAH1/lWo8ImF/QU4ixFSl+HrUWhY toN/r6UYqocIOdh892clNUoxTc3hcldS6q4WF2ra97/elbxKxyi1HniFMy+K/lS2CBhj k18on2PN6mzEg3/KdClDLmoYXpBUX+raFgAbbPhfQvygrF1Y0VsEap83BR9lX9hihh0A rCJA7fqq96frFvuMJ0Wcx2jBNjFS+ivzqdNA1ryBAvPSNEOCsFpTqWahEkCF2FKPYlSx NPdB2voKhfeFlZRt1F5Q6K1zv7W9Y+S9kRcU7LFS/f/QT49SiCgH0i/jxT+sTrPcKljL A5Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=DOBOInzSt+enCwl0nSHMUZYxdD3wfdAmUMtGktSPyVQ=; b=azrWyIH0Bv37urMli9+ikzWNZaAXS5/7vBGrOppEamUNMdHGZFIdZ2x86nz3ynwf6j 83YHqrR3PqcJG2f/Hos7msj+gYfVUizDnpkGFzzCAIBjk9JKgkta5Yh0IatCexaxZdS/ ZaXE60W2YykZNbll+/bJPDFg5MYpkWa3HOcFwd449zKIDB9X4WDe9If//OPIsUCT3uaa 3mtvxAx5o53D/1kevTqZQNVbKPb+1VOX+Za8+gKxuy8Ydai4mAzYg+RbNsiCuy82sM5y vJnMtmz8nKGEmpW+4clsjMvOOYEZIQ7uq1p1lw0sRrTHXTH/pBkVoVCui7lZ2SGLADpD Zv2Q== X-Gm-Message-State: ACgBeo2xSl6gYBAO8RyzwTXf4PGsqcCzGQ70DXksl2LFBB+6DIcyqzEj AoD/yXOMh0X2Swy3KXpj8UFt0g== X-Received: by 2002:a5d:46c9:0:b0:22a:4306:b77d with SMTP id g9-20020a5d46c9000000b0022a4306b77dmr14744515wrs.305.1663171576159; Wed, 14 Sep 2022 09:06:16 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n2-20020a5d4c42000000b002250c35826dsm13773676wrt.104.2022.09.14.09.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 88D7D1FFCF; Wed, 14 Sep 2022 16:59:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Ed Maste , Li-Wen Hsu , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 24/30] tests/lcitool: bump to latest version Date: Wed, 14 Sep 2022 16:59:44 +0100 Message-Id: <20220914155950.804707-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We need this to be able to cleanly build the x86 cross images. There are a few minor updates triggered by lcitool-refresh including adding "libslirp" to the freebsd vars and opensuse-leap which will help when we finally drop the slirp submodule from QEMU. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220826172128.353798-19-alex.bennee@linaro.org> --- v2 - expand commit re:libslirp --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- tests/docker/dockerfiles/opensuse-leap.docker | 3 ++- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- tests/lcitool/libvirt-ci | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index 8fa5a320e9..1a5959810f 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.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='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 8ed7e33a77..5e5aafd7e5 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/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='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 047a435ab5..041cf9c1ff 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -66,6 +66,7 @@ RUN zypper update -y && \ librbd-devel \ libseccomp-devel \ libselinux-devel \ + libslirp-devel \ libspice-server-devel \ libssh-devel \ libtasn1-devel \ @@ -127,7 +128,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 99803b343b..e1f4ed7c80 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -137,7 +137,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 324355cf62..e3712b7912 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 324355cf62e86fb551408575afb123bac989ac37 +Subproject commit e3712b79122180fdb3b7a7ea8cbee47ece253f97