diff mbox series

[PULL,02/54] scripts/ci/setup: Fix libxen requirements

Message ID	20221004130138.2299307-3-alex.bennee@linaro.org
State	Accepted
Commit	561612f9c20d4c76d23c3051fa7b47bb13123c74
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: stefanha@redhat.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>, =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= <f4bug@amsat.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com> Subject: [PULL 02/54] scripts/ci/setup: Fix libxen requirements Date: Tue, 4 Oct 2022 14:00:46 +0100 Message-Id: <20221004130138.2299307-3-alex.bennee@linaro.org> In-Reply-To: <20221004130138.2299307-1-alex.bennee@linaro.org> References: <20221004130138.2299307-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::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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	[PULL,01/54] scripts/ci/setup: ninja missing from build-environment \| expand [PULL,01/54] scripts/ci/setup: ninja missing from build-environment [PULL,02/54] scripts/ci/setup: Fix libxen requirements [PULL,03/54] scripts/ci/setup: spice-server only on x86 aarch64 [PULL,04/54] tests/docker: run script use realpath instead of readlink [PULL,05/54] configure: move detected gdb to TCG's config-host.mak [PULL,06/54] target/hexagon: add flex/bison/glib2 to qemu.yml [PULL,07/54] target/hexagon: regenerate docker/cirrus files [PULL,08/54] target/hexagon: manually add flex/bison/glib2 to remaining containers [PULL,09/54] tests/docker: update fedora-win[32\|64]-cross with lcitool [PULL,10/54] tests/docker: move alpine from edge to tagged release [PULL,11/54] tests/qtest: bump up QOS_PATH_MAX_ELEMENT_SIZE [PULL,12/54] configure: do not invoke as/ld directly for pc-bios/optionrom [PULL,13/54] pc-bios/optionrom: detect CC options just once [PULL,14/54] pc-bios/s390-ccw: detect CC options just once [PULL,15/54] vof: add distclean target [PULL,16/54] build: add recursive distclean rules [PULL,17/54] configure: return status code from probe_target_compiler [PULL,18/54] configure: store container engine in config-host.mak [PULL,19/54] tests: simplify Makefile invocation for tests/tcg [PULL,20/54] tests/tcg: remove -f from Makefile invocation [PULL,21/54] tests/tcg: add distclean rule [PULL,22/54] tests/tcg: unify ppc64 and ppc64le Makefiles [PULL,23/54] tests/tcg: clean up calls to run-test [PULL,24/54] tests/tcg: move compiler tests to Makefiles [PULL,25/54] configure: move tests/tcg/Makefile.prereqs to root build directory [PULL,26/54] configure: unify creation of cross-compilation Makefiles [PULL,27/54] configure: cleanup creation of tests/tcg target config [PULL,28/54] configure: build ROMs with container-based cross compilers [PULL,29/54] pc-bios/optionrom: Adopt meson style Make output [PULL,30/54] pc-bios/s390-ccw: Adopt meson style Make output [PULL,31/54] pc-bios/vof: Adopt meson style Make output [PULL,32/54] monitor: expose monitor_puts to rest of code [PULL,33/54] disas: generalise plugin_printf and use for monitor_disas [PULL,34/54] disas: use result of ->read_memory_func [PULL,35/54] plugins: extend execlog to filter matches [PULL,36/54] plugins: Assert mmu_idx in range before use in qemu_plugin_get_hwaddr [PULL,37/54] docs/devel: clean-up qemu invocations in tcg-plugins [PULL,38/54] docs/devel: move API to end of tcg-plugins.rst [PULL,39/54] contrib/plugins: reset skip when matching in execlog [PULL,40/54] docs/devel: document the test plugins [PULL,41/54] semihosting: update link to spec [PULL,42/54] gdbstub: move into its own sub directory [PULL,43/54] gdbstub: move sstep flags probing into AccelClass [PULL,44/54] gdbstub: move breakpoint logic to accel ops [PULL,45/54] gdbstub: move guest debug support check to ops [PULL,46/54] accel/kvm: move kvm_update_guest_debug to inline stub [PULL,47/54] contrib/gitdm: add mapping for Loongson Technology [PULL,48/54] contrib/gitdm: add Paul to individual contributors [PULL,49/54] contrib/gitdm: add WANG Xuerui to individual contributers [PULL,50/54] contrib/gitdm: add ISCAS to the academics group [PULL,51/54] contrib/gitdm: add China Telecom to the domain map [PULL,52/54] contrib/gitdm: add Simon to individual contributors [PULL,53/54] contrib/gitdm: add Université Grenoble Alpes [PULL,54/54] plugins: add [pre\|post]fork helpers to linux-user

Commit Message

Alex Bennée Oct. 4, 2022, 1 p.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>
Message-Id: <20220929114231.583801-3-alex.bennee@linaro.org>

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: