diff mbox series

[v1,02/51] scripts/ci/setup: Fix libxen requirements

Message ID	20220929114231.583801-3-alex.bennee@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org 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; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> 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, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>, =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com> Subject: [PATCH v1 02/51] scripts/ci/setup: Fix libxen requirements Date: Thu, 29 Sep 2022 12:41:42 +0100 Message-Id: <20220929114231.583801-3-alex.bennee@linaro.org> In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	maintainer pre-PR (testing, plugins, gitdm, semihosting) \| expand [v1,00/51] maintainer pre-PR (testing, plugins, gitdm, semihosting) [v1,01/51] scripts/ci/setup: ninja missing from build-environment [v1,02/51] scripts/ci/setup: Fix libxen requirements [v1,03/51] scripts/ci/setup: spice-server only on x86 aarch64 [v1,04/51] tests/docker: run script use realpath instead of readlink [v1,05/51] configure: move detected gdb to TCG's config-host.mak [v1,06/51] target/hexagon: add flex/bison/glib2 to qemu.yml [v1,07/51] target/hexagon: regenerate docker/cirrus files [v1,08/51] target/hexagon: manually add flex/bison/glib2 to remaining containers [v1,09/51] tests/docker: update fedora-win[32\|64]-cross with lcitool [v1,10/51] tests/docker: move alpine from edge to tagged release [v1,11/51] tests/qtest: bump up QOS_PATH_MAX_ELEMENT_SIZE [v1,12/51] configure: do not invoke as/ld directly for pc-bios/optionrom [v1,13/51] pc-bios/optionrom: detect CC options just once [v1,14/51] pc-bios/s390-ccw: detect CC options just once [v1,15/51] vof: add distclean target [v1,16/51] build: add recursive distclean rules [v1,17/51] configure: return status code from probe_target_compiler [v1,18/51] configure: store container engine in config-host.mak [v1,19/51] tests: simplify Makefile invocation for tests/tcg [v1,20/51] tests/tcg: remove -f from Makefile invocation [v1,21/51] tests/tcg: add distclean rule [v1,22/51] tests/tcg: unify ppc64 and ppc64le Makefiles [v1,23/51] tests/tcg: clean up calls to run-test [v1,24/51] tests/tcg: move compiler tests to Makefiles [v1,25/51] configure: move tests/tcg/Makefile.prereqs to root build directory [v1,26/51] configure: unify creation of cross-compilation Makefiles [v1,27/51] configure: cleanup creation of tests/tcg target config [v1,28/51] configure: build ROMs with container-based cross compilers [v1,29/51] pc-bios/optionrom: Adopt meson style Make output [v1,30/51] pc-bios/s390-ccw: Adopt meson style Make output [v1,31/51] pc-bios/vof: Adopt meson style Make output [v1,32/51] monitor: expose monitor_puts to rest of code [v1,33/51] disas: generalise plugin_printf and use for monitor_disas [v1,34/51] disas: use result of ->read_memory_func [v1,35/51] plugins: extend execlog to filter matches [v1,36/51] plugins: Assert mmu_idx in range before use in qemu_plugin_get_hwaddr [v1,37/51] docs/devel: clean-up qemu invocations in tcg-plugins [v1,38/51] docs/devel: move API to end of tcg-plugins.rst [v1,39/51] contrib/plugins: reset skip when matching in execlog [v1,40/51] docs/devel: document the test plugins [v1,41/51] semihosting: update link to spec [v1,42/51] gdbstub: move into its own sub directory [v1,43/51] gdbstub: move sstep flags probing into AccelClass [v1,44/51] gdbstub: move breakpoint logic to accel ops [v1,45/51] gdbstub: move guest debug support check to ops [v1,46/51] accel/kvm: move kvm_update_guest_debug to inline stub [v1,47/51] contrib/gitdm: add mapping for Loongson Technology [v1,48/51] contrib/gitdm: add Paul to individual contributors [v1,49/51] contrib/gitdm: add WANG Xuerui to individual contributers [v1,50/51] contrib/gitdm: add ISCAS to the academics group [v1,51/51] contrib/gitdm: add China Telecom to the domain map

Commit Message

Alex Bennée Sept. 29, 2022, 11:41 a.m. UTC

From: "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>

XEN hypervisor is only available in ARM and x86, but the yaml only
checked if the architecture is different from s390x, changed it to
a more accurate test.
Tested this change on a Ubuntu 20.04 ppc64le.

Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220922135516.33627-3-lucas.araujo@eldorado.org.br>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 scripts/ci/setup/build-environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index b5acaf9118..49292715d3 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -97,7 +97,7 @@ 
         state: present
       when:
         - ansible_facts['distribution'] == 'Ubuntu'
-        - ansible_facts['architecture'] != 's390x'
+        - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64'
 
     - name: Install basic packages to build QEMU on Ubuntu 20.04
       package: