From patchwork Wed May 26 21:18:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 448227 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp5592456jac; Wed, 26 May 2021 14:28:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyn7uaA2jffWEdDB0DUzvpqHvLpbhI+ljXtV6bHAgQn/nNoJ7mY1WAcFFMEQNeac+b3mjBW X-Received: by 2002:a05:6e02:1561:: with SMTP id k1mr304948ilu.218.1622064521032; Wed, 26 May 2021 14:28:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622064521; cv=none; d=google.com; s=arc-20160816; b=tFhow/akXCwxUWv3jGyFm8NrRLcnhwCJ2zTu0mQCBsDIULmGoV+1G4ka2ffUEGEXAh eSfY6i9EmkWqerT/rdmmO3oyirGx6ATiTy9o9pEF7hE55A6QgzLOV1hhj046k8jhjaGU h8flgD1XmNfLDTIzG0UqaesPqLRi6SIXmU2HmFvnghqms/iDg2Lbm1YZFwpQWqs+aYlA 0O44AccxFpZ5Ay2eXXIdnC2B+upvUEu328/iz2hd3/Cb45jNkCZAJXyz0jlHHFwFmL65 1jeRw6GslarutOjV5vU+3YuGVZsten4LhCXKttMu7CrJ3u2Nv95LyVY8gz8h6fNOrVue yu3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Y7R9KU2v40J4HPku0X26Zmix7Qt6Ns1y6ik1H3mrzsY=; b=X+1Z2N6ex/xaPjoEgE3x3H4xqA8pOTrNLS0goaHm99taS+cjyPUcqKiOvNbyxbFxoy NYXTqW/NONzOQajoBJAv1ssqyxcqeetcCsg7zuGPa72QpfxUQA+BiLcx6FzLW7AVGmEz CXOrBf9aJcrTmH1w7ZhkxJKl3jiH4ZIUYKPvzJ83D0ruGhXceOz2Ij3OX5mbtHrV16lL Gv0CR6qTm0svvB4FfZD+514i25nL0FNtpyDQ8NEBWLiT+9ZrxQ4vRuyrSG/Fdv29YQSC /uZkzKew8yUUalgQe54S46/zhD+Rz+oowzQbN44phVifcnTlPj1KZJxyDjCciS5Q8FPo w+Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=NDdkL0qi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=amsat.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f184si349739jac.102.2021.05.26.14.28.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 May 2021 14:28:41 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=NDdkL0qi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=amsat.org Received: from localhost ([::1]:59486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lm14y-0006Zu-Fj for patch@linaro.org; Wed, 26 May 2021 17:28:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lm0vW-000295-60 for qemu-devel@nongnu.org; Wed, 26 May 2021 17:18:54 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:35619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lm0vU-0008Er-JH for qemu-devel@nongnu.org; Wed, 26 May 2021 17:18:53 -0400 Received: by mail-wm1-x335.google.com with SMTP id z19-20020a7bc7d30000b029017521c1fb75so1382890wmk.0 for ; Wed, 26 May 2021 14:18:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y7R9KU2v40J4HPku0X26Zmix7Qt6Ns1y6ik1H3mrzsY=; b=NDdkL0qirTCXNoqUBOIGHfeTEaR7oJk3JYbkRptjgFvzROBtE5GMwRIXloG13OG5sF q8va0AHWv5YuI8RgnlxfU9L4u+JWhyyuIW7Jb9/ASVaO1Fh5IXtvu52/c/3NVF9/juqy GvQyjFt3a7cmE5pxZsuTk+YGsuh1FjmyLHx6+hxIbUWHXCNApLiBEFm42joBik+bYROU nl13ume1Rj2NCnb8VU0mfPTZw/rTZXybVjZBWPGE9TFhZAGF6rTemrMzdyvRXDldvG96 0mvL3PazGVhqAmTTJHso4rupGrpTFgTklPYQBcWmwCFmSYLRR5sqEdqbVRPfICAOysGt CtsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Y7R9KU2v40J4HPku0X26Zmix7Qt6Ns1y6ik1H3mrzsY=; b=hPOcD6F8w/DHh/pqP8QnU/BUOW2NFyZ+AzZqkTInxUB6ecNtVdhW5Y3A4v07LkJX/u X/DXnhYNC7HbndiHshjiqqOKMVwyyFTISP/5h3J4ncHhXYH88cAQx/RJlh7wdT1zbqGs jc/RpIU2fxx2UNFaBVof82KS+ImL3I/ME1Tx5Ca0ZbMHuGHVlowgn6d90xO177BFSP83 L2i0W4Un6TEpvxa1jX+BQ0+ZJLMmO+pEiubJdfFN6yYHAsArxbB4Oke2sM6ijnb7ZKXi 1QsgIuUrhJDllDYH+cBHfGwi6eFri2dCyUCHrg8ZEycsIjgUJ5Zn0fFFZ5P+Ysnxi8Xi 24GA== X-Gm-Message-State: AOAM531j42vZj93244M25NCMxpFHfN9FuwgzNK9KyFyGINtazTdDtKa5 Ixl9lFdJBPo9qFJ/r1GLwQB3U4tRmVFnwA== X-Received: by 2002:a1c:f212:: with SMTP id s18mr5107047wmc.172.1622063931028; Wed, 26 May 2021 14:18:51 -0700 (PDT) Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id l7sm262994wmq.22.2021.05.26.14.18.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:18:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 02/19] gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS Date: Wed, 26 May 2021 23:18:21 +0200 Message-Id: <20210526211838.421716-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x335.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Suggested-by: Thomas Huth Signed-off-by: Richard Henderson Reviewed-by: Willian Rampazzo Message-Id: <20210502235727.1979457-26-richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/crossbuilds.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.26.3 diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index e44e4b49a25..2198abb400e 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-mips64el-kvm-only: extends: .cross_accel_build_job @@ -182,7 +182,7 @@ cross-mips64el-kvm-only: job: mips64el-debian-cross-container variables: 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: extends: .cross_system_build_job @@ -205,7 +205,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 @@ -214,4 +214,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