SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS

Browse Source 
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210502235727.1979457-26-richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Richard Henderson 2021-05-02 16:57:26 -07:00 committed by Philippe Mathieu-Daudé
parent a4b201d1ac
commit e4af2160e1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.d/crossbuilds.yml
View File

@ -16,7 +16,7 @@
# #
# Set the $ACCEL variable to select the specific accelerator (default to # Set the $ACCEL variable to select the specific accelerator (default to
# KVM), and set extra options (such disabling other accelerators) via the # KVM), and set extra options (such disabling other accelerators) via the
# $ACCEL_CONFIGURE_OPTS variable. # $EXTRA_CONFIGURE_OPTS variable.
.cross_accel_build_job: .cross_accel_build_job:
stage: build stage: build
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
@ -26,7 +26,7 @@
- cd build - cd build
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
--disable-tools --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS --disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS
- make -j$(expr $(nproc) + 1) all check-build - make -j$(expr $(nproc) + 1) all check-build
.cross_user_build_job: .cross_user_build_job:
@ -174,7 +174,7 @@ cross-s390x-kvm-only:
job: s390x-debian-cross-container job: s390x-debian-cross-container
variables: variables:
IMAGE: debian-s390x-cross IMAGE: debian-s390x-cross
ACCEL_CONFIGURE_OPTS: --disable-tcg EXTRA_CONFIGURE_OPTS: --disable-tcg
cross-mips64el-kvm-only: cross-mips64el-kvm-only:
extends: .cross_accel_build_job extends: .cross_accel_build_job
@ -182,7 +182,7 @@ cross-mips64el-kvm-only:
job: mips64el-debian-cross-container job: mips64el-debian-cross-container
variables: variables:
IMAGE: debian-mips64el-cross IMAGE: debian-mips64el-cross
ACCEL_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu
cross-win32-system: cross-win32-system:
extends: .cross_system_build_job extends: .cross_system_build_job
@ -205,7 +205,7 @@ cross-amd64-xen-only:
variables: variables:
IMAGE: debian-amd64-cross IMAGE: debian-amd64-cross
ACCEL: xen ACCEL: xen
ACCEL_CONFIGURE_OPTS: --disable-tcg --disable-kvm EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm
cross-arm64-xen-only: cross-arm64-xen-only:
extends: .cross_accel_build_job extends: .cross_accel_build_job
@ -214,4 +214,4 @@ cross-arm64-xen-only:
variables: variables:
IMAGE: debian-arm64-cross IMAGE: debian-arm64-cross
ACCEL: xen ACCEL: xen
ACCEL_CONFIGURE_OPTS: --disable-tcg --disable-kvm EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm