| Message ID | 20201125042745.31986-7-sstabellini@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | automation: improvements (mostly) for arm64 | expand |
On Tue, 24 Nov 2020, Stefano Stabellini wrote: > Allow failure for these jobs. Currently they fail because hvmloader > doesn't build with musl. The failures don't block the pipeline. > > Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com> > --- > This patch is probably required: https://github.com/alpinelinux/aports/blob/master/main/xen/musl-hvmloader-fix-stdint.patch We could simply disable the hvmloader build when it is not necessary. When OVMF, SeaBios, and Rombios are all disabled, it doesn't make sense to build hvmloader. If this assumption is correct, then the patch below fixes the Alpine Linux build (as long as we pass --disable-seabios and --disable-rombios appropriately) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 48bd9ab731..a6aada576f 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -55,6 +55,15 @@ CONFIG_QEMU_XEN := @qemu_xen@ CONFIG_QEMUU_EXTRA_ARGS:= @EXTRA_QEMUU_CONFIGURE_ARGS@ CONFIG_LIBNL := @libnl@ CONFIG_GOLANG := @golang@ +ifeq ($(CONFIG_ROMBIOS),y) +CONFIG_FIRMWARE=y +endif +ifeq ($(CONFIG_SEABIOS),y) +CONFIG_FIRMWARE=y +endif +ifeq ($(CONFIG_OVMF),y) +CONFIG_FIRMWARE=y +endif CONFIG_SYSTEMD := @systemd@ SYSTEMD_CFLAGS := @SYSTEMD_CFLAGS@ diff --git a/tools/Makefile b/tools/Makefile index ed71474421..9821a7f5d5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -14,7 +14,7 @@ SUBDIRS-y += examples SUBDIRS-y += hotplug SUBDIRS-y += xentrace SUBDIRS-$(CONFIG_XCUTILS) += xcutils -SUBDIRS-$(CONFIG_X86) += firmware +SUBDIRS-$(CONFIG_FIRMWARE) += firmware SUBDIRS-y += console SUBDIRS-y += xenmon SUBDIRS-y += xentop
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index fa38c39d6a..c48c0f3d66 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -410,6 +410,31 @@ opensuse-leap-gcc-debug: variables: CONTAINER: suse:opensuse-leap +alpine-3.12-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: alpine:3.12 + allow_failure: true + +alpine-3.12-gcc-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: alpine:3.12 + allow_failure: true + +alpine-3.12-clang: + extends: .gcc-x86-64-build + variables: + CONTAINER: alpine:3.12 + allow_failure: true + +alpine-3.12-clang-debug: + extends: .gcc-x86-64-build-debug + variables: + CONTAINER: alpine:3.12 + allow_failure: true + + # Arm builds debian-unstable-gcc-arm64:
Allow failure for these jobs. Currently they fail because hvmloader doesn't build with musl. The failures don't block the pipeline. Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com> --- This patch is probably required: https://github.com/alpinelinux/aports/blob/master/main/xen/musl-hvmloader-fix-stdint.patch --- automation/gitlab-ci/build.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)