From patchwork Mon Oct 31 13:09:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 620228 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2816805pvb; Mon, 31 Oct 2022 06:17:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6BdHoNxA5JmCjysFTnVUD7fKt6y5A5U40wDs0YjB4dPyFVIhSDZEyw3U5cyOqj13XNtyJJ X-Received: by 2002:ab0:1d94:0:b0:411:3fc9:4c66 with SMTP id l20-20020ab01d94000000b004113fc94c66mr3802272uak.45.1667222264494; Mon, 31 Oct 2022 06:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222264; cv=none; d=google.com; s=arc-20160816; b=jc9nq50jmxzwPo+U091MSVSHcyO2dpAVfgRc2bzOBHMoZBCTkJXAYk71jXQif3a3WC JBotmrTSinjw/wY64JR54c6MvxQcbwIQz9nV8azn1D/4B0YgJKG59M/strYYNMxR76hR XRPnLoN8jYVoz+CqXeV0HkS83vnVz2YhKz6DoO7+XpTgrD+Pk67kH4QLsKAYgGh4Ro4A KRs29zWHn9qJovTwro/zlCRvcnuWphzMOPQaCL+ddtXDk0SW0txEbAQvPG+aKQn3dkD/ uzO+G6GQWnjtxJOycVlDhT3BTteW7HfE1hof59AoHtCEFi9eEtx02D+eD+Y1KYmEvv2s wQLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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:cc:to :from:dkim-signature; bh=EGpVj/x6emk+Gk8JKMkbCIdsGLC6yCTvoW6GyyQvtYM=; b=df0Xad3v123izXphgPLSGa2bN4VaMXJIFQ2m6O5jTqSFCnquHynIAukgtnxDKALBzh XQTM16IPYPGGz/7UmPdLl4S0oIY/DoznmPJcyGjFdfplysE+2wL9X3KiQmqyED1xboyI XTL5aSUI84BM12YUYIig953F2mLivXUWODTN4WYljn5h3qkSCYMFIfeWbl3sE0YvBtW9 PZR1LOjZGxpr2rleqdP6Ug3ojFlmYJ+4F+68wOcFLsShFdqkI9RZJe4+H9aLCa6nP9wX t+kpQ33Sy+kEduXR2p/uLBHIEyRjf5RUXz1QU0W7ada6Op3EI+gff+yvFX0jsfgMdOQZ +qfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=msg1uJih; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f129-20020a676a87000000b003aa4a7a5a6dsi1142761vsc.576.2022.10.31.06.17.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:17:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=pass header.i=@linaro.org header.s=google header.b=msg1uJih; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZR-0002hw-Be; Mon, 31 Oct 2022 09:11:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYj-0007wn-Fy for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:39 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYR-0001CZ-Pr for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:31 -0400 Received: by mail-wr1-x434.google.com with SMTP id v1so15889108wrt.11 for ; Mon, 31 Oct 2022 06:10:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EGpVj/x6emk+Gk8JKMkbCIdsGLC6yCTvoW6GyyQvtYM=; b=msg1uJihni8aDVMTGZNA4efDITHV8HGQJ2OGQQYv/HS2ZFBjvkzfg7s7ESdTITocWT OAMV50fGLU9gKL3zcYuc2FWiJo3jGBgcIlDq88z03+dUwmVPMzDlk8reV94dfrnAElQR k0DKNEVKKENEfGfNw2ImpTGpMd3NJsvrSGwra7Wo5GLz/z1Uu5KZtTbxhNtTLvuw2ngF hMriFNyfoI1ypQUe8ATELiNjOLJb4L52A4fj2a+B1tj4UGHMfL/+eMPSxQOGh8xsG6Ir yir9uRKlC4hnaxCHA1PgusZTAl1wMld/tq5pQpBzarMtoA9ZsTMLcZr4QZeXHwPgyqiH aWBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EGpVj/x6emk+Gk8JKMkbCIdsGLC6yCTvoW6GyyQvtYM=; b=jSWxtMTbsSJl1I9qbfKi4XzvEq73sNmtxNXKVCHmetbNT2sagxLXOaYC0ig7h7YClO 11/y3ThhvpshXc2VDOXisASHO4NN6stuiYwtVMPp2fD7qKtT57wt5zIWRZq2+3PT07CQ mTT5BAqjRyarK30yhAQqx7eCoii8kB2xjtQOSTOGOJoXKDvXBdUnVPj8GWZS+Vtnwx9c 1Mp95Trc01q9eGIs5pNd0eE8A9NuhyunEdPcJL0xCh1ph52D2Dmirk+YibcQpjVeJT5c GaJrToJ2L4Dn7a6cs5x6KOot9IpSpV9cSQ/axkT3ukeWfGsrLItftK9bVA8BHOWGc0Qf 5Pyw== X-Gm-Message-State: ACrzQf37NohCtgMcuEfIlN5KZcCD+1SGPBUdPEYZsyG1bjcGOXM88l1y KOzLRiNHWuChaJPMtT7KMDdy8g== X-Received: by 2002:adf:e84f:0:b0:235:d53a:2d7f with SMTP id d15-20020adfe84f000000b00235d53a2d7fmr8215645wrn.334.1667221812169; Mon, 31 Oct 2022 06:10:12 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h10-20020a05600c314a00b003a1980d55c4sm7435671wmo.47.2022.10.31.06.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CF06E1FFB8; Mon, 31 Oct 2022 13:10:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 01/31] tests/lcitool: Rename non-Debian specific helper Date: Mon, 31 Oct 2022 13:09:40 +0000 Message-Id: <20221031131010.682984-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-1-alex.bennee@linaro.org> MIME-Version: 1.0 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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org This helper is not Debian specific, rename it to cross_build(). Signed-off-by: Alex Bennée Acked-by: Richard Henderson Message-Id: <20220929114231.583801-10-alex.bennee@linaro.org> Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20221028095659.48734-2-philmd@linaro.org> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index e45c99adbe..a6a7c23c1d 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -93,7 +93,7 @@ debian11_extras = [ ] -def debian_cross_build(prefix, targets): +def cross_build(prefix, targets): conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix) targets = "ENV DEF_TARGET_LIST %s\n" % (targets) return "".join([conf, targets]) @@ -121,45 +121,45 @@ try: # generate_dockerfile("debian-amd64-cross", "debian-11", cross="x86_64", - trailer=debian_cross_build("x86_64-linux-gnu-", - "x86_64-softmmu," - "x86_64-linux-user," - "i386-softmmu,i386-linux-user")) + trailer=cross_build("x86_64-linux-gnu-", + "x86_64-softmmu," + "x86_64-linux-user," + "i386-softmmu,i386-linux-user")) generate_dockerfile("debian-arm64-cross", "debian-11", cross="aarch64", - trailer=debian_cross_build("aarch64-linux-gnu-", - "aarch64-softmmu,aarch64-linux-user")) + trailer=cross_build("aarch64-linux-gnu-", + "aarch64-softmmu,aarch64-linux-user")) generate_dockerfile("debian-armel-cross", "debian-11", cross="armv6l", - trailer=debian_cross_build("arm-linux-gnueabi-", - "arm-softmmu,arm-linux-user,armeb-linux-user")) + trailer=cross_build("arm-linux-gnueabi-", + "arm-softmmu,arm-linux-user,armeb-linux-user")) generate_dockerfile("debian-armhf-cross", "debian-11", cross="armv7l", - trailer=debian_cross_build("arm-linux-gnueabihf-", - "arm-softmmu,arm-linux-user")) + trailer=cross_build("arm-linux-gnueabihf-", + "arm-softmmu,arm-linux-user")) generate_dockerfile("debian-mips64el-cross", "debian-11", cross="mips64el", - trailer=debian_cross_build("mips64el-linux-gnuabi64-", - "mips64el-softmmu,mips64el-linux-user")) + trailer=cross_build("mips64el-linux-gnuabi64-", + "mips64el-softmmu,mips64el-linux-user")) generate_dockerfile("debian-mipsel-cross", "debian-11", cross="mipsel", - trailer=debian_cross_build("mipsel-linux-gnu-", - "mipsel-softmmu,mipsel-linux-user")) + trailer=cross_build("mipsel-linux-gnu-", + "mipsel-softmmu,mipsel-linux-user")) generate_dockerfile("debian-ppc64el-cross", "debian-11", cross="ppc64le", - trailer=debian_cross_build("powerpc64le-linux-gnu-", - "ppc64-softmmu,ppc64-linux-user")) + trailer=cross_build("powerpc64le-linux-gnu-", + "ppc64-softmmu,ppc64-linux-user")) generate_dockerfile("debian-s390x-cross", "debian-11", cross="s390x", - trailer=debian_cross_build("s390x-linux-gnu-", - "s390x-softmmu,s390x-linux-user")) + trailer=cross_build("s390x-linux-gnu-", + "s390x-softmmu,s390x-linux-user")) # # Cirrus packages lists for GitLab