Re: [PATCH v6 25/26] gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS

[Willian Rampazzo]

On Sun, May 2, 2021 at 9:24 PM Richard Henderson
 wrote:
>
> Suggested-by: Thomas Huth 
> Signed-off-by: Richard Henderson 
> ---
>  .gitlab-ci.d/crossbuilds.yml | 10 +-
>  1 file changed, 5 insertions(+), 5 deletions(-)
>

Reviewed-by: Willian Rampazzo 

> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
> index 2d95784ed5..fbf7b7a881 100644
> --- a/.gitlab-ci.d/crossbuilds.yml
> +++ b/.gitlab-ci.d/crossbuilds.yml
> @@ -16,7 +16,7 @@
>  #
>  # Set the $ACCEL variable to select the specific accelerator (default to
>  # KVM), and set extra options (such disabling other accelerators) via the
> -# $ACCEL_CONFIGURE_OPTS variable.
> +# $EXTRA_CONFIGURE_OPTS variable.
>  .cross_accel_build_job:
>stage: build
>image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
> @@ -26,7 +26,7 @@
>  - cd build
>  - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
>../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
>
>  .cross_user_build_job:
> @@ -174,7 +174,7 @@ cross-s390x-kvm-only:
>  job: s390x-debian-cross-container
>variables:
>  IMAGE: debian-s390x-cross
> -ACCEL_CONFIGURE_OPTS: --disable-tcg
> +EXTRA_CONFIGURE_OPTS: --disable-tcg
>
>  cross-win32-system:
>extends: .cross_system_build_job
> @@ -197,7 +197,7 @@ cross-amd64-xen-only:
>variables:
>  IMAGE: debian-amd64-cross
>  ACCEL: xen
> -ACCEL_CONFIGURE_OPTS: --disable-tcg --disable-kvm
> +EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm
>
>  cross-arm64-xen-only:
>extends: .cross_accel_build_job
> @@ -206,4 +206,4 @@ cross-arm64-xen-only:
>variables:
>  IMAGE: debian-arm64-cross
>  ACCEL: xen
> -ACCEL_CONFIGURE_OPTS: --disable-tcg --disable-kvm
> +EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm
> --
> 2.25.1
>
>

[PATCH v6 25/26] gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS

[Richard Henderson]

Suggested-by: Thomas Huth 
Signed-off-by: Richard Henderson 
---
 .gitlab-ci.d/crossbuilds.yml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index 2d95784ed5..fbf7b7a881 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -16,7 +16,7 @@
 #
 # Set the $ACCEL variable to select the specific accelerator (default to
 # KVM), and set extra options (such disabling other accelerators) via the
-# $ACCEL_CONFIGURE_OPTS variable.
+# $EXTRA_CONFIGURE_OPTS variable.
 .cross_accel_build_job:
   stage: build
   image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
@@ -26,7 +26,7 @@
 - cd build
 - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
   ../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
 
 .cross_user_build_job:
@@ -174,7 +174,7 @@ cross-s390x-kvm-only:
 job: s390x-debian-cross-container
   variables:
 IMAGE: debian-s390x-cross
-ACCEL_CONFIGURE_OPTS: --disable-tcg
+EXTRA_CONFIGURE_OPTS: --disable-tcg
 
 cross-win32-system:
   extends: .cross_system_build_job
@@ -197,7 +197,7 @@ cross-amd64-xen-only:
   variables:
 IMAGE: debian-amd64-cross
 ACCEL: xen
-ACCEL_CONFIGURE_OPTS: --disable-tcg --disable-kvm
+EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm
 
 cross-arm64-xen-only:
   extends: .cross_accel_build_job
@@ -206,4 +206,4 @@ cross-arm64-xen-only:
   variables:
 IMAGE: debian-arm64-cross
 ACCEL: xen
-ACCEL_CONFIGURE_OPTS: --disable-tcg --disable-kvm
+EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm
-- 
2.25.1