From patchwork Wed Jun 1 18:05:05 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: 577800 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp841564mab; Wed, 1 Jun 2022 11:09:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx27xt0+5Oczq1U9DOqFgaAaFCfVp+4uuHGkDkrU68MLx3+4zdeskaeCmSrjbY46japfqIw X-Received: by 2002:a05:622a:345:b0:302:cb26:8c25 with SMTP id r5-20020a05622a034500b00302cb268c25mr845945qtw.276.1654106981923; Wed, 01 Jun 2022 11:09:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654106981; cv=none; d=google.com; s=arc-20160816; b=ryIluVDyWrVUVTI3TbTuPglMFHoDICfIkNdWXREODx+dmADvt7g+1dZkhSQ4Sdk75i NdJnPDTi4YaqvP4O+XPgR2LWAzXH/PLYpb+BfkRBV9sZOehILmH2VehRz6OLAXWRpEcy /AAPuUPRiFth46eyHV/t67KDsaFvOClpyDKToTI/CYz4BJMdBw8u0c787v9AjjyYkD5L r0tFknxbIM6O3VI1criKIExjvHmAXgMV1ZXABl2QfzxMWZfNC8IFO5/zXHrElbgQLqPc LgD6euSMCj8PR3Yo+Px9R48e3BQxeXPRSD38wTvRHxgDrYpPqgkTx5Rl9vAiMDadms3d Axbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=xRQGucPr2Skix5uZ1kMmZ2lma7cwR+iFE8QMRTICesc=; b=okhoXbpOK20CFzY5vkEFzoxagXqaV4lMzpidsYbJjH96o2NQwfExDVvwkuFki62wa+ SKtCAM3nMt0w14fy7ZTF8R+qdfWpznd1X4qlOuyyGv0MPPSCOhWQS23o7FpYO8t44+sX 9H3REN/opJ2NcxbtnTvbSuP34YoBBMnHh4xmLPKWZztFtUpUXczgdSWpRvGWd3JSV99l /0YQC2HUKh0KWJ0+OGgfGFs+tWFfsWQ5y3j3mwmsx0jXvLvupg8Rno6JoShMG4qzKDj0 7sWvxaGcmKpJ/iQ5AXAoEJ4EtlY3Gd9jwnX0129xSaAzUV1ocS5BM12VMRs4R8xnjXJD WQaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xKAfbJjl; 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=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 j20-20020a05622a039400b00304c1f10ea7si1302961qtx.753.2022.06.01.11.09.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:09: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=pass header.i=@linaro.org header.s=google header.b=xKAfbJjl; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSmr-0006hm-H4 for patch@linaro.org; Wed, 01 Jun 2022 14:09:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSj2-0000nk-2n for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:46 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:44719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSj0-0004vl-G2 for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:43 -0400 Received: by mail-ed1-x52e.google.com with SMTP id b8so3246190edf.11 for ; Wed, 01 Jun 2022 11:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xRQGucPr2Skix5uZ1kMmZ2lma7cwR+iFE8QMRTICesc=; b=xKAfbJjlTjWyk7IldijEAXCLG/ENWhP2njT4I0i0ksaxO3qOuXUh+7IrwHyln9izrF ocu/Vfe88rfGycvD+0WlelDJ+g5/20eJ+QCEtVbkhzgKbgYUBohjH7eDDHr99YqAsOep 5mLRZFBQneCHe8/eLQttwrvsXU5XGKXTi2ABeyWikkQqV3s4l7EDriQLoxVdaAgDIXdu 4CkbHKclwfUoVPpjhNOicAhsmLtSJ++tPzF9IaVEbkzC6uubxEaUg95wjyphn6XBVRJM wag3vrB+0nxi9h5F72IrrdQRv/xKORT5+sZTi1aVlShKcm5WzwlJivhcrLwSR1YUJ+Kp 112w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xRQGucPr2Skix5uZ1kMmZ2lma7cwR+iFE8QMRTICesc=; b=1NgPUPsIempFtQMkzbKuTNVrZ6m26PugUCVyVSiwheErdF1/z5EDbTOqhVmBHKLY98 II6CfCKVQGL/rj0JfiJJhVj3HMj0SFJn9VILv3/cfMpSyQNsTpKyfQobrQ1X+c8v+wR9 d3oe4YbT3xTgWfKQBoevlaCdOcZPNzVsc9Yfax0dNgPXqZvZduIs07omkUDRc3jJ11Fg pxBt4L+GOmsebbL1CT1VDXOGNhFzckollDmFiCAWu35+DrA2PuQSbgFIq/b/HdbKsDko HwBvS0MpiOSOapBD9bkZQZbWvGUWpDs6HE7BMm/+5x5TlBHSJMBr7RFgNw4e/h5+gr2j yV2A== X-Gm-Message-State: AOAM530WNMAzI8WKyVSjrZvc/7QO6WkXobLW/NXHvoTlnFDwX/Umy2Ng id74PenQ2Oyq1Yowp5ukjAt6Dw== X-Received: by 2002:a05:6402:1cc1:b0:413:2b12:fc49 with SMTP id ds1-20020a0564021cc100b004132b12fc49mr1068355edb.118.1654106741176; Wed, 01 Jun 2022 11:05:41 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id hz14-20020a1709072cee00b00708e906faecsm480563ejc.124.2022.06.01.11.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:38 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CEF3F1FFB8; Wed, 1 Jun 2022 19:05:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Thomas Huth , =?utf-8?q?Alex_Be?= =?utf-8?q?nn=C3=A9e?= , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 01/33] .gitlab-ci.d/container-cross: Fix RISC-V container dependencies / stages Date: Wed, 1 Jun 2022 19:05:05 +0100 Message-Id: <20220601180537.2329566-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The "riscv64-debian-cross-container" job does not depend on any other container job from the first stage, so we can move it to the first stage, too. The "riscv64-debian-test-cross-container" job needs the debian11 container, so we should add a proper "needs:" statement here. Signed-off-by: Thomas Huth Message-Id: <20220524093141.91012-1-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Alistair Francis Message-Id: <20220527153603.887929-2-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index e622ac2d21..ac15fce9b6 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -125,7 +125,7 @@ ppc64el-debian-cross-container: riscv64-debian-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers # as we are currently based on 'sid/unstable' we may break so... allow_failure: true variables: @@ -135,6 +135,7 @@ riscv64-debian-cross-container: riscv64-debian-test-cross-container: extends: .container_job_template stage: containers-layer2 + needs: ['amd64-debian11-container'] variables: NAME: debian-riscv64-test-cross From patchwork Wed Jun 1 18:05:06 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: 577796 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp838873mab; Wed, 1 Jun 2022 11:06:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKDgrwcAP9u9lkl6mIWvqkf0xMohtxpLWS2OObBkj0VhcoMlQ007wcqbxoxjWxc75Gt+NP X-Received: by 2002:a05:620a:3188:b0:6a3:620d:73ba with SMTP id bi8-20020a05620a318800b006a3620d73bamr512896qkb.637.1654106804740; Wed, 01 Jun 2022 11:06:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654106804; cv=none; d=google.com; s=arc-20160816; b=Mbq05Mu3iC/EL1NJZ3qkHJwcAw3a0vlkJML0bVMh1b5bqLr31qfht7T90ZggMz6pEc pRpORk44Az/CWrsUXY6zDletH+M7xtZ51yq93nV/D8qEPeoP1/AHw+eWUnj++e6jSfhK JTT8t1Wp+ErEB+8Hgu2/dfhyDkfRZFMoDS2kaAxtYAAR6cKxRtfVlWnMpvesPxfLomWx eDdIEZeCamiu1uGaeeibbRUGpBxOdUaLPfK0/HZBkexBhMztJIsijKD6xwrRvjxRGYZH DD6AxYlSPJv6dDiu79LntkXHGeqbWyYxQIiaaUVEJVyCiMt22GmQ0pXxRh/wvT68vs3L FcZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=1Y3nXccyGYxXRbjNu5XWgdb5X0W38nFNWP9eUzzltTw=; b=sBt/8P7rNowUF7ObOdrxUh5OTB8fyuRmQO2YxV3w4JzlmuW1rmVyqPINBain/G9qYI R3GfPyH97xXNf7LzSbhL5pe+sF3D3I6rWSacd5T606/jiOk7kPS03jA3ahchwysBCHWK 4J+NXkH9Ix01GzSJeyLWl2pbPUsrZk2+RkftmmtcTdSwF/F8hkQCN80M3mXit1XY6fQo sTeYkzao/wkc6m0wDG9QKm7XpEfcsJWawCx0s9e/7uHo5r8jDxswoyWHj7wJUkWGvduL lrU80IHei5V6lHnnuFC2pFnrw5XfZ0hAPFJTbQI9pGxrYVMlZU4ztZsd02bSZ0q5NN5j BXjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YtgeWxhB; 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=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 o10-20020ac8554a000000b002f92dbff912si1048451qtr.611.2022.06.01.11.06.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:06:44 -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=pass header.i=@linaro.org header.s=google header.b=YtgeWxhB; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSk0-0000sT-9H for patch@linaro.org; Wed, 01 Jun 2022 14:06:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSj3-0000ot-Br for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:46 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:33514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSj1-0004wJ-Jk for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:44 -0400 Received: by mail-ej1-x634.google.com with SMTP id f9so5457837ejc.0 for ; Wed, 01 Jun 2022 11:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1Y3nXccyGYxXRbjNu5XWgdb5X0W38nFNWP9eUzzltTw=; b=YtgeWxhB1avB6tRhdnECLvQCdo2pmtxmp5jvSyC0QrxNkLX46zIz9AdwlDaqIncBQ7 oPG6FwNCdyAHMJWQcBniC4u1sfMsklNGJi1bUvW+1SY6iWHZywHbuRIBGRCaVviyjGoT rkS7VcU+4n+0eKB5F/IrKitiIf2TARAIYtBGtC1qjbx7dRnqeeVEwjBa3ex93UhQ2Cs+ vInUj7lmIjjhzXnDIIUy5Wk+mDmxEeAJIgzNqMmNChjEZZVsfFlfWEJjAjNJ+4NyiLdf +/zEzPKchDaew/uGFzp/xagbMsfKAK0b0YtmZXo8x2WSQV4W6DRcRR6051ISJCiPmTKN dZxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1Y3nXccyGYxXRbjNu5XWgdb5X0W38nFNWP9eUzzltTw=; b=kHJ4ltzSKl9ZC2E/i5me4JMCsovW5GATFjjjeb0vgjRglHz8ZJSAVpnJ/keTstgXM7 mcvaawX7kRe5aA2pd1lX7XjfdyflYZk7PunZARLy21FZDiZwstErBL0hUx1ZELS5NHW2 jAxy2h0Xabny4sBOkLOlotBBd0ZpB3pt6CJbj7zvpHSADnlktRGYG4ak7212K6Qa20KQ /PVDzRSZ7QYNH10ry3efWuOJIKY/tsRFvv+hPit5hvVWq1zrnOHHTJ41H66EvnGN3+pj 5xbnGn5IPKBvBMkUptuSKFKeUcziCFnDwX6e+LokNKQLf6kO2FJpts1p5IfSjugxCJcr UvPw== X-Gm-Message-State: AOAM533ey+uJ2kOs32cKOmgYGJPMe3oHeOrfEdM12LGRp43sy1Vw/IgF iC2Q+YVx5z9vzJ5sdqngsCoiDw== X-Received: by 2002:a17:907:9709:b0:6fd:c0e1:c86b with SMTP id jg9-20020a170907970900b006fdc0e1c86bmr678989ejc.600.1654106742204; Wed, 01 Jun 2022 11:05:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c12-20020aa7d60c000000b0042be14040c1sm1335900edr.86.2022.06.01.11.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:38 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E49CA1FFBA; Wed, 1 Jun 2022 19:05:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Thomas Huth , =?utf-8?q?Alex_Be?= =?utf-8?q?nn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 02/33] .gitlab-ci.d/crossbuilds: Fix the dependency of the cross-i386-tci job Date: Wed, 1 Jun 2022 19:05:06 +0100 Message-Id: <20220601180537.2329566-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The cross-i386-tci job uses the fedora-i386-cross image, so we should make sure that the corresponding job that builds it (the i386-fedora-cross-container job) has finished before we start the TCI job. Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20220524092600.89997-1-thuth@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-3-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 17d6cb3e45..4a5fb6ea2a 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -62,6 +62,8 @@ cross-i386-user: cross-i386-tci: extends: .cross_accel_build_job timeout: 60m + needs: + job: i386-fedora-cross-container variables: IMAGE: fedora-i386-cross ACCEL: tcg-interpreter From patchwork Wed Jun 1 18:05:07 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: 577797 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp838906mab; Wed, 1 Jun 2022 11:06:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFjbs3w96YfmSUIyntyu0YQB2Jr4C7QHuDuWdGL/XnFD0T7S5JIdaSQX1cGExULXQM535J X-Received: by 2002:a05:620a:d8d:b0:6a6:e1c:1f21 with SMTP id q13-20020a05620a0d8d00b006a60e1c1f21mr608105qkl.430.1654106806912; Wed, 01 Jun 2022 11:06:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654106806; cv=none; d=google.com; s=arc-20160816; b=qMe9DQ0yv7WMVrOmB1pez3luH7JL3Dlxe5HaO1LM+ZX03u6OkQ36PuUSEphCJwLoTh qEli3Rrrymr7F9BHJKLJ3zo/ekfz1JXYGwEkACCHq8N9OnRORZWRWa/lpeUYpQ9v8bwB YrJWfXSvafFL8Vg+EEQJ86k+2EazN2yB0o2VNeoX6HeiJbZsX3ZigDD3vcS0uMyxgbe2 NJrJ4MPjou78RVgYV5b/0T1SGmspHojmC/9MZepqlIeZ2HYsHiYJ13yW3D7HU/yw7Oxe VrqpOD0hx3G4KAm4RMhUBjLNMARQPC3GEiob/he2L20tcpGY6h29V+rojggWIzOdgYp9 6soQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=pjpFLG6tHPamIBD0PW02KIyxp9DcV2gsGA9WnWVGoZg=; b=Wx/8EWorM3OumQGZo4u17EVMrioz709TkG1m33kSLCVxGfnf4b9Ro7On+nyDVQTVlI f7fIROR13yrCWgcPodbZN9XO4Hq0JbsWj6GTJISh5CFJQNEQWoeBcFI8CgK8KqIsxgdD j7qgcjIlNiyT2qOKOZ5PhsA5rG94gT+9XKIQB7FJPw1ppjNUoAA/HxZrvkJ0V42oMnkC BOQDVvyOcNmZw6OWF77RL54guOBoLGCOiFCAYalzS9wPvjS9ywYkvH9xF1j88VoBWs0l GCKriA1c+VHqFgPBsubPaPS0KBOqellL7eVhF2VhYYoCfHbGJaQYDa4CTNT1OxlnQSmN Yt6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Dqy0IHSj; 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=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 d3-20020a05621421c300b00466e2f312bbsi434305qvh.208.2022.06.01.11.06.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:06:46 -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=pass header.i=@linaro.org header.s=google header.b=Dqy0IHSj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSk2-0000vp-FK for patch@linaro.org; Wed, 01 Jun 2022 14:06:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSj5-0000r9-G5 for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:49 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:40881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSj3-0004wj-Ol for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:46 -0400 Received: by mail-ej1-x62d.google.com with SMTP id fu3so3885470ejc.7 for ; Wed, 01 Jun 2022 11:05:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pjpFLG6tHPamIBD0PW02KIyxp9DcV2gsGA9WnWVGoZg=; b=Dqy0IHSjG2PFgkVMP+ufKDtQjT5ePWVgoSw5dXP81OrvwmjMfQWoEo0NiEmGTPCncY iXlcY1wdbkrsCt64BDAcj7Egybz1Mwzg0AfKcLHhdviiWwqE7MlUqX5NCkUY1K60MigU vvTsfhDwREarrDwN+sI13EeBrZlOP1rKZqlBaxbjqcrsyvhmwUL81HtGs8QJfw7u7PwA ls55y1bKSt+6qm/aaQNYuY7Fy9yo/qf+E35nPe8ktk0iGb7uzqaVWjlB0BwrH7ldiqBw ELdi+ViM0HpHw8zzLYjYBVvoPTVeSZemGkUGBi3Fme5TG0lgIOU5/piL7GYloqqdrLUU Mwpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pjpFLG6tHPamIBD0PW02KIyxp9DcV2gsGA9WnWVGoZg=; b=AaVrYCE74ELCLKF1huAhhNJrIyBMjLnl2UOiNZSQjzmUpTFx59Umo9A/us6j46ThL6 X6ri6jJ+tRHdGkR1lf5ZRm6sTY0t0aWi1acJtJObpMHgEnYFGzqiubLClMpfyyLpLhbu WMFTfaHcAEo6HpbfEsLzww0+U71ZoO9N3ePmGNpQZeIZjJtAta/4UnmUvCMtZmybZd5a PNovBPXrphj+gvkwTU8Efflm+oG0CsvmWOLPYvnq71JWkIsuzqMWI9Tew6z5N4fSPOF7 iiLJ17YFhSEiWJS4Xdc+CbEmQNHq2aV7aVk5XUGshW7fIeYeYHMJPXX1m92DoBwGRYS0 851g== X-Gm-Message-State: AOAM5310xpgTMFC51ptaguK9WPvPzuDA4EwX70lTQDlI44AYqqRnXaEd e9KAteotTZWabEFtOaHn+0C1bw== X-Received: by 2002:a17:907:968e:b0:6f4:d80f:f0c3 with SMTP id hd14-20020a170907968e00b006f4d80ff0c3mr644804ejc.145.1654106744157; Wed, 01 Jun 2022 11:05:44 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id bk2-20020a170906b0c200b006fef557bb7asm936976ejb.80.2022.06.01.11.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 061931FFBB; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 03/33] gitlab-ci: add meson JUnit test result into report Date: Wed, 1 Jun 2022 19:05:07 +0100 Message-Id: <20220601180537.2329566-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau This allows the gitlab UI to show the test results in different ways, see doc: https://docs.gitlab.com/ee/ci/unit_test_reports.html#how-it-works Previous we only reports avocado test results (.avocado_test_job_template), with this change, the qemu/meson tests are also covered. Signed-off-by: Marc-André Lureau Message-Id: <20220525173411.612224-1-marcandre.lureau@redhat.com> [AJB: expand the commit description] Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220527153603.887929-4-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index dc6d67aacf..b381345dbc 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -44,6 +44,8 @@ expire_in: 7 days paths: - build/meson-logs/testlog.txt + reports: + junit: build/meson-logs/testlog.junit.xml .avocado_test_job_template: extends: .common_test_job_template From patchwork Wed Jun 1 18:05:08 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: 577802 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp841588mab; Wed, 1 Jun 2022 11:09:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqXA3COI7duG61mz4OhPO34+KvXFUcRUW856sNABsDRQmRnMB0UP+a/soJuqORdhzm6PGR X-Received: by 2002:a05:620a:e0f:b0:6a5:e7fb:5d74 with SMTP id y15-20020a05620a0e0f00b006a5e7fb5d74mr868969qkm.46.1654106983589; Wed, 01 Jun 2022 11:09:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654106983; cv=none; d=google.com; s=arc-20160816; b=imJnOH+h5bCuTY6yBZP68E8j6DaqT6xAh9GhoRnJIrLXB7tBMjFS3QIYKNyq1F+P1R RNh7cBrXenbHD9E6VEfjD1GLZibnH/QDqWZXBp7AaR4s8yZkHnViYfE8BTrQ6mrQA/WR fImgeagkNDsfFcNFXZDvdgMaG0X4DXLZOvPHplQBaFOR2A4m+N6HaQa1HmJs+BFAKaB3 AaSkAxApqQ6lnxI1BzEs6Xp3FNl/aO62j9poMFlVdtEk/5ZO/K25YXZWgXou0lwN/0Hl OsrDOSb9QWcgMfNBBOVGW1thaSP+9/pi2MJwUcSuXheATj0R7JUR2YZ2jIozWPFgjaEP pGEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=QBVk9BlGsjPeQ1A/asALKwEg/h8wn3ZSor/zRm2l0pY=; b=Y5LlWGzKrhnvZ30QuJVBwmmdBDUg4J2Bhcwf+4qySAF1eqhHc996V9m+GT/ioMmIwK ovkQLOtLg9B54QlHlssypv78IHd32wxCouFAGJeoaiM+DPzKh01wucDFj4md+nHYTM7y eKNhAolypnuSFjNhu0rb1aryx0KW5d0DBpYLD1HZWVr4KACqVPnc6PGg1LM8dGwZaMF9 krLh2EIYFCAahtE9wHxz/N7cOaWn3181q8tCE6g9cxrtjP30u8cnL+Q2aCBg0KDht7TQ LME2cUZCqOodpENoxbyRZxhpwEah3MmtR6yZHGcMD91KEhDOZpgHCUqteXKP+C4q+5kS zq9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kboRYuQn; 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=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 h9-20020ac85e09000000b002f391d4e5dcsi1209846qtx.362.2022.06.01.11.09.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:09:43 -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=pass header.i=@linaro.org header.s=google header.b=kboRYuQn; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSmt-0006pq-5i for patch@linaro.org; Wed, 01 Jun 2022 14:09:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSj6-0000rx-UH for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:51 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:40888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSj5-0004x0-Cx for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:48 -0400 Received: by mail-ej1-x634.google.com with SMTP id fu3so3885613ejc.7 for ; Wed, 01 Jun 2022 11:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QBVk9BlGsjPeQ1A/asALKwEg/h8wn3ZSor/zRm2l0pY=; b=kboRYuQnFLkWTTKJy91wyaYCKhHv68Avme1dv/ZSG1RnYjJmzN53PQh5vBbjjGn1X4 A/ksk4I/FmNoO8zoG0dZVDejp6Wosx2+736/vLNV3ZwNjkUkV/WjFUGRYPxTIGr3z/bW v4QVBOwOaK9qSCKxibvsfj66pdDHnq8xnJ++VQQWyrDjdRVFBIPG4BdVvAnLkjnZUkzx xukBaqv4CXiCd6uUmAobNBjPBdR66/OuSJe/MItuKrIjWx2l8F9wRNUXfvwatz9nCdxd r4EFsSUBo/dRozNTBMjlb7lDDEcG5w6vzBTR/VKKi6rSFxNplS+H+/XARaUGs+/Fp1JI 4u2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QBVk9BlGsjPeQ1A/asALKwEg/h8wn3ZSor/zRm2l0pY=; b=Yz0SS9/gRb2FhFyzDpEz2hqFq0WgqH74eUQ1LB2Im9x5ovATgkxu+1S8JmSWMQiOox 0xY1jmn+h0YTxb8NKgC0/s9gHLGJHklfbIVbFA/Qu4YAp688uZ58/O3gHYN/872o34Em 8Kr6pcSD+0v5EWdQmTlxIVFAjHa3KgSOgLgS8jrL6KXKBXt65394zH4pU8e+z7Y0V9it Sfa4dartihiUV5V6/wV9oBt+aGiLL56npJnbseimuu+fQCBGt1Va1Hn2tQBbNDPyB7Fe XBlgRXwfaHliOZprrAWHIwXGqFK+7Tqy1eJfpeVZsQir5+4Hva/3nH2lzTrk/MEwHZIE HkGg== X-Gm-Message-State: AOAM532ktDyg9SMMPlPviJTL9T+UUiOXsTokWmL5prXTiPHokwZus7Vi SnjSkuKkGVMbJr7wuQEO40JaIHvD8gzgxw== X-Received: by 2002:a17:907:6e88:b0:707:ea6b:5e15 with SMTP id sh8-20020a1709076e8800b00707ea6b5e15mr680117ejc.57.1654106745671; Wed, 01 Jun 2022 11:05:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f3-20020a056402150300b0042dd3bf1403sm1271778edw.54.2022.06.01.11.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1CE711FFBC; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 04/33] meson.build: fix summary display of test compilers Date: Wed, 1 Jun 2022 19:05:08 +0100 Message-Id: <20220601180537.2329566-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The recent refactoring of configure.sh dropped a number of variables we relied on for printing out information. Make it simpler. Fixes: eebf199c09 (tests/tcg: invoke Makefile.target directly from QEMU's makefile) Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220527153603.887929-5-alex.bennee@linaro.org> diff --git a/meson.build b/meson.build index bf318d9cbb..bc6234c85e 100644 --- a/meson.build +++ b/meson.build @@ -3735,12 +3735,8 @@ foreach target: target_dirs config_cross_tcg = keyval.load(tcg_mak) target = config_cross_tcg['TARGET_NAME'] compiler = '' - if 'DOCKER_CROSS_CC_GUEST' in config_cross_tcg - summary_info += {target + ' tests': config_cross_tcg['DOCKER_CROSS_CC_GUEST'] + - ' via ' + config_cross_tcg['DOCKER_IMAGE']} - elif 'CROSS_CC_GUEST' in config_cross_tcg - summary_info += {target + ' tests' - : config_cross_tcg['CROSS_CC_GUEST'] } + if 'CC' in config_cross_tcg + summary_info += {target + ' tests': config_cross_tcg['CC']} endif endif endforeach From patchwork Wed Jun 1 18:05:09 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: 577805 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp844277mab; Wed, 1 Jun 2022 11:12:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeddXQLHnmRUXt9BnS3SfOmLYQnJVkHqyWqLthQRwAoqba6Ioaqb4kg9CKTEezt/3NOCIq X-Received: by 2002:ac8:5ac2:0:b0:304:c980:7d76 with SMTP id d2-20020ac85ac2000000b00304c9807d76mr834978qtd.454.1654107165151; Wed, 01 Jun 2022 11:12:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107165; cv=none; d=google.com; s=arc-20160816; b=o0a2w24AmlYPPgxvX4ZN0BmkrCOrbpt7nHe0BCvyGyw8iP8IG54yxAmkS8OJ0xnOWO btqpk607Wh8DNVB+OqxbL5+8FBok8k87F6OxwSAnmKa4kfP75uluWSU2cqVt7DikESVb 6IGHz2Ea/cC5M5CYo/PeQMuDpEjDZK8xbsmqtu0jlJUWJORjKFXy3127Dq6nPfEgZcci PkmSYCuaIug7W5WR44pGjeq8jL1pVqsWeC3gIv1QOnYMSIiS6+3gIUX9DussCpn7oleQ g0gsJGCTrvxxCHbKMlpl7Tnn04GRLK2j7EFHDg5sZcyfE6UhELVFTYJEEGHEUYsqJ0Kr bj6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=dZ0spaXG+ECaVxLrM14GTRx0o1J90lFydwVZMShPTl0=; b=LsIOXX4veQKyWZI5VCz6/srGEAyZdJY/Ftw4dXiMQ2Fzqq7fVlioYSj7wahM/eLIyB G/S01C9SumzSI3DAuQN1zMMQDH7OMXAdziGD4Yga/A9vWMnh7w5dLjGgh2gwSHNB8HQb BEaAhFxf5ejEpeq8znOMmJmyGz8mMI/XVQJNuey+ZDIlYJHucQJbxBni0TqH5W6ESJh1 cBFF/fXuAh4gZ3I98sFpABgHnhDmPmDuuRdId0VACpluWYjYEgQ+wbtmd+GH8Qus6LQk 03iI/IWgusLWiSc34nj9MYSmZj8txyqGrTuD8ekHjAPTr/PRaxI1hUtuDXv9syczaPHy 3uXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H+O8yZKm; 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=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 t6-20020ac85886000000b002f3d2f3fb79si1376678qta.18.2022.06.01.11.12.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:12:45 -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=pass header.i=@linaro.org header.s=google header.b=H+O8yZKm; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSpo-00048W-O3 for patch@linaro.org; Wed, 01 Jun 2022 14:12:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjD-0000sr-59 for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:55 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:33585) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSj7-0004xW-No for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:53 -0400 Received: by mail-ed1-x52c.google.com with SMTP id h19so3311435edj.0 for ; Wed, 01 Jun 2022 11:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dZ0spaXG+ECaVxLrM14GTRx0o1J90lFydwVZMShPTl0=; b=H+O8yZKm80Z4TnIklJ2QAyS4RTu/o0TZ84RTMOBMk2lV9nbTHoaBXASylFTfBg/dSs zqX540B1cq48kuwlOl4tYsq+W8O2EIeLl3GuAdLEMK9S5odCabPD5iiDYQEYDbJ50h9U f1nUUvyuWUmlVrP4mjjeup7Pl4e4VhI4jEubFNGkBN+QnTm/h03GBBgY2Eu4b7hJCLi4 0YlYo73hycZqbVVzIqNQ1c8AOvcVR5v+OaGiq4aTU1/D5mWhcd4mrdp/QET06YPipq7+ ew69zZAP+3O9pPTmAl3BqLvCN6iXDWbA9MbS/VGYvyeqER5Wsrm2pg53FvnSfreZWdVB ohqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dZ0spaXG+ECaVxLrM14GTRx0o1J90lFydwVZMShPTl0=; b=Da+aJ/nXkadWLSirb9bnfTMu1DrFKm5k7sWH/pgVQxt4amcQOpvEy97uc9JANTWZpM jXnkrzYjeH4HRUoHuCy4Fr6i+tjFbwZ3LWJBNCHB750xC/UPMiL0Qd0jmP6u6/hUku6s 6j/9L5Y/HYRs1mOKeqmnajTrDyxcgzSsRjUja1sOZfEGjrSMihc20hq7qD306K3rk83q lVrE2f6Cnh4dFs+LBR1edVn9Ytpv5A/u1J4KegDXmpSuEqHmsg94Z295bvVdb6/9S8gN ZbK3NXIk7pVr2UhdPM9sDoOanajC5wpODUoxzFsl5odbzrjvrCD7cWkjnRj8b/kj99qF pXaQ== X-Gm-Message-State: AOAM533MZnQV3ktePY9DJFGo/67I+4h+IgoDf/54OOqLmGarAH32wnCw kX3nH+5w6LxcWQR9fC9CVsUiig== X-Received: by 2002:a05:6402:2750:b0:42b:2616:7cdb with SMTP id z16-20020a056402275000b0042b26167cdbmr1067753edd.306.1654106748337; Wed, 01 Jun 2022 11:05:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y12-20020a17090629cc00b006fe0abb00f0sm920453eje.209.2022.06.01.11.05.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 33C0F1FFBD; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 05/33] tests/lcitool: fix up indentation to correct style Date: Wed, 1 Jun 2022 19:05:09 +0100 Message-Id: <20220601180537.2329566-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 3 space indentation snuck into the initial commit. Clean it up before we let it get established. I've also: - removed unused os import - added double lines between functions - added some comments and grouped and sorted the generation stanzas My lint tool is also recommending using f-strings but that requires python 3.6. Signed-off-by: Alex Bennée Cc: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Message-Id: <20220527153603.887929-6-alex.bennee@linaro.org> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index fb49bbc441..dc1fc21ef9 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -13,14 +13,13 @@ # the top-level directory. import sys -import os import subprocess from pathlib import Path if len(sys.argv) != 1: - print("syntax: %s" % sys.argv[0], file=sys.stderr) - sys.exit(1) + print("syntax: %s" % sys.argv[0], file=sys.stderr) + sys.exit(1) self_dir = Path(__file__).parent src_dir = self_dir.parent.parent @@ -30,76 +29,95 @@ lcitool_path = Path(self_dir, "libvirt-ci", "lcitool") lcitool_cmd = [lcitool_path, "--data-dir", self_dir] + def atomic_write(filename, content): - tmp = filename.with_suffix(filename.suffix + ".tmp") - try: - with tmp.open("w") as fp: - print(content, file=fp, end="") - tmp.rename(filename) - except Exception as ex: - tmp.unlink() - raise + tmp = filename.with_suffix(filename.suffix + ".tmp") + try: + with tmp.open("w") as fp: + print(content, file=fp, end="") + tmp.rename(filename) + except Exception as ex: + tmp.unlink() + raise + def generate(filename, cmd, trailer): - print("Generate %s" % filename) - lcitool=subprocess.run(cmd, capture_output=True) + print("Generate %s" % filename) + lcitool = subprocess.run(cmd, capture_output=True) - if lcitool.returncode != 0: - raise Exception("Failed to generate %s: %s" % (filename, lcitool.stderr)) + if lcitool.returncode != 0: + raise Exception("Failed to generate %s: %s" % (filename, lcitool.stderr)) + + content = lcitool.stdout.decode("utf8") + if trailer is not None: + content += trailer + atomic_write(filename, content) - content = lcitool.stdout.decode("utf8") - if trailer is not None: - content += trailer - atomic_write(filename, content) def generate_dockerfile(host, target, cross=None, trailer=None): - filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker") - cmd = lcitool_cmd + ["dockerfile"] - if cross is not None: - cmd.extend(["--cross", cross]) - cmd.extend([target, "qemu"]) - generate(filename, cmd, trailer) + filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker") + cmd = lcitool_cmd + ["dockerfile"] + if cross is not None: + cmd.extend(["--cross", cross]) + cmd.extend([target, "qemu"]) + generate(filename, cmd, trailer) + def generate_cirrus(target, trailer=None): - filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") - cmd = lcitool_cmd + ["variables", target, "qemu"] - generate(filename, cmd, trailer) + filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") + cmd = lcitool_cmd + ["variables", target, "qemu"] + generate(filename, cmd, trailer) + ubuntu2004_tsanhack = [ - "# Apply patch https://reviews.llvm.org/D75820\n", - "# This is required for TSan in clang-10 to compile with QEMU.\n", - "RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h\n" + "# Apply patch https://reviews.llvm.org/D75820\n", + "# This is required for TSan in clang-10 to compile with QEMU.\n", + "RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h\n" ] + def debian_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]) + conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix) + targets = "ENV DEF_TARGET_LIST %s\n" % (targets) + return "".join([conf, targets]) +# +# Update all the various build configurations. +# Please keep each group sorted alphabetically for easy reading. +# try: - generate_dockerfile("centos8", "centos-stream-8") - generate_dockerfile("fedora", "fedora-35") - generate_dockerfile("ubuntu2004", "ubuntu-2004", - trailer="".join(ubuntu2004_tsanhack)) - generate_dockerfile("opensuse-leap", "opensuse-leap-152") - generate_dockerfile("alpine", "alpine-edge") - - generate_dockerfile("debian-arm64-cross", "debian-11", - cross="aarch64", - trailer=debian_cross_build("aarch64-linux-gnu-", - "aarch64-softmmu,aarch64-linux-user")) - - generate_dockerfile("debian-s390x-cross", "debian-11", - cross="s390x", - trailer=debian_cross_build("s390x-linux-gnu-", - "s390x-softmmu,s390x-linux-user")) - - generate_cirrus("freebsd-12") - generate_cirrus("freebsd-13") - generate_cirrus("macos-11") - - sys.exit(0) + # + # Standard native builds + # + generate_dockerfile("alpine", "alpine-edge") + generate_dockerfile("centos8", "centos-stream-8") + generate_dockerfile("fedora", "fedora-35") + generate_dockerfile("opensuse-leap", "opensuse-leap-152") + generate_dockerfile("ubuntu2004", "ubuntu-2004", + trailer="".join(ubuntu2004_tsanhack)) + + # + # Cross compiling builds + # + generate_dockerfile("debian-arm64-cross", "debian-11", + cross="aarch64", + trailer=debian_cross_build("aarch64-linux-gnu-", + "aarch64-softmmu,aarch64-linux-user")) + + generate_dockerfile("debian-s390x-cross", "debian-11", + cross="s390x", + trailer=debian_cross_build("s390x-linux-gnu-", + "s390x-softmmu,s390x-linux-user")) + + # + # Cirrus packages lists for GitLab + # + generate_cirrus("freebsd-12") + generate_cirrus("freebsd-13") + generate_cirrus("macos-11") + + sys.exit(0) except Exception as ex: - print(str(ex), file=sys.stderr) - sys.exit(1) + print(str(ex), file=sys.stderr) + sys.exit(1) From patchwork Wed Jun 1 18:05:10 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: 577801 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp841574mab; Wed, 1 Jun 2022 11:09:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyR4e95S31oTjIsFF0VlEdlqvfMrlqbmCDfS8Cg0i5o4G5UyrpWRCUp+I9ob8aqWvh3jnI X-Received: by 2002:a05:622a:310:b0:2f3:da5f:337a with SMTP id q16-20020a05622a031000b002f3da5f337amr846036qtw.562.1654106982653; Wed, 01 Jun 2022 11:09:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654106982; cv=none; d=google.com; s=arc-20160816; b=C7FpRcdl+9+UGFUPtzhbJT1Dexr+B+Ng1C0+eX1QKsurQgCvVUGrVHN5Q6vQXY+Efy h7FzToCo7B+Ry7Slaow9n2cTD9bnFM684M5Z3tsxImhzW1Wpwi3Y90rGE54gt+gLVuXf 2nMJf2Rf28zLCNCvYnbP08H2Ko/imeOL2ZSA5+WouKGf0W/2xaIlq79PpvQ07096qAqM eJKkMm7GGW23uHG4WCM4uesEyIo8ZYvLmhnRF6QkRcimyiVpO7692KeZXD78g6Afd6SO 106vsTVHGbNpIDGUpMIGh4QOmV6E7q1kmi7qq4Fc8QxWms8bI9o/i4ivciN/GalBY4oQ AKmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=lQ0e939MO+IsOcIGdZgx+oYWWPC+iEjbM9XxZeVIT50=; b=J+YwxcHsdPa9fm6nEpKREAK+NXhl6KGB4HaoR8f5zMJbYnk3MNI8bxUlrHyD03nVKx wnc5o/naxpKrCvC4dMwdf2AGhciCDws/fhs/uMplzgTNhWmewNFiay0hwsAjFVSBb+jt Um13cc5BDLm9xhipLEQ/5kHcJ171xrE2XjlKfm5Qgjon5mkscgXoizIrgtskJvZh5P8d Q92hexyatuCNYzLbrBgSMPVX5bxY9YD+LNyeniIRdP6abtfviyBI+lz4ebB6fiWIqmko O3uoZcANqWN2GNqrNuWF4iKugg7lTQLF2ON72VlJqifgRD1dgChKit5LEShEQ74uYR+k Fcug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AIoMPdvz; 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=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 x189-20020a3763c6000000b00680ffd297b2si1301119qkb.89.2022.06.01.11.09.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:09:42 -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=pass header.i=@linaro.org header.s=google header.b=AIoMPdvz; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSms-0006hb-7A for patch@linaro.org; Wed, 01 Jun 2022 14:09:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjA-0000sS-Bf for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:53 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:39646) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSj5-0004x9-Vd for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:49 -0400 Received: by mail-ed1-x535.google.com with SMTP id v25so3267441eda.6 for ; Wed, 01 Jun 2022 11:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lQ0e939MO+IsOcIGdZgx+oYWWPC+iEjbM9XxZeVIT50=; b=AIoMPdvzsnx3BRLLGaolXjCANGmWkQLeYnccAK7C0BRjlCt4556KpJTp7CG5Jq6Z8Z zUdEVo0UP+Mh3D8ahQ9qC4yu6lIkmYPXvUUqeegW8y4luhDP6z0fB1mmaMnvUxvOy/6x XC2OIuIKJz4fUEb1jOvpRggseXiLz8a1vesB69QHC3UV4+9/dQbYoSzDMdHOzocjiCuq 2FAsBdLoRTWPWYjZ4rg+9K1hrpwOUTBL8/MFKtgor/y1gw6y3wQteW8LrhmwQw1C7pjI uSqnrtQMug5tB9sz71nRJf96Zk3k4jVRTIsTsF+ZoITZbObJrRQjSKDAjSqh+4pXoE1u AEqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lQ0e939MO+IsOcIGdZgx+oYWWPC+iEjbM9XxZeVIT50=; b=iMxuuJPghP8/CqV/RRJkdXNGnPR/wbVdB8D33lEZCu34CFLruTEyNjheGFw/WsDD9o JzfPk/SddAGLioMrQBLIyuARRXOgIbO9ZOf+idlggyOmyAxZxsYcksyoXTfDHCyblwWi 1nPjL8Su+Jg/du5DR0Jnr90V6z1fn7Fnz8gjRk2XLkDMsecw5L97+NOTemfgflvcOovN zl2kzKOv4AUwWUkAYuqcfTyGSWoWDwcdhiON6DEVfqh9FTZK+VKBf5o48hV+ZQV+0ZU9 GL0zfI0Djf8p0PcQXFwgGk4aMmv1bCAnQATmXtAR7sqSKtBNVhhLzi6DQXuf/vgthqIO mrGw== X-Gm-Message-State: AOAM533g5JwxU6Ultt3yCWBArw4ucMcVXcQxyMfQwA/uRs5YV1aP5uM6 A/aoBqZYUqV70LY+BZAfscAbDg== X-Received: by 2002:aa7:c852:0:b0:42d:70d8:2864 with SMTP id g18-20020aa7c852000000b0042d70d82864mr1018508edt.379.1654106746594; Wed, 01 Jun 2022 11:05:46 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f3-20020a056402150300b0042dd3bf1403sm1271800edw.54.2022.06.01.11.05.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 47F451FFBE; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 06/33] tests/docker: update debian-armhf-cross with lcitool Date: Wed, 1 Jun 2022 19:05:10 +0100 Message-Id: <20220601180537.2329566-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x535.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use lcitool to update debian-armhf-cross to a Debian 11 based system. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Message-Id: <20220527153603.887929-7-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index ac15fce9b6..4d1830f3fc 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -34,8 +34,7 @@ armel-debian-cross-container: armhf-debian-cross-container: extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] + stage: containers variables: NAME: debian-armhf-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ca2157db46..d6e0710554 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -90,7 +90,6 @@ endif docker-image-debian-alpha-cross: docker-image-debian10 docker-image-debian-armel-cross: docker-image-debian10 -docker-image-debian-armhf-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index 25d7618833..a2ebce96f8 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -1,29 +1,165 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker armhf cross-compiler target +# $ lcitool dockerfile --layers all --cross armv7l debian-11 qemu # -# This docker target builds on the debian Stretch base image. -# -FROM qemu/debian10 +# https://gitlab.com/libvirt/libvirt-ci -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture armhf -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - crossbuild-essential-armhf -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a armhf --arch-only qemu +FROM docker.io/library/debian:11-slim -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabihf- -ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user,armeb-linux-user +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - libbz2-dev:armhf \ - liblzo2-dev:armhf \ - librdmacm-dev:armhf \ - libsnappy-dev:armhf \ - libxen-dev:armhf +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture armhf && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-arm-linux-gnueabihf \ + gcc-arm-linux-gnueabihf \ + libaio-dev:armhf \ + libasan5:armhf \ + libasound2-dev:armhf \ + libattr1-dev:armhf \ + libbpf-dev:armhf \ + libbrlapi-dev:armhf \ + libbz2-dev:armhf \ + libc6-dev:armhf \ + libcacard-dev:armhf \ + libcap-ng-dev:armhf \ + libcapstone-dev:armhf \ + libcurl4-gnutls-dev:armhf \ + libdaxctl-dev:armhf \ + libdrm-dev:armhf \ + libepoxy-dev:armhf \ + libfdt-dev:armhf \ + libffi-dev:armhf \ + libfuse3-dev:armhf \ + libgbm-dev:armhf \ + libgcrypt20-dev:armhf \ + libglib2.0-dev:armhf \ + libglusterfs-dev:armhf \ + libgnutls28-dev:armhf \ + libgtk-3-dev:armhf \ + libibumad-dev:armhf \ + libibverbs-dev:armhf \ + libiscsi-dev:armhf \ + libjemalloc-dev:armhf \ + libjpeg62-turbo-dev:armhf \ + liblttng-ust-dev:armhf \ + liblzo2-dev:armhf \ + libncursesw5-dev:armhf \ + libnfs-dev:armhf \ + libnuma-dev:armhf \ + libpam0g-dev:armhf \ + libpixman-1-dev:armhf \ + libpng-dev:armhf \ + libpulse-dev:armhf \ + librbd-dev:armhf \ + librdmacm-dev:armhf \ + libsasl2-dev:armhf \ + libsdl2-dev:armhf \ + libsdl2-image-dev:armhf \ + libseccomp-dev:armhf \ + libselinux1-dev:armhf \ + libslirp-dev:armhf \ + libsnappy-dev:armhf \ + libspice-server-dev:armhf \ + libssh-gcrypt-dev:armhf \ + libsystemd-dev:armhf \ + libtasn1-6-dev:armhf \ + libubsan1:armhf \ + libudev-dev:armhf \ + liburing-dev:armhf \ + libusb-1.0-0-dev:armhf \ + libusbredirhost-dev:armhf \ + libvdeplug-dev:armhf \ + libvirglrenderer-dev:armhf \ + libvte-2.91-dev:armhf \ + libxen-dev:armhf \ + libzstd-dev:armhf \ + nettle-dev:armhf \ + systemtap-sdt-dev:armhf \ + xfslibs-dev:armhf \ + zlib1g-dev:armhf && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + echo "[binaries]\n\ +c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\ +ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ +strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\ +pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'arm'\n\ +cpu = 'armhf'\n\ +endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc + +ENV ABI "arm-linux-gnueabihf" +ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf" +ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabihf- +ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index dc1fc21ef9..7e4a92f630 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -105,6 +105,11 @@ try: trailer=debian_cross_build("aarch64-linux-gnu-", "aarch64-softmmu,aarch64-linux-user")) + generate_dockerfile("debian-armhf-cross", "debian-11", + cross="armv7l", + trailer=debian_cross_build("arm-linux-gnueabihf-", + "arm-softmmu,arm-linux-user")) + generate_dockerfile("debian-s390x-cross", "debian-11", cross="s390x", trailer=debian_cross_build("s390x-linux-gnu-", From patchwork Wed Jun 1 18:05:11 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: 577806 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp844909mab; Wed, 1 Jun 2022 11:13:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNNyCRShLSubGivrp8M/pQIGWDkaggrf1qUg+xWkgAb6AuBlLXsYr2EfwHWh4HNPYkCiS+ X-Received: by 2002:a05:622a:1897:b0:304:b655:b755 with SMTP id v23-20020a05622a189700b00304b655b755mr812859qtc.207.1654107214748; Wed, 01 Jun 2022 11:13:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107214; cv=none; d=google.com; s=arc-20160816; b=LWb/v9iWU20Y5hAvvyOxFR4wIihvfJntm7qBBCCktd7tNV35CvYniy5KJsmdOXf7xV va/1vgALzoZEjUm8gT+7MV/6KbxfD0ogahaQ1d4VZELU0hAhNjypRw1CGIqSsJCfJoPf 4zQZz5dcFlp8rNN/pmSBCx0koNo/hdcYTpK/0EDLH+tTxIE7quzwcEpA3RFWBPud1Z/b ViqaKBamr1tlNMxlNEiGez4mK7hEaOa+0ws7IKbIj4pF/ipBh5scsz9HVmQ2vBk+NGOW WkCZLBB08SvmkrzyRH60XpuQQFQhnBqSVfqD7Mc5Nc5UYan0rFUq+rslfefXH5aJ5wYo 0A8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=ZyKcVCyKIbo0iLUDwlLoEz33jmfirAoDfOqiwXKavNk=; b=sbjcIN84szCo3gg7t99iEX1n5ugD53N49Z1yGW/IkdDrP4hpxxeUhgUYG2iyDVbXUc cUhTvj+vwM587nEt7LKSGB1L4e72IYV3pjcG77FTa5xMULmizNjtFfZYI99bJdqs2sh9 tZhE5+4H7A2J81SZpENCWFxNuonGmnA2sPrpfY81xUcPw7LCktUR2RyXPyVfYGcHqkQS ySY2FZ77MfMITul9XY6HXlvOmWykx9G/iTeuqIQua29UcBKm1nrK//Gwn+64jNldIvUV QyXqmT955LA6ccOKUMQffFOw4UYnUaeGT9Uak5YW+PI1vZxF3zGVpnMRETAWjLkPFpoJ SVHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=T0IKBuZq; 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=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 s6-20020a05620a29c600b006a06ffefacasi1527878qkp.522.2022.06.01.11.13.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:13:34 -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=pass header.i=@linaro.org header.s=google header.b=T0IKBuZq; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSqc-0006Cw-BE for patch@linaro.org; Wed, 01 Jun 2022 14:13:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjD-0000ss-60 for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:55 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:33589) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSjA-0004xf-4E for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:54 -0400 Received: by mail-ed1-x530.google.com with SMTP id h19so3311480edj.0 for ; Wed, 01 Jun 2022 11:05:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZyKcVCyKIbo0iLUDwlLoEz33jmfirAoDfOqiwXKavNk=; b=T0IKBuZqAGsz5DeWHk5asziAD2lXcT5lfrLixaIvx1c67nrj4VsLNXdsLUr4GImYq/ T6Io7y6T37PqCzMsLQUPghGdheQUqRsBqFwXjxa5jShWZw/Ldsd//6KUH+glPeNBaUpz W9x1Exbp2ocYsBHcOBxF191oWUb77vEusaX1/eO60OZtaJwbw38NPHd/Dmrisr5mH/E1 njxk77xaZn6aLeAekbJdekEPkcePrlTF9jGLe3QHOkOcMdGmlYhNBTMEedoc/cYIIQIJ LYGAA076+4H2eWW3xj3DuKUeYaK1eaUTKSGh+okfaVmPz4EfwpQ0gLJ2DFsWBYXodKXn QviQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZyKcVCyKIbo0iLUDwlLoEz33jmfirAoDfOqiwXKavNk=; b=YLfMHWFHF/JC49LYqrLpL/vXzJIDLZrNfqZfTSzqk9l/Wx8hs5M0fmmLYkDp8mHgS4 n2ajnIrHzg7FOYnd/mbeEr4/InMTyQvgVewVhSJvlvOfzqIBNkLX8QHC7p8jqSiAecl1 RblRNrrxwi87xrjgzL8th5wDUNm7gJhfoD3P2ftwLGdeqSyYrIvvqtHzJF2nqcHv2rFp Db8qaNLJpvbhrargm3Z11lVhfY6a3YcvQf3at83KDQiQLBr8bd3mOfxU7gUXYWu6UYSA UI+pprIdhBfYpN2CQCMI8MUp2W2Bix2lv/ToBBWRZfUplvsUQvwBT3/w+m9L3uF/9jkn aoPw== X-Gm-Message-State: AOAM532f1ipzuSgHuXtE55yy9v55+eGpB0XgjgyEskbx/Spvdnsdjgbi LMEqyWYxTDxJHXK8pmMRpi9qVg== X-Received: by 2002:aa7:d052:0:b0:42d:d114:43f7 with SMTP id n18-20020aa7d052000000b0042dd11443f7mr1028078edo.320.1654106749342; Wed, 01 Jun 2022 11:05:49 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id eg13-20020a056402288d00b0042dce73168csm1345898edb.13.2022.06.01.11.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 679181FFBF; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 07/33] tests/docker: update debian-armel-cross with lcitool Date: Wed, 1 Jun 2022 19:05:11 +0100 Message-Id: <20220601180537.2329566-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use lcitool to update debian-armel-cross to a Debian 11 based system. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Message-Id: <20220527153603.887929-8-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 4d1830f3fc..caef7decf4 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -27,8 +27,7 @@ arm64-debian-cross-container: armel-debian-cross-container: extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] + stage: containers variables: NAME: debian-armel-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index d6e0710554..d9109bcc77 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora endif docker-image-debian-alpha-cross: docker-image-debian10 -docker-image-debian-armel-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index b7b1a3585f..a6153e5a83 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -1,26 +1,164 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker armel cross-compiler target +# $ lcitool dockerfile --layers all --cross armv6l debian-11 qemu # -# This docker target builds on the debian Stretch base image. -# -FROM qemu/debian10 -MAINTAINER Philippe Mathieu-Daudé +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture armel && \ - apt update && \ - apt install -yy crossbuild-essential-armel && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a armel --arch-only qemu +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -# Specify the cross prefix for this image (see tests/docker/common.rc) +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture armel && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-arm-linux-gnueabi \ + gcc-arm-linux-gnueabi \ + libaio-dev:armel \ + libasan5:armel \ + libasound2-dev:armel \ + libattr1-dev:armel \ + libbpf-dev:armel \ + libbrlapi-dev:armel \ + libbz2-dev:armel \ + libc6-dev:armel \ + libcacard-dev:armel \ + libcap-ng-dev:armel \ + libcapstone-dev:armel \ + libcurl4-gnutls-dev:armel \ + libdaxctl-dev:armel \ + libdrm-dev:armel \ + libepoxy-dev:armel \ + libfdt-dev:armel \ + libffi-dev:armel \ + libfuse3-dev:armel \ + libgbm-dev:armel \ + libgcrypt20-dev:armel \ + libglib2.0-dev:armel \ + libglusterfs-dev:armel \ + libgnutls28-dev:armel \ + libgtk-3-dev:armel \ + libibumad-dev:armel \ + libibverbs-dev:armel \ + libiscsi-dev:armel \ + libjemalloc-dev:armel \ + libjpeg62-turbo-dev:armel \ + liblttng-ust-dev:armel \ + liblzo2-dev:armel \ + libncursesw5-dev:armel \ + libnfs-dev:armel \ + libnuma-dev:armel \ + libpam0g-dev:armel \ + libpixman-1-dev:armel \ + libpng-dev:armel \ + libpulse-dev:armel \ + librbd-dev:armel \ + librdmacm-dev:armel \ + libsasl2-dev:armel \ + libsdl2-dev:armel \ + libsdl2-image-dev:armel \ + libseccomp-dev:armel \ + libselinux1-dev:armel \ + libslirp-dev:armel \ + libsnappy-dev:armel \ + libspice-server-dev:armel \ + libssh-gcrypt-dev:armel \ + libsystemd-dev:armel \ + libtasn1-6-dev:armel \ + libubsan1:armel \ + libudev-dev:armel \ + liburing-dev:armel \ + libusb-1.0-0-dev:armel \ + libusbredirhost-dev:armel \ + libvdeplug-dev:armel \ + libvirglrenderer-dev:armel \ + libvte-2.91-dev:armel \ + libzstd-dev:armel \ + nettle-dev:armel \ + systemtap-sdt-dev:armel \ + xfslibs-dev:armel \ + zlib1g-dev:armel && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + echo "[binaries]\n\ +c = '/usr/bin/arm-linux-gnueabi-gcc'\n\ +ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ +strip = '/usr/bin/arm-linux-gnueabi-strip'\n\ +pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'arm'\n\ +cpu = 'arm'\n\ +endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc + +ENV ABI "arm-linux-gnueabi" +ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabi- ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user,armeb-linux-user - -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - libbz2-dev:armel \ - liblzo2-dev:armel \ - librdmacm-dev:armel \ - libsnappy-dev:armel diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 7e4a92f630..4dc5527234 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -105,6 +105,11 @@ try: trailer=debian_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")) + generate_dockerfile("debian-armhf-cross", "debian-11", cross="armv7l", trailer=debian_cross_build("arm-linux-gnueabihf-", From patchwork Wed Jun 1 18:05:12 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: 577804 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp844208mab; Wed, 1 Jun 2022 11:12:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweHLdsd5P1PniSn8X+gllRc4kqSzCVWwnBlhvuXUHu/G5iiY2pLHd3JuZaQkK51q+e+fH1 X-Received: by 2002:a05:6214:1ccf:b0:461:b48b:29e4 with SMTP id g15-20020a0562141ccf00b00461b48b29e4mr56227691qvd.5.1654107161181; Wed, 01 Jun 2022 11:12:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107161; cv=none; d=google.com; s=arc-20160816; b=fr4m1sZBAzY3yxvhjfBwQqqf3pGQoG4jgu7riVEOPHV+qQeJ4pNI1GokB+ziO7dsFU i5Www0p+TXqxl74GNXsLANR5f/pTIhbR1qZvB/PAoLAYQ16qHNKaBaubE/dM0Wov7nDk eqwos92WuC+ZIyQW7ivTqpFHfiX3Y9GG2dpmXX6ugCoCnExIdX0oUIJaejcsnezAw6T+ f9tWcZfZOR9tlXA7v9eFvx45MLND141H8V1sR8sp/O9qQ4vvQtz4NNy+WvtGVsYR3Qfa C+TfewG2I7iDXXeyNAfO3OwieuXxFAaVn+mqCoib6UWK+TsfPt0ERfPrYHarZ8exT/qQ rUkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=Ecc3mXE6mp8N/4GPnB4052TSKmG288rQCUrww9LGKCw=; b=W1MFP8NPt/cIS6ZQ6xoX97Aw7nZynEyGCLDytH9g2fDbm7kDmSWNBcFYpVjae/4aOC E5+AuY5jf4dR7+IUuOxa3znxTUul5U4+zf8QUu5RxFn+1fD23BA8CKxTS2ep5U83iI3E R270QCNXjUrD784nFQvwkEB2BObRmgnsaLQfd+r7SiCBjFGTILeKdI4SI6BUyOqKBXWZ I8C24M+Kaq0MbgzMCFSiPbw/YPQ0afTn9av2M/IDboh5no8GSo+2K5+0v/WnG1uFxkqi fDiXn2WNxYfJGOZF4zWkx8tYkcXygU/HAuJVNXRWFuQgi5ISJdGgMWt8kpKtO+6p3XAI TTaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="pUp7NmB/"; 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=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 kd15-20020a056214400f00b004622cb17069si1066545qvb.286.2022.06.01.11.12.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:12: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=pass header.i=@linaro.org header.s=google header.b="pUp7NmB/"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSpk-0003zy-MF for patch@linaro.org; Wed, 01 Jun 2022 14:12:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjG-00010h-0h for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:58 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:34728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSjD-0004yF-ML for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:57 -0400 Received: by mail-ej1-x62a.google.com with SMTP id q21so5405098ejm.1 for ; Wed, 01 Jun 2022 11:05:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ecc3mXE6mp8N/4GPnB4052TSKmG288rQCUrww9LGKCw=; b=pUp7NmB/xOpNq+oYxq0Pzd7r3f4zPvoc61YZAR4Jd7zrJhFIosv9QwL8nfI42YUhon r8UGSySE5imtYjwKtj8g3cvbFlquY3qhwd/pwfUp3xYvTzH7B/PVqqEGEOJddprScGI5 CTkcGoADFkL7rNWOOnz0n0UPJ4eqnMQe74fbvt3SepiutZFVYZjUdfrIvVDEFekzp4vb dlVA32fAjWXvEUIG8ZR8y/ZMXxlXAq14+LFbXhrD4iLX0gV7vY53M7gpVfkRbi66GkET Fzy/AQGExfMMl0bGBsYPO36liQMtdx4n3zpJgQA+RzKZ6K/MlIRX+ZNbJVcVftm/T5cS cFLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ecc3mXE6mp8N/4GPnB4052TSKmG288rQCUrww9LGKCw=; b=JhgvihtX+eDivRD3MDscFnrnLgQKAd+58KrjJ8Ad4sdTWdWw88FCP2mWLzqDZGAeu8 gKYwXGc/T+6SujsCg8KZOEzDurCWtkmGx7fE40d3wgdfQYc9DhbNn8aLSkqPkIv44rCo b9w4EcvPILlkul+hNV/HWRwoCZ9zUS+LRqr5OApMAsCXlWKUP4sQEMkPBKc5FHFxiPHO r9zB9sRLn84ThZB32EX4o1GSZvS/hcYsERzVeAT1L8lhpwoYXP620V5SzldYzkxr86WM PjYn2An1RT/NDVoDHqcTaJ/38fiEm+bBWMJ+UYNDkFSjk8Xol4UMGDBFYJkL/04bIGIJ Y30Q== X-Gm-Message-State: AOAM5311XXnYKC3XC7Dfim2ZUNXa6rXhiSZU20QJeuVtpt+EW5RVpdZE P3XV46CZ3BgWVXLs1tIHut++og== X-Received: by 2002:a17:907:1b1c:b0:6fe:f1a9:ef5a with SMTP id mp28-20020a1709071b1c00b006fef1a9ef5amr679851ejc.233.1654106754258; Wed, 01 Jun 2022 11:05:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k11-20020a056402048b00b0042ab02e3485sm1296731edv.44.2022.06.01.11.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7C5F81FFC0; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Jiaxun Yang Subject: [PULL 08/33] tests/docker: update debian-mipsel-cross with lcitool Date: Wed, 1 Jun 2022 19:05:12 +0100 Message-Id: <20220601180537.2329566-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use lcitool to update debian-mipsel-cross to a Debian 11 based system. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Message-Id: <20220527153603.887929-9-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index caef7decf4..1a533e6fc0 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -102,8 +102,7 @@ mips-debian-cross-container: mipsel-debian-cross-container: extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] + stage: containers variables: NAME: debian-mipsel-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index d9109bcc77..0ac5975419 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -94,7 +94,6 @@ docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-mips64el-cross: docker-image-debian10 -docker-image-debian-mipsel-cross: docker-image-debian10 docker-image-debian-ppc64el-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 0e5dd42d3c..b6d99ae324 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -1,31 +1,162 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker mipsel cross-compiler target +# $ lcitool dockerfile --layers all --cross mipsel debian-11 qemu # -# This docker target builds on the debian Stretch base image. -# -FROM qemu/debian10 +# https://gitlab.com/libvirt/libvirt-ci -MAINTAINER Philippe Mathieu-Daudé +FROM docker.io/library/debian:11-slim -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture mipsel -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-mipsel-linux-gnu +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a mipsel --arch-only qemu +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=mipsel-linux-gnu- +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture mipsel && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-mipsel-linux-gnu \ + gcc-mipsel-linux-gnu \ + libaio-dev:mipsel \ + libasound2-dev:mipsel \ + libattr1-dev:mipsel \ + libbpf-dev:mipsel \ + libbrlapi-dev:mipsel \ + libbz2-dev:mipsel \ + libc6-dev:mipsel \ + libcacard-dev:mipsel \ + libcap-ng-dev:mipsel \ + libcapstone-dev:mipsel \ + libcurl4-gnutls-dev:mipsel \ + libdaxctl-dev:mipsel \ + libdrm-dev:mipsel \ + libepoxy-dev:mipsel \ + libfdt-dev:mipsel \ + libffi-dev:mipsel \ + libfuse3-dev:mipsel \ + libgbm-dev:mipsel \ + libgcrypt20-dev:mipsel \ + libglib2.0-dev:mipsel \ + libglusterfs-dev:mipsel \ + libgnutls28-dev:mipsel \ + libgtk-3-dev:mipsel \ + libibumad-dev:mipsel \ + libibverbs-dev:mipsel \ + libiscsi-dev:mipsel \ + libjemalloc-dev:mipsel \ + libjpeg62-turbo-dev:mipsel \ + liblttng-ust-dev:mipsel \ + liblzo2-dev:mipsel \ + libncursesw5-dev:mipsel \ + libnfs-dev:mipsel \ + libnuma-dev:mipsel \ + libpam0g-dev:mipsel \ + libpixman-1-dev:mipsel \ + libpng-dev:mipsel \ + libpulse-dev:mipsel \ + librbd-dev:mipsel \ + librdmacm-dev:mipsel \ + libsasl2-dev:mipsel \ + libsdl2-dev:mipsel \ + libsdl2-image-dev:mipsel \ + libseccomp-dev:mipsel \ + libselinux1-dev:mipsel \ + libslirp-dev:mipsel \ + libsnappy-dev:mipsel \ + libspice-server-dev:mipsel \ + libssh-gcrypt-dev:mipsel \ + libsystemd-dev:mipsel \ + libtasn1-6-dev:mipsel \ + libudev-dev:mipsel \ + liburing-dev:mipsel \ + libusb-1.0-0-dev:mipsel \ + libusbredirhost-dev:mipsel \ + libvdeplug-dev:mipsel \ + libvirglrenderer-dev:mipsel \ + libvte-2.91-dev:mipsel \ + libzstd-dev:mipsel \ + nettle-dev:mipsel \ + systemtap-sdt-dev:mipsel \ + xfslibs-dev:mipsel \ + zlib1g-dev:mipsel && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + echo "[binaries]\n\ +c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ +ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/mipsel-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'mips'\n\ +cpu = 'mipsel'\n\ +endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc -# Install extra libraries to increase code coverage -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - libbz2-dev:mipsel \ - liblzo2-dev:mipsel \ - librdmacm-dev:mipsel \ - libsnappy-dev:mipsel +ENV ABI "mipsel-linux-gnu" +ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" +ENV QEMU_CONFIGURE_OPTS --cross-prefix=mipsel-linux-gnu- +ENV DEF_TARGET_LIST mipsel-softmmu,mipsel-linux-user diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 4dc5527234..a4b7452189 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -115,6 +115,11 @@ try: trailer=debian_cross_build("arm-linux-gnueabihf-", "arm-softmmu,arm-linux-user")) + generate_dockerfile("debian-mipsel-cross", "debian-11", + cross="mipsel", + trailer=debian_cross_build("mipsel-linux-gnu-", + "mipsel-softmmu,mipsel-linux-user")) + generate_dockerfile("debian-s390x-cross", "debian-11", cross="s390x", trailer=debian_cross_build("s390x-linux-gnu-", From patchwork Wed Jun 1 18:05:13 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: 577808 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp845897mab; Wed, 1 Jun 2022 11:14:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPeuRI0lvHBdFT+DYix4Y0OjgBWsq1azdzYcPXDMp8Y97nCK+uv9uzn9e8XYKv1v3RzJHr X-Received: by 2002:a05:620a:28ca:b0:6a0:a0a9:b2e6 with SMTP id l10-20020a05620a28ca00b006a0a0a9b2e6mr600364qkp.638.1654107281764; Wed, 01 Jun 2022 11:14:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107281; cv=none; d=google.com; s=arc-20160816; b=Ez+zOYFXZ6idK0bV5CvGHeRGj2e8KbQDxet02/IrlhK6VLViUX6E3ssKiAeOAbsi44 QU/bB7KLVqE66Wc8yu8kckWUmlsHYbkUq0Rj4WviLB4M10g/o7KFtqtIBy3aa0rE3Lzv h/BexdDNSqGUaIfEaaL3CjC4CDkm+zVwZ9Tf6BMGYaS5JHrO7u7jChwhyKvSk6IzDLj1 7ANVSOlUZCTSGs7fa2FuR3v7jCfEbcVi7Vjgk67i+DxexlqvL3gvbf7ABnUZdQ4hzdvZ q7TPXzz/himLfN6NmJcnsMS84USymeeghYJP3sk9tuS7GMdYg3d3KAJGNrewjdBrbiri 9zIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=SQR59DMqwPOT0qSX8m8/1TGZYe/OKygjP/K41gMQuSc=; b=Ym0/ACgsr4bsSyLSkBECvVB3p3TZvLH0Bz3sZIh6T5JeD/sEew3YB5b0UIqKNf2B3F F0CR2rvpemXByOfbHE83iKxdRKvz5WXaxRLSsztI9vR2Z3mSND+y7S82X8u3udZ4R2Li fDScEBypL/ZgMnRKopdF4jKkwW5N3q7oeb+t8veV2FS7ePiZ+mlURfz6DL3vC4Yd8vsu 2EmnqJrhppIf71O4N+pb4cmAjTHbXYgK0JBPR/fFt8DAlgwX6+Udz5+xce5Y5x/HhBAq TqYhhGMYyyOJKLN9DRG2KBhNT3SciNAANL2UQs4f0zZM/z1imTOdgfd1SjX9/RNUYnY4 gwiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="yM/qwNvU"; 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=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 o8-20020a05622a138800b00304b501105bsi1293309qtk.411.2022.06.01.11.14.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:14: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=pass header.i=@linaro.org header.s=google header.b="yM/qwNvU"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSrh-00016y-9G for patch@linaro.org; Wed, 01 Jun 2022 14:14:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjE-0000uN-1x for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:56 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]:33593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSjB-0004xz-Nd for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:55 -0400 Received: by mail-ed1-x534.google.com with SMTP id h19so3311661edj.0 for ; Wed, 01 Jun 2022 11:05:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SQR59DMqwPOT0qSX8m8/1TGZYe/OKygjP/K41gMQuSc=; b=yM/qwNvU20GNKLTYzX0dx3aZlJ6vbYCSNjmiFOMKfDSB2nbLNnRHr69eb2WL/aTJfV gitmdV3zl61jEY77WYRn/8QabV9IGHeFlKv/FJtarVdZrFrp8s3ClDH4bcs8tSxBXVBa BXCe4hwVGY0ZHRGT2KCGnBvV1FMtSKyJEHb0XUld9Q15Bex0K7IHikpZsKHcYfu2XGXm QC6NNvw7WzLcPTLCulDCHBQsG1RN5vNOQeq6jIe15fMQE9NWaPmHWQUs1V8h8j4qa/xf mehSd30MKOjgfyYXzG6eC44WzA5CCt9/sBCdWbZ5DYRrkx2L9xA9pT6IJtyDyk4FDQMd LkkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SQR59DMqwPOT0qSX8m8/1TGZYe/OKygjP/K41gMQuSc=; b=J5cTp/ySkkOfyoztbIjiKCZ0w5OCss1bMeMCsyUHol9ukGBoCAmdnbIYaIazOD8Ldg UxA5ee1in2fOmcgYIu8M9RvaRavgm5UAgGmBmaPJOh7A1SEAr8YADSUb4IT6BE9axW34 JQyFMF9mLeb0WEGiEAdK+TPAjheFgiGNlGL2EerHISdtnFfPix5nUAcHXts+SXjylaBQ 20D2MUQf4CmxcletB6e7xDeJ6XEn/wrWRuI4c8DW7uqBmU15KyzP6S8W9ywP4w2qv3W9 /w8qSeS1b58NLMezspRpWBUGqQSCeRGU3npn4ZFM15p7d+HycjIIIVyY8+k4R/aHrRuK PBcg== X-Gm-Message-State: AOAM5310NxxdgpZboIRCo21Q0z+u5AOfvycNxsiCmlxKj8zPB6z0MfmW USrM7lf8fib+ALENy9QlpXYpJ0uVQMtmmQ== X-Received: by 2002:a05:6402:2945:b0:41d:aad:c824 with SMTP id ed5-20020a056402294500b0041d0aadc824mr1040296edb.364.1654106752356; Wed, 01 Jun 2022 11:05:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v7-20020aa7d647000000b0042bd2012196sm1319623edr.85.2022.06.01.11.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9C5CE1FFC1; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Jiaxun Yang Subject: [PULL 09/33] tests/docker: update debian-mips64el-cross with lcitool Date: Wed, 1 Jun 2022 19:05:13 +0100 Message-Id: <20220601180537.2329566-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use lcitool to update debian-mips64el-cross to a Debian 11 based system. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Message-Id: <20220527153603.887929-10-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 1a533e6fc0..411dc06bf8 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -88,8 +88,7 @@ mips64-debian-cross-container: mips64el-debian-cross-container: extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] + stage: containers variables: NAME: debian-mips64el-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 0ac5975419..d9f37ae8fa 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -93,7 +93,6 @@ docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 -docker-image-debian-mips64el-cross: docker-image-debian10 docker-image-debian-ppc64el-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index c990b683b7..b02dcb7fd9 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -1,33 +1,162 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker mips64el cross-compiler target -# -# This docker target builds on the debian Stretch base image. +# $ lcitool dockerfile --layers all --cross mips64el debian-11 qemu # +# https://gitlab.com/libvirt/libvirt-ci -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -MAINTAINER Philippe Mathieu-Daudé +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture mips64el && \ - apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-mips64el-linux-gnuabi64 +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a mips64el --arch-only qemu +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture mips64el && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-mips64el-linux-gnuabi64 \ + gcc-mips64el-linux-gnuabi64 \ + libaio-dev:mips64el \ + libasound2-dev:mips64el \ + libattr1-dev:mips64el \ + libbpf-dev:mips64el \ + libbrlapi-dev:mips64el \ + libbz2-dev:mips64el \ + libc6-dev:mips64el \ + libcacard-dev:mips64el \ + libcap-ng-dev:mips64el \ + libcapstone-dev:mips64el \ + libcurl4-gnutls-dev:mips64el \ + libdaxctl-dev:mips64el \ + libdrm-dev:mips64el \ + libepoxy-dev:mips64el \ + libfdt-dev:mips64el \ + libffi-dev:mips64el \ + libfuse3-dev:mips64el \ + libgbm-dev:mips64el \ + libgcrypt20-dev:mips64el \ + libglib2.0-dev:mips64el \ + libglusterfs-dev:mips64el \ + libgnutls28-dev:mips64el \ + libgtk-3-dev:mips64el \ + libibumad-dev:mips64el \ + libibverbs-dev:mips64el \ + libiscsi-dev:mips64el \ + libjemalloc-dev:mips64el \ + libjpeg62-turbo-dev:mips64el \ + liblttng-ust-dev:mips64el \ + liblzo2-dev:mips64el \ + libncursesw5-dev:mips64el \ + libnfs-dev:mips64el \ + libnuma-dev:mips64el \ + libpam0g-dev:mips64el \ + libpixman-1-dev:mips64el \ + libpng-dev:mips64el \ + libpulse-dev:mips64el \ + librbd-dev:mips64el \ + librdmacm-dev:mips64el \ + libsasl2-dev:mips64el \ + libsdl2-dev:mips64el \ + libsdl2-image-dev:mips64el \ + libseccomp-dev:mips64el \ + libselinux1-dev:mips64el \ + libslirp-dev:mips64el \ + libsnappy-dev:mips64el \ + libspice-server-dev:mips64el \ + libssh-gcrypt-dev:mips64el \ + libsystemd-dev:mips64el \ + libtasn1-6-dev:mips64el \ + libudev-dev:mips64el \ + liburing-dev:mips64el \ + libusb-1.0-0-dev:mips64el \ + libusbredirhost-dev:mips64el \ + libvdeplug-dev:mips64el \ + libvirglrenderer-dev:mips64el \ + libvte-2.91-dev:mips64el \ + libzstd-dev:mips64el \ + nettle-dev:mips64el \ + systemtap-sdt-dev:mips64el \ + xfslibs-dev:mips64el \ + zlib1g-dev:mips64el && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + echo "[binaries]\n\ +c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ +ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ +strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ +pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'mips64'\n\ +cpu = 'mips64el'\n\ +endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc -# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV ABI "mips64el-linux-gnuabi64" +ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64" ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips64el-linux-gnuabi64- ENV DEF_TARGET_LIST mips64el-softmmu,mips64el-linux-user - -# Install extra libraries to increase code coverage -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - libbz2-dev:mips64el \ - liblzo2-dev:mips64el \ - librdmacm-dev:mips64el \ - libsnappy-dev:mips64el diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index a4b7452189..341a07e677 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -115,6 +115,11 @@ try: trailer=debian_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")) + generate_dockerfile("debian-mipsel-cross", "debian-11", cross="mipsel", trailer=debian_cross_build("mipsel-linux-gnu-", From patchwork Wed Jun 1 18:05:14 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: 577810 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp846682mab; Wed, 1 Jun 2022 11:15:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynlAosiKX+0aCd8T2zJmOPbsolhQXLPuslHOuDhpUr4ArVYwvaitXfRZy5WWR1GS6l2r8H X-Received: by 2002:a05:622a:11ca:b0:304:c340:c37f with SMTP id n10-20020a05622a11ca00b00304c340c37fmr861785qtk.336.1654107338553; Wed, 01 Jun 2022 11:15:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107338; cv=none; d=google.com; s=arc-20160816; b=t70NyoMBrX1p7SzSxkwPnXkqXONQ3SijD0M5s90ZJxspQEOqVWGUHOuwt42xx4V50l kcFzH9VhFQfvuCPbsC/3u5Q7JuE9F0E1oi2UrdPKbM+r8eJqA4FlC5/oWeDq71RjkHz+ knBFOg/yR4LdRuR+7hE+Zi1Vqn+kjKoz2/rq/Us9AlWyEhG/HwWHEyos5bId8dv/sK0t 2HW2Xwilwd4lQ3CoueQgV5kweJ6YD/JIUOA1AZxP/a9IAy8+n9DJCW/H89WDrDJLdSC1 3/di/EwXFqcAEeZD96vsDSiHKcBG4jhmL9Hx7Le6eQn53Csk3tmC6GHLy3D7TWHPk4gX 1yIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=p1VykVSVR9P+l2gudF+VGSS/3wVljrAEqL2dxGqy3X8=; b=BUYUdc0qfGp5APG00AoGjs1RXz9N0bkrFmKSx8K66trYx9FKLtTIQmGp+KXf1XwtgC 4oH7eBNPqCAXKGdF/grfY8+RkVwJtJlgWWMKr83btq3s84auJHRHXqea2QIrfZoTaIP7 M88zhfQ0H1bm8aB/BNjsOP7PWznY9TLV7nJ9JMTCtnYe4hY8MOAWgLGbTjDHhwsvYgyR iQjB/gM6Uo2HwkHeF57XOF6gcs2Qu9iVM4a9Aap+5HmKWjfZeHt1yPtNijqx0MY3auxF ksjTEUo5Ms0DD0lYIz8YUfKoI+Wrbs3bSIXvoTbeZWgiytxm653hGtip3J6/rUAdYBYg 3yrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jdJwXl1H; 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=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 k16-20020a05620a415000b006a62faa6c11si1458676qko.548.2022.06.01.11.15.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:15:38 -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=pass header.i=@linaro.org header.s=google header.b=jdJwXl1H; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSsc-0002zj-0F for patch@linaro.org; Wed, 01 Jun 2022 14:15:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjD-0000u5-Ur for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:55 -0400 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]:46656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSjA-0004xm-PH for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:55 -0400 Received: by mail-ed1-x533.google.com with SMTP id z7so3234321edm.13 for ; Wed, 01 Jun 2022 11:05:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p1VykVSVR9P+l2gudF+VGSS/3wVljrAEqL2dxGqy3X8=; b=jdJwXl1HV852VPH1kyQk5teC+uo8itg+teAvbP9AGBCjZFaMUj2SXe3bStaABz49Xw nmJ10qXpP5W/lhmBoZUsrzPQ0z0zlm/FKoA/nS+HB1doGJ2ZHoHao9z9SGFD+MOxfdzS Mz8xQ+065mUjUqu4kdSJRF+i8muMgw69Cmjxom0UcN5ROIxJcv6QLepXRxE/sdyqtMh5 iTjX8RmJJUwi0xbkGTz1a04LzkDM5th0fhEtxsgZpLwLdY3r0Szu8cHb2QQwbmNJFcVB OATqaLMxrIZn8yFq0YAR1f26vYhIDdr6OXi2fNfGSnz4C0m9bf7KhoSzcf7hnrREkFoC enxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p1VykVSVR9P+l2gudF+VGSS/3wVljrAEqL2dxGqy3X8=; b=uu+ttEgvS6YzzJRSk5LBw2nLSx/jFA8j8DRKZdJ3WZJmCjiw0wh6ICiXbsPLbNGVQf oWaHR6gTfG3xiW5Vr9hV02SlIrPQDId/U22j9ESvv5gp3zvP0FB1HTp+Tiiyi4QSu1h4 bIoz4qycHlzyc7vmniikc4mMxMoU2xruJcWCCXjPevIZj5OeTcQh30s9rOVTStFWTZUJ rgS8y0BiXD46A7mOzP7t9afw/obEi9RX2yoqeXzLlc/vQizXmRQRaWpUz2/pt/w1L2UK hfUuM2u6bCf9Qj324usGqk0Kk/sLvxnNTP78SrdxG+qRFca3zsHyVSotmiBurhrZzpyT jV3Q== X-Gm-Message-State: AOAM5312jRZWguG13BR5ghVeVlsBdlI6LU50ZWGZJ/a44PjaHDfwWw4i cCBK4usWtQIHpIFJsqp0UrzugA== X-Received: by 2002:aa7:d285:0:b0:42d:ca4f:a046 with SMTP id w5-20020aa7d285000000b0042dca4fa046mr1063970edq.354.1654106751393; Wed, 01 Jun 2022 11:05:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id ze11-20020a170906ef8b00b006fed3fdf421sm974210ejb.139.2022.06.01.11.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BD4901FFC2; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 10/33] tests/docker: update debian-ppc64el-cross with lcitool Date: Wed, 1 Jun 2022 19:05:14 +0100 Message-Id: <20220601180537.2329566-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x533.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use lcitool to update debian-ppc64el-cross to a Debian 11 based system. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Message-Id: <20220527153603.887929-11-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 411dc06bf8..147e667744 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -114,8 +114,7 @@ powerpc-test-cross-container: ppc64el-debian-cross-container: extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] + stage: containers variables: NAME: debian-ppc64el-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index d9f37ae8fa..e68f91b853 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -93,7 +93,6 @@ docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 -docker-image-debian-ppc64el-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 5de12b01cd..bcf04bc90b 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -1,28 +1,164 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker ppc64el cross-compiler target +# $ lcitool dockerfile --layers all --cross ppc64le debian-11 qemu # -# This docker target builds on the debian Stretch base image. -# -FROM qemu/debian10 +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:11-slim -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture ppc64el && \ - apt update && \ - apt install -yy crossbuild-essential-ppc64el +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a ppc64el --arch-only qemu +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -# Specify the cross prefix for this image (see tests/docker/common.rc) +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture ppc64el && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-powerpc64le-linux-gnu \ + gcc-powerpc64le-linux-gnu \ + libaio-dev:ppc64el \ + libasan5:ppc64el \ + libasound2-dev:ppc64el \ + libattr1-dev:ppc64el \ + libbpf-dev:ppc64el \ + libbrlapi-dev:ppc64el \ + libbz2-dev:ppc64el \ + libc6-dev:ppc64el \ + libcacard-dev:ppc64el \ + libcap-ng-dev:ppc64el \ + libcapstone-dev:ppc64el \ + libcurl4-gnutls-dev:ppc64el \ + libdaxctl-dev:ppc64el \ + libdrm-dev:ppc64el \ + libepoxy-dev:ppc64el \ + libfdt-dev:ppc64el \ + libffi-dev:ppc64el \ + libfuse3-dev:ppc64el \ + libgbm-dev:ppc64el \ + libgcrypt20-dev:ppc64el \ + libglib2.0-dev:ppc64el \ + libglusterfs-dev:ppc64el \ + libgnutls28-dev:ppc64el \ + libgtk-3-dev:ppc64el \ + libibumad-dev:ppc64el \ + libibverbs-dev:ppc64el \ + libiscsi-dev:ppc64el \ + libjemalloc-dev:ppc64el \ + libjpeg62-turbo-dev:ppc64el \ + liblttng-ust-dev:ppc64el \ + liblzo2-dev:ppc64el \ + libncursesw5-dev:ppc64el \ + libnfs-dev:ppc64el \ + libnuma-dev:ppc64el \ + libpam0g-dev:ppc64el \ + libpixman-1-dev:ppc64el \ + libpng-dev:ppc64el \ + libpulse-dev:ppc64el \ + librbd-dev:ppc64el \ + librdmacm-dev:ppc64el \ + libsasl2-dev:ppc64el \ + libsdl2-dev:ppc64el \ + libsdl2-image-dev:ppc64el \ + libseccomp-dev:ppc64el \ + libselinux1-dev:ppc64el \ + libslirp-dev:ppc64el \ + libsnappy-dev:ppc64el \ + libspice-server-dev:ppc64el \ + libssh-gcrypt-dev:ppc64el \ + libsystemd-dev:ppc64el \ + libtasn1-6-dev:ppc64el \ + libubsan1:ppc64el \ + libudev-dev:ppc64el \ + liburing-dev:ppc64el \ + libusb-1.0-0-dev:ppc64el \ + libusbredirhost-dev:ppc64el \ + libvdeplug-dev:ppc64el \ + libvirglrenderer-dev:ppc64el \ + libvte-2.91-dev:ppc64el \ + libzstd-dev:ppc64el \ + nettle-dev:ppc64el \ + systemtap-sdt-dev:ppc64el \ + xfslibs-dev:ppc64el \ + zlib1g-dev:ppc64el && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + echo "[binaries]\n\ +c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ +ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'ppc64'\n\ +cpu = 'powerpc64le'\n\ +endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc + +ENV ABI "powerpc64le-linux-gnu" +ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc64le-linux-gnu- ENV DEF_TARGET_LIST ppc64-softmmu,ppc64-linux-user - -# Install extra libraries to increase code coverage -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - libbz2-dev:ppc64el \ - liblzo2-dev:ppc64el \ - librdmacm-dev:ppc64el \ - libsnappy-dev:ppc64el diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 341a07e677..b947bb170d 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -125,6 +125,11 @@ try: trailer=debian_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")) + generate_dockerfile("debian-s390x-cross", "debian-11", cross="s390x", trailer=debian_cross_build("s390x-linux-gnu-", From patchwork Wed Jun 1 18:05:15 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: 577816 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp854319mab; Wed, 1 Jun 2022 11:25:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzINNNmkWmdXc+rR5O/fuHA5+Kv914Iw//WS7j70tTJ/li05zojnYokRzqNTD2nnW951Vcs X-Received: by 2002:ad4:5fcf:0:b0:462:d194:3c61 with SMTP id jq15-20020ad45fcf000000b00462d1943c61mr695519qvb.45.1654107901345; Wed, 01 Jun 2022 11:25:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107901; cv=none; d=google.com; s=arc-20160816; b=YWd/TLEA5LfmxHWZJ/DtHQBfCIkhFsGcM85vsZuVmy/FervpZ0wtgp6QStKdbdXqEH Qm/S0N1GqsOlm9UZfx05pEDRpDXZGGdi2DgZUcVmq5GJ4oKxOz2Z54N8VCmNY5Tkj213 JYeFz4rnRAPpKSnjJ24pP1G7GuVAylE+RxkDvKUA4WaekCyeHR15tLM7+KKFAUXdrXGb b7qatsHlSv5+nt+R49FqFa8ZhqxQW28B9pDxgM7a/CvfTScSJ7ZXlykYUvI4RwGajb10 EPOPZlL+ylgttCHVCUTzU2uAlAzhserFJmVPJ7xt3NFwRyLVryo/NMy3C+dIatGKCszh O4hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=6MZpDwSYMX2s6IJFpVNFXUAPYwW6h4QWH0MPtHe4U4Q=; b=yammD8QuTpm0gmVOllsOKf0dtnLxdTZmpgwkznJsrycwymjKM/eAjEtODWe9gQ6VXR ytvKpdu5/bT9WZPSJwPvpgnkx2atEVEr9FB74hvw20AQSR+x0o464IW9w/L3uazZuB3P lVWOa+DdBuTmTwauyqlT0z8m9df6F1KKABtVvYJkatSmgqEjUDQ3qGCjmzvjyB+4mzIe LYUD06u68w41qwXHgV7YCplpYERz0WckIDIm398PiZfmnQA/0F+2s5xSPKNhxVyGNNmj WYJiPD4+5xsT78uPaVHslhrFM743nmGpNoVekX0i1UrZzDvHKC9xpA6lFs7N4KllsblU 0+yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VteYT2hm; 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=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 k15-20020a05622a03cf00b00304ba5317e8si1190733qtx.398.2022.06.01.11.25.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:25:01 -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=pass header.i=@linaro.org header.s=google header.b=VteYT2hm; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwT1g-0004gJ-DO for patch@linaro.org; Wed, 01 Jun 2022 14:25:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjX-0001qW-Kk for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:06:15 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:35574) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSjJ-0004zg-24 for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:06:15 -0400 Received: by mail-ej1-x634.google.com with SMTP id me5so4851109ejb.2 for ; Wed, 01 Jun 2022 11:06:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6MZpDwSYMX2s6IJFpVNFXUAPYwW6h4QWH0MPtHe4U4Q=; b=VteYT2hmoCOBmSqp6ti/+DC1JYBNpna8yl9bnNUCaxhFoWkEIIxWVZr0H/0j2V8Juy 0DBKfi5dtJGXNG2FcOCSdtp9zJaxhb+Y3kXuCqWsXCW2lCTROT0LWi5rbsN4KtXG69e1 WoTtqhjFiBV3YNRWGXs/N1WDJr2lHY3AmvRQx94NmAT6tPclDyFeamZbZC81rWKBSxa9 krSv7cp0DWH+B9JxgLVS5VxpYQnIWvrUgZIeRkTkhO+8hAsyF5F1HYjteDaHIoK5o2ho jHzs/DQiQDrZGxyrD+456UIHaOB8FPKi27ZCCPj5GNSw5Wjot2KwnqqaJvWpdQRx6LR+ 1rJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6MZpDwSYMX2s6IJFpVNFXUAPYwW6h4QWH0MPtHe4U4Q=; b=gtB/eBiP/iULCQDarwryJZ5StSuf+FaPfAPPMGYL9vejOqNdFzV53MleVg+dmD8c6N EkoKYDyINZG2j6QJXo+dyz2NTM0EMPNwdWNB8nzglOsAjTDtUFujZNhPYbxgeFpvoMVA xgTkDIGGOyODnXvpkUg8pFY/ML+spF4McF5Rsh0QBYPFw/eO6YR6fB73vIH68voltA8N KfhX3/HdNM0voF7TmikA3p/McQqP4v9A76Ke21tC82EnFTA5WtEgz53nkm/3zO3ABVSb APAFOw9G5NOZSudVRLZ5TBfz/+RppuDDoB/XM/TysQ74JlMTYQik5oDjQhHshaEZsOAC 54Jw== X-Gm-Message-State: AOAM533CBfg3fLPZuo/4focddsIyocsJiTpFH7f8fDjMpnxRjAlWkE0b 3lnhbnAK3JYlfiK98MbgSMFCkQ== X-Received: by 2002:a17:907:3e82:b0:6ff:1e04:a365 with SMTP id hs2-20020a1709073e8200b006ff1e04a365mr668826ejc.617.1654106759632; Wed, 01 Jun 2022 11:05:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n8-20020aa7d048000000b0042dcdfb003esm1318001edo.53.2022.06.01.11.05.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D072F1FFC3; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Luigi Rizzo , Giuseppe Lettieri , Vincenzo Maffione , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 11/33] tests/docker: update debian-amd64 with lcitool Date: Wed, 1 Jun 2022 19:05:15 +0100 Message-Id: <20220601180537.2329566-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The one minor wrinkle we need to account for is the netmap support still requires building from source. We also include cscope and GNU global as they are used in one of the builds. Signed-off-by: Alex Bennée Cc: Philippe Mathieu-Daudé Cc: Luigi Rizzo Cc: Giuseppe Lettieri Cc: Vincenzo Maffione Reviewed-by: Daniel P. Berrangé Message-Id: <20220527153603.887929-12-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index e9df90bbdd..be34cbc7ba 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -14,8 +14,7 @@ amd64-debian11-container: amd64-debian-container: extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] + stage: containers variables: NAME: debian-amd64 diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index ed546edcd6..503e282802 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -1,59 +1,153 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker x86_64 target +# $ lcitool dockerfile --layers all debian-11 qemu # -# This docker target builds on the Debian Buster base image. Further -# libraries which are not widely available are installed by hand. -# -FROM qemu/debian10 -MAINTAINER Philippe Mathieu-Daudé - -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy qemu +# https://gitlab.com/libvirt/libvirt-ci -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - cscope \ - genisoimage \ - exuberant-ctags \ - global \ - libbz2-dev \ - liblzo2-dev \ - libgcrypt20-dev \ - libfdt-dev \ - librdmacm-dev \ - libsasl2-dev \ - libsnappy-dev \ - libvte-dev \ - netcat-openbsd \ - openssh-client \ - python3-numpy \ - python3-opencv \ - python3-venv +FROM docker.io/library/debian:11-slim -# virgl -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - libegl1-mesa-dev \ - libepoxy-dev \ - libgbm-dev -RUN git clone https://gitlab.freedesktop.org/virgl/virglrenderer.git /usr/src/virglrenderer && \ - cd /usr/src/virglrenderer && git checkout virglrenderer-0.8.0 -RUN cd /usr/src/virglrenderer && ./autogen.sh && ./configure --disable-tests && make install +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + clang \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + g++ \ + gcc \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libaio-dev \ + libasan5 \ + libasound2-dev \ + libattr1-dev \ + libbpf-dev \ + libbrlapi-dev \ + libbz2-dev \ + libc6-dev \ + libcacard-dev \ + libcap-ng-dev \ + libcapstone-dev \ + libcurl4-gnutls-dev \ + libdaxctl-dev \ + libdrm-dev \ + libepoxy-dev \ + libfdt-dev \ + libffi-dev \ + libfuse3-dev \ + libgbm-dev \ + libgcrypt20-dev \ + libglib2.0-dev \ + libglusterfs-dev \ + libgnutls28-dev \ + libgtk-3-dev \ + libibumad-dev \ + libibverbs-dev \ + libiscsi-dev \ + libjemalloc-dev \ + libjpeg62-turbo-dev \ + liblttng-ust-dev \ + liblzo2-dev \ + libncursesw5-dev \ + libnfs-dev \ + libnuma-dev \ + libpam0g-dev \ + libpcre2-dev \ + libpixman-1-dev \ + libpmem-dev \ + libpng-dev \ + libpulse-dev \ + librbd-dev \ + librdmacm-dev \ + libsasl2-dev \ + libsdl2-dev \ + libsdl2-image-dev \ + libseccomp-dev \ + libselinux1-dev \ + libslirp-dev \ + libsnappy-dev \ + libspice-protocol-dev \ + libspice-server-dev \ + libssh-gcrypt-dev \ + libsystemd-dev \ + libtasn1-6-dev \ + libubsan1 \ + libudev-dev \ + liburing-dev \ + libusb-1.0-0-dev \ + libusbredirhost-dev \ + libvdeplug-dev \ + libvirglrenderer-dev \ + libvte-2.91-dev \ + libxen-dev \ + libzstd-dev \ + llvm \ + locales \ + make \ + meson \ + multipath-tools \ + ncat \ + nettle-dev \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + systemtap-sdt-dev \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo \ + xfslibs-dev \ + zlib1g-dev && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -# netmap -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - linux-headers-amd64 +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +# netmap/cscope/global +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + cscope\ + global\ + linux-headers-amd64 RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap RUN cd /usr/src/netmap && git checkout v11.3 RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps --kernel-dir=$(ls -d /usr/src/linux-headers-*-amd64) && make install ENV QEMU_CONFIGURE_OPTS --enable-netmap - -RUN ldconfig - -# gcrypt -ENV QEMU_CONFIGURE_OPTS $QEMU_CONFIGURE_OPTS --enable-gcrypt diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index b947bb170d..5e260f8cd6 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -76,6 +76,23 @@ ubuntu2004_tsanhack = [ ] +# Netmap still needs to be manually built as it is yet to be packaged +# into a distro. We also add cscope and gtags which are used in the CI +# test +debian11_extras = [ + "# netmap/cscope/global\n", + "RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n", + " apt install -y --no-install-recommends \\\n", + " cscope\\\n", + " global\\\n", + " linux-headers-amd64\n", + "RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap\n", + "RUN cd /usr/src/netmap && git checkout v11.3\n", + "RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps --kernel-dir=$(ls -d /usr/src/linux-headers-*-amd64) && make install\n", + "ENV QEMU_CONFIGURE_OPTS --enable-netmap\n" +] + + def debian_cross_build(prefix, targets): conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix) targets = "ENV DEF_TARGET_LIST %s\n" % (targets) @@ -92,6 +109,8 @@ try: # generate_dockerfile("alpine", "alpine-edge") generate_dockerfile("centos8", "centos-stream-8") + generate_dockerfile("debian-amd64", "debian-11", + trailer="".join(debian11_extras)) generate_dockerfile("fedora", "fedora-35") generate_dockerfile("opensuse-leap", "opensuse-leap-152") generate_dockerfile("ubuntu2004", "ubuntu-2004", From patchwork Wed Jun 1 18:05:16 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: 577807 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp845797mab; Wed, 1 Jun 2022 11:14:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLLD/VDhVJlDaYLlPN4JQmlOb8xDQkZZwSP81Nj9nnPkP+wK5gZo6/z3s4ALThB/LsjcH3 X-Received: by 2002:a05:622a:454:b0:2f3:d8fe:c650 with SMTP id o20-20020a05622a045400b002f3d8fec650mr859648qtx.440.1654107273643; Wed, 01 Jun 2022 11:14:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107273; cv=none; d=google.com; s=arc-20160816; b=lSD8GfiDwadQoUjWVMfiPzVCKNZHGdkqY9SZESjZdcz7cJyQ/+ZIl16vmw54ieYzvG hfzZFDhvezf9oR8QecR6VUf1FFOp4o5iOJrxh1UDyW2/UDN195VjAkF3HjEAiWc4XUly OxZpduj3iVzFlA5V6onirLM24Edj/fMg2CBQEpSWj2q6TaIXkTbzCM9H8/tyIEQfuvHx Rqfg+zuJkn1Azn8bGOE12CgW5PwznuaPs/QhR/h4miufn7scUg0FnVkmjZaaDdkplCtd lcfJxc3auyzK4KRoEUasU+LP9NMwdGeBOjTJaK6aBtpP681/PBqTcIl+ziFileWHFXgW h1fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=Nq8yzeDa35nazBz+vDIGk+SXL2jvpKA5lHmDy5gS1Bw=; b=Kg5t9lHmZZUYQTFBdxyD8W9BkANxXmogqKjuiKKto37CyEQE+Wek8KQcjkhuHNoKiP 0d4kclS0+A7oW0xF2xiS0boqwMwE/KX7sellE0NRnRYb5Z+1u7NBj17eCDucRPrpsdUs fwzsp/udS2kREOkvIt9geR0tntdnP0fzCp5oFJ5vPzBCt6wpAR5eR7Ygx9Aoka+CLeR3 gtM2oatXlldJRTzLe7ELysqeX1J2Tuwcl1fyUtW4bbtvJHsd5U7IDxHMxv+sZ9SBiXEO RLPE6SQ0rwmb2qBfhf6OOP/aFP2+IQUbSaKNlGtk5aPQkCBVLkIYbFn3vGeNvPmycSXk sIFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CrBQ0Trl; 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=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 j20-20020a05622a039400b00304c1f10ea7si1310332qtx.753.2022.06.01.11.14.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:14:33 -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=pass header.i=@linaro.org header.s=google header.b=CrBQ0Trl; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSrZ-0000yb-5l for patch@linaro.org; Wed, 01 Jun 2022 14:14:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjH-000150-7u for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:59 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:40881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSjF-0004wj-Iq for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:58 -0400 Received: by mail-ej1-x62d.google.com with SMTP id fu3so3885470ejc.7 for ; Wed, 01 Jun 2022 11:05:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nq8yzeDa35nazBz+vDIGk+SXL2jvpKA5lHmDy5gS1Bw=; b=CrBQ0TrlEEV9NsWJg2YhbEt04hD0irzVXkhXQVhGvGQeWKEKKCqIGAzeU4zYDbNGe1 ZcpP/JEHCJjwuxAag226puq+kAZQiOVNQfDmszckMIVFv/UsR/du0b6DJ44EsWz76y8T kjNfj4pX9B0o7NFZbqJcy8s2aLBNRjeixG89t8MZquW/Bq+QlhOqxqqs87V0IPq47War MmB4Awok2sXCDVAInBYCH+dOsT201dT7FHIEkFsWY5+gfPAm2sOOYFOgHpWXfnP5K6fM Uak9+vLLvjDFeytckczFwgZ49l0jwEuugy+lIJSDhTdU59a1FORhD7AcqjzDlCANyZfo IwwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nq8yzeDa35nazBz+vDIGk+SXL2jvpKA5lHmDy5gS1Bw=; b=W7YC1fCt3d4UOVWO23xgqk0aBBy/d9RzrUtZA2PiKHOZJSp9Dw+dUCFu0l9n7ZZ+5c xdmXG1MfewTmEnFEsvSaitJ0vxv9xmTySZE4xa8ynSXx2Oi/hoTqYpfv1XqeQlVumKMF 1cYV+gjBwZgdDlKdkksgyaw1EGBI38pmun44L3rNhiYZp10aTQeAG2ySbLP/vVsJjhvc 5Yiu4FdNPRiVIksz9+qSUEF46q/K+ZZLv15yRKhXX8eTb1XEIKlc3B8+UHtYrGlX33Ok 933OmjOI0Fl9ptYY6DN7TGib4QSAsk6DZ8z48vgPktJbpw3rhPGvh2JlOlq/NtdJUQ86 LS2g== X-Gm-Message-State: AOAM530qdlU2lNsI1epIBfuzUhGtJPaGIwi7X93q0YBUzyqKopBOTBWc l6NCany2EZJchQiWDQ/Oi33aWg== X-Received: by 2002:a17:907:1b1a:b0:703:a290:98f1 with SMTP id mp26-20020a1709071b1a00b00703a29098f1mr701896ejc.418.1654106756917; Wed, 01 Jun 2022 11:05:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e11-20020a056402104b00b0042dea3390cdsm1314880edu.49.2022.06.01.11.05.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E8B9B1FFC4; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 12/33] configure: do not define or use the CPP variable Date: Wed, 1 Jun 2022 19:05:16 +0100 Message-Id: <20220601180537.2329566-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Just hardcode $(CC) -E, it should be enough. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Message-Id: <20220517092616.1272238-2-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-13-alex.bennee@linaro.org> diff --git a/configure b/configure index f2baf2f526..c88ef94fec 100755 --- a/configure +++ b/configure @@ -376,7 +376,6 @@ fi ar="${AR-${cross_prefix}ar}" as="${AS-${cross_prefix}as}" ccas="${CCAS-$cc}" -cpp="${CPP-$cc -E}" objcopy="${OBJCOPY-${cross_prefix}objcopy}" ld="${LD-${cross_prefix}ld}" ranlib="${RANLIB-${cross_prefix}ranlib}" @@ -2014,7 +2013,6 @@ echo "CC=$cc" >> $config_host_mak echo "AR=$ar" >> $config_host_mak echo "AS=$as" >> $config_host_mak echo "CCAS=$ccas" >> $config_host_mak -echo "CPP=$cpp" >> $config_host_mak echo "OBJCOPY=$objcopy" >> $config_host_mak echo "LD=$ld" >> $config_host_mak echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak @@ -2257,7 +2255,6 @@ preserve_env() { preserve_env AR preserve_env AS preserve_env CC -preserve_env CPP preserve_env CFLAGS preserve_env CXX preserve_env CXXFLAGS diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 2494ad9c25..17ccc76241 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -50,7 +50,7 @@ override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds pvh.img: pvh.o pvh_main.o %.o: %.S - $(call quiet-command,$(CPP) $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@") + $(call quiet-command,$(CC) $(CPPFLAGS) -E -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@") %.o: %.c $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@") From patchwork Wed Jun 1 18:05:17 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: 577812 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp850474mab; Wed, 1 Jun 2022 11:20:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyc4viXkES3yFbSLr/vs7cuZpJL0l5VUQVgYWON+Df3i/dO7McCXgfaOPrYnY3s5xb/A8cO X-Received: by 2002:a37:4d3:0:b0:6a3:65e0:d168 with SMTP id 202-20020a3704d3000000b006a365e0d168mr648287qke.612.1654107605743; Wed, 01 Jun 2022 11:20:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107605; cv=none; d=google.com; s=arc-20160816; b=YzlOk9zflC7YvyZGDc25dYGcE6qtrnmUQ/O9hs6J1rAz2dl2D8l0xeCtpJczycSd0q NiibMwQFpbMp72tzff/NRJ+sdNrtyB8T8YkWRnV8uOdSoIfE8xlQAGWMNHU2FJo0RFYD P/7dSg+x8xg8+LJ8dVYv4xsz9sxFOHe5aULWGwtptsQb0OtaXVQAASP9oO2POxK3dJMR 8HKyg9CaM2KErf2iYlJ1gEaRWtEwddjagpWxAsUhdhiUM5QibrkupN4cuENRHAlFVQJv v0Pn1+hdk3jEfMUsRev7zL2UEANyQ3LgDNwKQKzUB9Mw4IopgEOL3icNpjNbTvC7dwWI IqeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=TX18g1pcfM6buz+YOOCEd0sWaEbIpDVPFIvDk4QPCv8=; b=gUPTII50QZSvTcWFpn7TqjODm5ZoVuDu3bYm8UxgB6TmI3B9PlZArJM5fXXOyzP7tW cO2ZboUaFuG5MwZQttNlh3+nTtAc+HI706B7WieEZEpgNQZWfuXteZshg/o4pSJt33Zn 9LLk+zqV07BSF55YntFPIMUjFhLWmpL+ps0oLoJhe3t91PvSWsWm/nBxrcr0Df4IeQ1l SWCzsvzczeyJrKwNLBsF3hvDUkvzLJZn7mvWXwe6a03wvCJ1DH6j6pUPIMV5B/5GCUA9 cldCYEZkEZATnzbCSC/ja01TexVH7hMWEorUAqZ4Jqc+H8YMCTDjZJeRAzNDjUDzMUFG d38Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=diOmfRqB; 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=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 a10-20020ad45c4a000000b0046466a08cd6si1214532qva.488.2022.06.01.11.20.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:20:05 -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=pass header.i=@linaro.org header.s=google header.b=diOmfRqB; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSwv-00074h-AU for patch@linaro.org; Wed, 01 Jun 2022 14:20:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjG-000121-Bz for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:58 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:33585) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSjE-0004xW-Sc for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:58 -0400 Received: by mail-ed1-x52c.google.com with SMTP id h19so3311435edj.0 for ; Wed, 01 Jun 2022 11:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TX18g1pcfM6buz+YOOCEd0sWaEbIpDVPFIvDk4QPCv8=; b=diOmfRqB0bQcMgD53dOozqbj7Q7eOIp0a1Yrf9ZQIn9CBGKuz7wvZbpeqCWggV9n9s EzHo1SEnFe5biw3aYceQa6uHN1cbe7bY9E53O3UrZG1QJGP3e2A3HjsE6smL4uiDBAsj OtbrWZA9l5nBnzsyxfON0uUMwk7p8fmEr4Vbqayy9O2UwRYQa2+6as7d5SgBTD0mfB/0 RrL22lPirw/vnJgGm1XLIBtNM24U43zPrvUE5qEkgCMu86iyKyqHNkn+k5DsLpJUKbt1 7aq81Cv4oZ0/byFpZPWAqff0vxubEr5TJTXl0XGCp2OcB6zfxM80BiyymOd8F+/DlEDL yKLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TX18g1pcfM6buz+YOOCEd0sWaEbIpDVPFIvDk4QPCv8=; b=T28IKDuxeOLmfih4qiLPl0bKk6xU2FfT0vv04E9rsU7+heIh0cigNusNHraxvl4LMo Fgo3BC8kZ9UPhTFLSf0dUsga+k7qbH8H0zfOJPIBhumQ3FJg2F0kkki+6YeUkQ3mNKEC h0Jmrx4MP7CZEIfLb26pFLntFOwHEpexZ7zw9P4Dz/LBmlhtYFXopC8xB5dQ0xsNh0Oh g11euoHoZ7aW+ysibsfBxAX12zF3eQSSjK2mXKx8ERSj0T9zSJuFVdyNs15gRztyGZCl atNGoCVYhhxT+l6JgumP19vf0Yu75ZqnAePjmexYbAlEJUGe/JZiDbj+CKxXpUQYKzpm s5nw== X-Gm-Message-State: AOAM531KLsMQBq5+2jxwN71jkSMsM223v5jw1ma9gZq/VNpdjo86LmpM yKy1huGvP1uFrp+xQ39bqux3qMdqpHG75w== X-Received: by 2002:a05:6402:4307:b0:42d:e4eb:5b6b with SMTP id m7-20020a056402430700b0042de4eb5b6bmr1007395edc.411.1654106756185; Wed, 01 Jun 2022 11:05:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c18-20020a056402101200b0042dc6e250e3sm1303801edu.81.2022.06.01.11.05.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0A40B1FFC5; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 13/33] build: clean up ninja invocation Date: Wed, 1 Jun 2022 19:05:17 +0100 Message-Id: <20220601180537.2329566-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Fix an incorrect "@@:" and move "-d keepdepfile" to the NINJAFLAGS variable. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Message-Id: <20220517092616.1272238-3-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-14-alex.bennee@linaro.org> diff --git a/Makefile b/Makefile index b842dbccdb..fad312040f 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,7 @@ MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS)))) MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq) NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \ $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \ - + -d keepdepfile ninja-cmd-goals = $(or $(MAKECMDGOALS), all) ninja-cmd-goals += $(foreach t, $(.check.build-suites), $(.check-$t.deps)) ninja-cmd-goals += $(foreach t, $(.bench.build-suites), $(.bench-$t.deps)) @@ -160,8 +160,8 @@ $(ninja-targets): run-ninja # --output-sync line. run-ninja: config-host.mak ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),) - +$(quiet-@)$(if $(MAKE.nq),@:, $(NINJA) -d keepdepfile \ - $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat) + +$(if $(MAKE.nq),@:,$(quiet-@)$(NINJA) $(NINJAFLAGS) \ + $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat) endif endif From patchwork Wed Jun 1 18:05:18 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: 577809 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp846087mab; Wed, 1 Jun 2022 11:14:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMl5+bPc/r7wMyZF2tiKOwLS8xpYrjxNPaHxcchhxYlJROGeGHZ0wB0FQkePyl5QAJR4wu X-Received: by 2002:a05:6214:dab:b0:464:5a56:fba3 with SMTP id h11-20020a0562140dab00b004645a56fba3mr11112461qvh.107.1654107296182; Wed, 01 Jun 2022 11:14:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107296; cv=none; d=google.com; s=arc-20160816; b=bW7FaYbeVBJ+hWPnXR37e8hlaHAob84MXOF4PmM0cxKylvxr+B6yEs0IOSpCISUoi2 FbLZ2v9jJ45bOGFWi5VFpWWQ7ARBLjypig6wh0uxNhNKtwpMOhPkymNRcSF9s5w9I38N rfdkKQ/aAIFWDyEU2Hk5JLCs75LcTCHzQ+6c4ILqNVNh82pGn8NimO7L2K+WdTlgFE3R r1ctToqqKsKs56qLbhMOr2g6v0cgRe/754hqn4lFo3IK/8frwXrx0u4Bxwo8L0BE1G4m 6Au09nZL604q3HXTRDrc9PlQCzDEu+xeGOrZx4O+jLFeFd4sVQ9pidPKFmBOjNn7ePd5 fHsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=XyOIPduSP6mWZwGS3Z+Ma1uowcWemZ8L6d4bwTuU7ig=; b=Z7clHHSWMA2TN4koZJyDgHdDhNTFfpwkuNzPbsRRqIjmrDqJjeU8mKgL5I/i7c9dru WMLKsBiaAbYJG15sOWhvmNbHqaz5L+pch0NWis4flyeIm30bDeXtACqXeDqJw7c3JQg/ dLRV1Fdbw7FXfQc5HGRY9TaCmDamGt4npngBtOpnxR6NeYjGnCkvfANHHu5MSyi8tOF6 uw9o6Whba9HOKz4GP621FFQPuuMrKMX2DVT66srLuzfGHnA1ACTVwJMoWQoZ9XSpHs2I hZwEt/oONXWvJLc10V5bBSq6EEmyg21W/OTb0Q2jto2OYjF+sHbsZDdRnhAxLf7zdjoy P3dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xsd7TfeV; 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=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 kc2-20020a056214410200b0046435854368si937107qvb.93.2022.06.01.11.14.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:14:56 -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=pass header.i=@linaro.org header.s=google header.b=Xsd7TfeV; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSrv-0001oG-OW for patch@linaro.org; Wed, 01 Jun 2022 14:14:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSr6-0001h7-91 for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:04 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]:37603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSr1-0006XT-QB for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:03 -0400 Received: by mail-ej1-x62f.google.com with SMTP id rq11so5429374ejc.4 for ; Wed, 01 Jun 2022 11:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XyOIPduSP6mWZwGS3Z+Ma1uowcWemZ8L6d4bwTuU7ig=; b=Xsd7TfeVzHOuE+pILtMj2Yc06jMzg9xBHHBvlnxg9cteicMyWgGcRsphC01d+8rvIn ptMNhmpfBvvjz28CSXyTsBTM8KPVH9fM3Giwc+7vbxq/wQQ3LW07TJwuVRv/z6tKDQYl Y1CcYbi2WyGGoh6F9xez1DX+Xds7tYqym349sF/OFQlfGYLVcDvZx4jaTV8jN7SGU001 zM3zOFypiN/hdr3QzK7w7CzNux9oO9Q5q9+ZQQYPJ/h1BHL6lR0HERIWKSH0zBcFn5Ii QeUrlGk1xysMoOS/tDyQ25NWn3lCKywVX74RxwgZ8mbPigposQcaKtpxKi4G6XnDQjai EFMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XyOIPduSP6mWZwGS3Z+Ma1uowcWemZ8L6d4bwTuU7ig=; b=rxCt46fVlzqIfPptywjKFzwvr8yv9Z9vjxcV3//Hcgl144oKvJBQ9iOUaKkfgJ1kv5 rnm9Ufh+G9ocbTbPl6QD6TyC8ASYyIGzk6ScM6ftrOaSBH0RkP0ekZctEdywpahWinqc Az1Ik1OGhUgNZ1FMl7Smw1MZWEXJKquKAVj2qgKOaHzgaPVHPQNhgoVw1mz+5VBib2RP eTeu2uqdN8NIUUpqnOoYEogKj3LSia5t1AwtGDpWofEJgA5Ry3xAlRhktpyftlkkd1YQ psqA8ifDB/NAXBIxgO3urNToF9E02H4dzvpLjhm/s0B2qkoA2uV8/F8pwfNsULbb42Zd MUPA== X-Gm-Message-State: AOAM531Dc5MWk3mLpiB7nDr7mWQ1g0IoyF0HQHY+BBetJdArati+GA4j m/3/V/1VFUzfYKXSRMPNjZ/Yiw== X-Received: by 2002:a17:907:9714:b0:6ff:338f:b4d7 with SMTP id jg20-20020a170907971400b006ff338fb4d7mr738417ejc.718.1654107238090; Wed, 01 Jun 2022 11:13:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id fx10-20020a170906b74a00b00708743e31b2sm645939ejb.27.2022.06.01.11.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:13:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 174541FFC6; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , John Snow , Cleber Rosa Subject: [PULL 14/33] build: add a more generic way to specify make->ninja dependencies Date: Wed, 1 Jun 2022 19:05:18 +0100 Message-Id: <20220601180537.2329566-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Let any make target specify ninja goals that needs to be built for it (though selecting the goals is _not_ recursive on depending targets) instead of having a custom mechanism only for "make check" and "make bench". Signed-off-by: Paolo Bonzini Message-Id: <20220517092616.1272238-4-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-15-alex.bennee@linaro.org> diff --git a/Makefile b/Makefile index fad312040f..3c0d89057e 100644 --- a/Makefile +++ b/Makefile @@ -145,8 +145,7 @@ NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \ $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \ -d keepdepfile ninja-cmd-goals = $(or $(MAKECMDGOALS), all) -ninja-cmd-goals += $(foreach t, $(.check.build-suites), $(.check-$t.deps)) -ninja-cmd-goals += $(foreach t, $(.bench.build-suites), $(.bench-$t.deps)) +ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g)))) makefile-targets := build.ninja ctags TAGS cscope dist clean uninstall # "ninja -t targets" also lists all prerequisites. If build system diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 304634b71e..0fe81efbbc 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -81,12 +81,12 @@ def emit_prolog(suites, prefix): def emit_suite_deps(name, suite, prefix): deps = ' '.join(suite.deps) - targets = f'{prefix}-{name} {prefix}-report-{name}.junit.xml {prefix} {prefix}-report.junit.xml' + targets = [f'{prefix}-{name}', f'{prefix}-report-{name}.junit.xml', f'{prefix}', f'{prefix}-report.junit.xml', + f'{prefix}-build'] print() print(f'.{prefix}-{name}.deps = {deps}') - print(f'ifneq ($(filter {prefix}-build {targets}, $(MAKECMDGOALS)),)') - print(f'.{prefix}.build-suites += {name}') - print(f'endif') + for t in targets: + print(f'.ninja-goals.{t} += $(.{prefix}-{name}.deps)') def emit_suite(name, suite, prefix): emit_suite_deps(name, suite, prefix) From patchwork Wed Jun 1 18:05:19 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: 577833 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp870340mab; Wed, 1 Jun 2022 11:44:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7qwfAE4QTzk0pmhVopUiGBU3ORlJlIpf6vYbfq+5HtlDfmJeraORTFwpRqDSUue3Zi0xW X-Received: by 2002:ac8:5c94:0:b0:304:c37f:422e with SMTP id r20-20020ac85c94000000b00304c37f422emr880635qta.531.1654109078757; Wed, 01 Jun 2022 11:44:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654109078; cv=none; d=google.com; s=arc-20160816; b=KuzB7B2j7+M8cgyYBT3XDwwRUhcuKkldvJOzL4WhwPDVrnW4wehURjTxGVwEVb3TsR b0/arxIvH9FyfRtX6DtJIkH40Pl+sGUSjapeJ+Ce8h65jGUeMH4RrG9+HSxs7eLEP0uX 2BOYBKz+v/JZI9A0FddFwXnnQuibYALhlwG/OKO7I/imkMPmVew1I22EfFlfJxVgg/oV PesgPTrsIjOOZ/SheUorUIpHNFBpxdjjwcz0e+X3CQ2t+/Yrd0M1ttC/iZ+mrUh7LmDA bkn8w5g0Dye4d6UX8WaQ7CniOdpqb0ds0soKORv5yt/cAjZ2tsZieopKz39B+luN/ojD 6www== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=yTa/0uzEfkkhXOiW6+OjBAouplG1hHJ7qPwoee6Vum4=; b=U7FfOMYRnqT0g+kUx0DVl9E/WOPTi07pG2CpZANW4DWGMCjqoFeFrdMg+X3RrfTWKX 0cHGHfyYQiMnQybzWxeUZXW2Q8cJqqTmmPdVHcgCBLJOTUtd1uaYDcbEP1XERVHpc+bo mtVRXZx2Xw/ZoKOJMBHrZ0eBzrcxO/IxeuAzWYJ05AIYj24xzT+f5sBHerj9zzbTd8Ji JQl2J5yt+rOivJwb0aWGSx1H4l7JYIDLMU1FNJyST4w4WV1mkbB+sm2zgfUx2o6dng1Y 7fmlb4O0tyFqh3sjHqJn4qpOyiQHf949Vx7SPS8LwFHE9ZyBtkUwtrO1iGZZXmdHx6ss 8hlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="gDLJy/Xx"; 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=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 c6-20020a05620a268600b006a3742b126csi1475727qkp.299.2022.06.01.11.44.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:44:38 -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=pass header.i=@linaro.org header.s=google header.b="gDLJy/Xx"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwTKg-0001zD-Bt for patch@linaro.org; Wed, 01 Jun 2022 14:44:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSrO-0002bg-Dp for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:22 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:41613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSrM-0006bx-Oc for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:22 -0400 Received: by mail-ej1-x62a.google.com with SMTP id u12so5401683eja.8 for ; Wed, 01 Jun 2022 11:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yTa/0uzEfkkhXOiW6+OjBAouplG1hHJ7qPwoee6Vum4=; b=gDLJy/XxCGQUw9tiWrK0jfpKwzn0gMMN5JpCX0jcFuW+EDZPP0sgYUHzH5ff7PlC+o NeY3Xel9aO+0861ea92jDs5Xl+XZxSZ/C1iahICGBCsn2dofmjdFoXRUK8CgRq/ScACQ s4MNCuNj1o0OOkyxiZ6qxs8EQyCVCmTqWcMOCu2tWV0zyAJyCNb49KDic27oG8pc2tJV HHIQdGyzexggYXkyL8kW8NeL9YqkrPvWs6MWb0nMmUn5jWwsTyhPytV57m3tShCMqG1X MZD/Q31RSIQM8VSdik+UQWQrXEXXdI1/6LwJQ//4AEcGjRre4FOsIlweH3dCyGvtiKzP JY/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yTa/0uzEfkkhXOiW6+OjBAouplG1hHJ7qPwoee6Vum4=; b=zq5L73loOO2Y0ezwBSahZ/gF/99H5nb/tziRQajvRPdrhlb0aPbrlUcXmNjcQFrHtW IGF3m+GI4zdeo1TW4HRMS5AOgJyV/7B5YZV5il1PuniM+VBh2f59O1ArwgzRAAbFkczA JZr0QES9WmLNRH6miJDD5iYEfq0kDhmCZpgWdPgCLPETbmX3FfVhYCTrXXIhJZBKE0qv kPuMe8vxpWXVwKXYgAZD/guU1EtyGD6aaYH4cM2+Mj6U/io4k+yafL7fKvY/jga2tUZE X6nU31dDi72A/TCJ/6M/0OSx1JV+Ihf2Au0V+2U2MS2SwwIGDkPuZjVUYlUKPnfkNIpr AwlQ== X-Gm-Message-State: AOAM531h3ezys1+guX1LKlo6NfTgliZEciAOsFPFsKgXXfuEaT9QcBJC sGZT7EzUJ6W3K2PnpTSxpJMLgg== X-Received: by 2002:a17:906:6a21:b0:704:1440:1bf9 with SMTP id qw33-20020a1709066a2100b0070414401bf9mr738658ejc.500.1654107259434; Wed, 01 Jun 2022 11:14:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id bv3-20020a170906b1c300b006f3ef214ddesm984139ejb.68.2022.06.01.11.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:14:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2C34E1FFC7; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 15/33] build: do a full build before running TCG tests Date: Wed, 1 Jun 2022 19:05:19 +0100 Message-Id: <20220601180537.2329566-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini TCG tests need both QEMU and firmware to be built, so do "ninja all" before trying to run them. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Message-Id: <20220517092616.1272238-5-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-16-alex.bennee@linaro.org> diff --git a/tests/Makefile.include b/tests/Makefile.include index ec84b2ebc0..72ce0561f4 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -57,7 +57,7 @@ $(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/ "BUILD","$* guest-tests") .PHONY: $(TCG_TESTS_TARGETS:%=run-tcg-tests-%) -$(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-% $(if $(CONFIG_PLUGIN),test-plugins) +$(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-% $(call quiet-command, \ $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \ TARGET="$*" SRC_PATH="$(SRC_PATH)" SPEED=$(SPEED) run, \ @@ -74,6 +74,7 @@ $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%: build-tcg: $(BUILD_TCG_TARGET_RULES) .PHONY: check-tcg +.ninja-goals.check-tcg = all $(if $(CONFIG_PLUGIN),test-plugins) check-tcg: $(RUN_TCG_TARGET_RULES) .PHONY: clean-tcg From patchwork Wed Jun 1 18:05:20 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: 577799 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp839208mab; Wed, 1 Jun 2022 11:07:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvYdoxh6I42MdTpmjsfvfX+J2J9N66Z97KGLJySLh8AGCK6McHuTvRDAPTXI0FsyDwmV/4 X-Received: by 2002:a05:620a:2481:b0:6a5:7184:ec5 with SMTP id i1-20020a05620a248100b006a571840ec5mr582140qkn.117.1654106827926; Wed, 01 Jun 2022 11:07:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654106827; cv=none; d=google.com; s=arc-20160816; b=H5rTQfA6W0v244ZAiPcteL/rm9t/RM35CMNoXZWRtnfxP0iFAJNajsO2iveRewAglZ TmVmDUv9LzKUwfEZcC2/bNMul6iwmjhvTZTSeM7R7hy4laTcERzt50QYKCMqRQ9ajd0n lOvODcBHcZ44LnRRUqIQ2NVD+tSiDsvfxh1Bj3Vh9SW92mNPBRgQqa1Vh7ugLDewYCjL BtUuSA1zhjc7JlnEWMrTSP5iodhPrpP23iKwfDNSFph73kQPRYCGspE6nuk/CKHhQD0L kFVjquf9fY4iCq8hg9wyFsgen3Frm0NYktwsXmdcnaVTv/GBM/gjbKyH3/oa/54nOg6v L6IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=mwQ8fEIX4rzlWWy6Fnjhic1Pl6r2YJjXocJFFOMURaY=; b=JrIVCDpwXthclK5vfiOQA0hTRNHlqSbDXXS0xnCBedTfsK7GWb56w2ablyP+g1X2EF i5ZvXS4tgOVcuHL+3RVP7UT7aVAGMdZxhAvWNNM3uD+r8G1e1Lc7ZHwssVQAzNu0QaRU FXtFzliwtFyTTgJlUtyse5MID+5+m9jsP1j7ue2Xuc+pdWg2ety8lrI+wAoIT+r2ayN0 i+PGrRZmNggdMqdMbCFwvKzejISLiff9l0wlUBCSSEBLmdX7WgXPGir+6A59r2OkgdSj 7p80emcYMFtK89McyOmKQSFkXXvJevVJck+trwInY7D0U/op/+qlpcUmtLKkM1M4Z83e 8juw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oXXNjmZ0; 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=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 2-20020a056214202200b00461b52e0c5dsi1189531qvf.328.2022.06.01.11.07.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:07:07 -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=pass header.i=@linaro.org header.s=google header.b=oXXNjmZ0; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSkN-0001Ev-HO for patch@linaro.org; Wed, 01 Jun 2022 14:07:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjJ-0001CF-35 for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:06:01 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:33589) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSjH-0004xf-Ax for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:06:00 -0400 Received: by mail-ed1-x530.google.com with SMTP id h19so3311480edj.0 for ; Wed, 01 Jun 2022 11:05:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mwQ8fEIX4rzlWWy6Fnjhic1Pl6r2YJjXocJFFOMURaY=; b=oXXNjmZ0XqglSYC28mz5QlsamdboJVnsrHP7ueKM+n+m3ekdNiB4BKhq0gBATLPcEL mNpSH4YK+eJzKmnNbp7nS1eQxRB5fLtMhNgvux60uraJAnbSoZMcMoIHVqJ+Jsc0TJU2 FXFwYGkzcPxuzky7Dgugm/LdKt9tfQ7ea8jwwGNVMIV0UuttCtXJPwrqMwCPbqfPtT1T RCUlZo/krnTv1m+zzYzTIGembFqavQpYS4keBoRvHQ5H2aQV1fHaVQFXxDuEB1mqhuxp jQMDHWAeYo9roFV4AKHlT4iXIK0XHXg2OIhuGOJglJe5Pl8KQYYLv8TQ9KfzQ34iqrjU nRog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mwQ8fEIX4rzlWWy6Fnjhic1Pl6r2YJjXocJFFOMURaY=; b=NmU8kJcC78QN89btY5thB7ZwiC469TdZPxmVG9c4cPxW/ZXrN+oyfQPEHDWuQyyQ4A v5ZRRdk63GKaZMa2zUaUmh/0UoFF/AKoKWDGjYse5IT0Fv/Yb/fSmwf3e7lLJFyYF/78 05OL/wnRrSpnLEh6D5H00gIbq/q4My1YKtAQLfs0JMONH77i6IdkfUrjRP9TGSCJCZzN ZTEF766829220AH/pfJM1ZYnyY1FWlwI6rotO0pnSJauIv8V+bqPrJj4NOMFY/o+RO9w MPNcsLnpwtwVTcrK5pIFS+VASAfW+fwC2dM7IoGRYATrPerrr60OzN+hE/etXkEEFgQs /MHQ== X-Gm-Message-State: AOAM530/QkyVbv0FhZKM//SRrdR61CJJv9AuCtEma7qGYyGAXJ9rnLP7 CMzWM2FmxUPTzD9IKsaKKl53Rg== X-Received: by 2002:a05:6402:22eb:b0:42d:d578:25d9 with SMTP id dn11-20020a05640222eb00b0042dd57825d9mr1067780edb.310.1654106758604; Wed, 01 Jun 2022 11:05:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b2-20020a17090636c200b00705fa7087bbsm984959ejc.142.2022.06.01.11.05.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 39C7D1FFC8; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 16/33] configure, meson: move symlinking of ROMs to meson Date: Wed, 1 Jun 2022 19:05:20 +0100 Message-Id: <20220601180537.2329566-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini This is useful because pc-bios/meson.build already has a list of all ROM files, and thus does not need to use wildcards. The problems with wildcards are mentioned above the definition of the LINKS variable, but then the recommendation is disattended. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini Message-Id: <20220517092616.1272238-6-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-17-alex.bennee@linaro.org> diff --git a/configure b/configure index c88ef94fec..7b6adc29fe 100755 --- a/configure +++ b/configure @@ -2100,21 +2100,6 @@ LINKS="$LINKS tests/avocado tests/data" LINKS="$LINKS tests/qemu-iotests/check" LINKS="$LINKS python" LINKS="$LINKS contrib/plugins/Makefile " -for bios_file in \ - $source_path/pc-bios/*.bin \ - $source_path/pc-bios/*.elf \ - $source_path/pc-bios/*.lid \ - $source_path/pc-bios/*.rom \ - $source_path/pc-bios/*.dtb \ - $source_path/pc-bios/*.img \ - $source_path/pc-bios/openbios-* \ - $source_path/pc-bios/u-boot.* \ - $source_path/pc-bios/palcode-* \ - $source_path/pc-bios/qemu_vga.ndrv - -do - LINKS="$LINKS pc-bios/$(basename $bios_file)" -done for f in $LINKS ; do if [ -e "$source_path/$f" ]; then mkdir -p `dirname ./$f` diff --git a/pc-bios/meson.build b/pc-bios/meson.build index c86dedf7df..41ba1c0ec7 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -23,7 +23,7 @@ if unpack_edk2_blobs endforeach endif -blobs = files( +blobs = [ 'bios.bin', 'bios-256k.bin', 'bios-microvm.bin', @@ -83,11 +83,18 @@ blobs = files( 'npcm7xx_bootrom.bin', 'vof.bin', 'vof-nvram.bin', -) +] -if get_option('install_blobs') - install_data(blobs, install_dir: qemu_datadir) -endif +ln_s = [find_program('ln', required: true), '-sf'] +foreach f : blobs + roms += custom_target(f, + build_by_default: have_system, + output: f, + input: files('meson.build'), # dummy input + install: get_option('install_blobs'), + install_dir: qemu_datadir, + command: [ ln_s, meson.project_source_root() / 'pc-bios' / f, '@OUTPUT@' ]) +endforeach subdir('descriptors') subdir('keymaps') From patchwork Wed Jun 1 18:05:21 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: 577811 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp850391mab; Wed, 1 Jun 2022 11:19:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzab4Q+m2a3BWJnXFDZ2mzMfDCeMfrEAfJ90z9tUHCKASqjgErvGiEyhjM3RxOwEosYU5xh X-Received: by 2002:a05:622a:547:b0:2f9:1e08:1217 with SMTP id m7-20020a05622a054700b002f91e081217mr814410qtx.417.1654107599259; Wed, 01 Jun 2022 11:19:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107599; cv=none; d=google.com; s=arc-20160816; b=sWTMwKnAUOO629VGs8rSo7tlEx5xofH4QlwTEe3wEMvLyz6cdXn8ogprcmpS29/lD4 yhrUeLU/ATJXUAaXSXU6GbEMnBU97Muo5K7zU/SAPwN+dOxk7f9INsjeAyBXRL9MuPnb vvLsEfPBV+cSLdfMNMBoLMvTaOpCAXTlqXmqfg2/N8+7DlcuaJfBNlu07oYR7g74x8pz wW4OTZicjWWLjRuEtL38ELIjK1b5PgGy8fYqwMGtjwVpv+4yR6cOaQYP6Wl2asJeCuyN mHWvT0HsyFwIuVTptnuEZ29XAHHKL5hVQ8eBWYMJxxZ+eraDFdxMvpMcQDPDoXKzHwyy VM1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=i26F3+Q0n/BReGHdGsgVZCatwKSaPTC4hSNsalSbC6U=; b=LxBeNG3/PdmrmyCQkrXW1HxgKbn0qPARECJ+oBjf0/KB5UL7VfFmNTwpFCLLvHDax2 pV21d7ZTP0fbTbV5Kh6TrXEdFvzeirF7SR/qhcJ0hsC3jhHUt7w8+iKm5uiDe1pjb8xA 3//kp9EcrD9wHoCQ9/hHZs2+wD8xJOg9LSKrUbaS11VBOozFpFtSq5xSC3CiL3PVzrbV 0V+V8i+nZrP6/cvgMpZ0oRfKNmxGpLjGr4RwUkc4lri8azyuSgTLpDkEFWrQPgdn2oUo nRjvnkREr0jR5mTu2PN5ZlM/CGhpFxcMqYb53k/kXjaU3g4wjrLJ9jQtPhqbyfq62RRC N3wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mw3uhgR7; 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=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 8-20020a0562140cc800b004634f3f9f8csi1264940qvx.253.2022.06.01.11.19.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:19:59 -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=pass header.i=@linaro.org header.s=google header.b=mw3uhgR7; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSwo-0006hL-HO for patch@linaro.org; Wed, 01 Jun 2022 14:19:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSrE-00022D-3p for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:12 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:37674) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSrC-0006aQ-3W for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:11 -0400 Received: by mail-ed1-x52c.google.com with SMTP id v19so3302427edd.4 for ; Wed, 01 Jun 2022 11:14:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i26F3+Q0n/BReGHdGsgVZCatwKSaPTC4hSNsalSbC6U=; b=mw3uhgR7gjbGfSOaMXVQ4pDtmmy9AP2yQlKsvAvYsSQJcYA04J1fXEWg9HKDpx689m C20AE8AegZ8rMQxBl2CIDFJQRsieHUrKXZq4kTJq8lcTC9sgL9j1VOLk3pyYNsang7x0 H2f0ImlljOPvEDnTr8bOnZSAO3JtD9RF1d2PnmUGu/wD7dhAMVf6R3Qox66wb4tXgMqx exc1PwSJXA3/c9EhoDZjzyUHEVV5F0mJqmfFKqkWVuPpe5hAHS5zyTyiSp2RVBIN6I/I 4rtYKNczOFCF7WU0UQqR77a6LJLhOpXp+PJQnON4MCGSoCfHfdLQhLapoT9+t/2hDtCB 5jCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i26F3+Q0n/BReGHdGsgVZCatwKSaPTC4hSNsalSbC6U=; b=glbR591u4QImgvz1O/KSSxqfPhgop8fp0Fg9B12M5ZKISID00vqMMFOZRGW1rTHYhq Uol092N1bBz7e9NVgOk02NusRD1I26d8ZDr/w0dWdW98tpoljee8jv6MY2x4hT74XRlg OmWJ30aLsEpmqV0LpoIoMLx4TKXbbC3t4oaKG53voZ+8VTzaDQoKcTGLPrpADupSeB6t MM5t/Xig6fgWOtBWr/ef/NoKkH/QO1dNxeKAWMHtO0Bfa+HabpPR/1KVtmN1hjwXGhhg nNSTPpcM45Vi8kaODlDnwUIXFeeM2PZN8HgZvfoGjyHlRBkNcOapZmuilQ3EU3OFDqf0 R5Xg== X-Gm-Message-State: AOAM533Jx7WBC/vKwKlO5aPWvPKk6LzwlYPMNR9Xz6CpFe0t6UFezciH 77v+eIyKeNt2SR4KCNjIuty3wQ== X-Received: by 2002:aa7:cac7:0:b0:42a:b00a:eeb2 with SMTP id l7-20020aa7cac7000000b0042ab00aeeb2mr1128637edt.60.1654107248466; Wed, 01 Jun 2022 11:14:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r11-20020aa7d58b000000b0042df0c7deccsm1296475edq.78.2022.06.01.11.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:14:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4EC781FFC9; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 17/33] tests/tcg: correct target CPU for sparc32 Date: Wed, 1 Jun 2022 19:05:21 +0100 Message-Id: <20220601180537.2329566-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini We do not want v8plus for pure sparc32, as the difference with the V8 ABI are only meaningful on 64-bit CPUs suh as ultrasparc; supersparc is the best CPU to use for 32-bit. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Message-Id: <20220517092616.1272238-7-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-18-alex.bennee@linaro.org> diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 691d90abac..59f2403d1a 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -70,7 +70,7 @@ fi : ${cross_cc_riscv64="riscv64-linux-gnu-gcc"} : ${cross_cc_s390x="s390x-linux-gnu-gcc"} : ${cross_cc_sh4="sh4-linux-gnu-gcc"} -: ${cross_cc_cflags_sparc="-m32 -mv8plus -mcpu=ultrasparc"} +: ${cross_cc_cflags_sparc="-m32 -mcpu=supersparc"} : ${cross_cc_sparc64="sparc64-linux-gnu-gcc"} : ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"} : ${cross_cc_x86_64="x86_64-linux-gnu-gcc"} From patchwork Wed Jun 1 18:05:22 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: 577818 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp855704mab; Wed, 1 Jun 2022 11:26:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTOYUPtLiSC1xBYNC8LssDmC/gGzLNyYNtYKj1+U6OvtnqqZcsVoGAerPheQcgoSf27+HV X-Received: by 2002:a37:8701:0:b0:6a5:ff4f:b2bc with SMTP id j1-20020a378701000000b006a5ff4fb2bcmr673975qkd.584.1654108016285; Wed, 01 Jun 2022 11:26:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654108016; cv=none; d=google.com; s=arc-20160816; b=X2S12VNiLXp32bT47l769LjMW9royFeWd5k8CCUJZ3TcciIQmaoiq1LGilb6gzrCTe u7OC+w0VPtqm4Ql4nGtyfZ+nFU+maKpk+1Y5LigJdDMNR9VEQ+6VPharekIoEuxWGd8E VdmmiAxU5lIP/2K0ENf6Vm06THb4Fd04Tj5SFoUbLcPz9ne+8giYBVOc/hRX/NIEvokm FvhqpL19L7gyTIcEqfLjPrGpMuUbfmcj9+wHvLDO57nUZXBNt55UbjXRxoOOEBQEm+HI 7RaHEmH2zpYfsPSm+WxImZMPIF6DJvOwMRmxILr8A47YkP31fCUWD+qHnB7HLbZf/Jpg +DSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=n70Mv7op54AEJELXZi3Jvkr/AjZhWQkapqD6RoMJhCM=; b=0YGa8VZx1try+Zj1SqCzkken+TFWUinfhrIe30lkRlFVnL3XFnwPXfoGmG5ovkuvIS RomIwYtMj4taE3GD+uCNx5IJsFpOM+v2KK2zBD/2cLU/dYAuOCKrZXMVmoIG5nj7r05C gcpx9Y54Xur9Z8dLovujVzhL8PaUvL06Nix0j3/jMJYf1UbkueGeLtP4ptxj9wQZUUwU GrQMp2qLj5Jd7GfB9j7uHbvKbNFCV2nzN7aWK4faSqIsGt0RbGTngwP0sxkBux79Zx4p 3X7c51A6UVTQrRTWRpG4FhwGZ4X37vOjXjL8Vw5dpiKkJtEjce9/esAi8py2J4fimHeY ktPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yT+qkEF3; 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=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 i2-20020ac871c2000000b00304c2607723si1096199qtp.586.2022.06.01.11.26.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:26:56 -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=pass header.i=@linaro.org header.s=google header.b=yT+qkEF3; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwT3X-0005kS-RY for patch@linaro.org; Wed, 01 Jun 2022 14:26:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSrA-0001tB-Df for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:08 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:42636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSr7-0006ZQ-3M for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:08 -0400 Received: by mail-ed1-x532.google.com with SMTP id n28so3282225edb.9 for ; Wed, 01 Jun 2022 11:14:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n70Mv7op54AEJELXZi3Jvkr/AjZhWQkapqD6RoMJhCM=; b=yT+qkEF3806Mla++/0o6slmQ1YV3x3Zke8PGsPFjuYTkesk1IhH6ubh7Y7T5TWBTgP zorDsP9tnopOm+r4vEPxoxPThm9m5dkN7nBt72QD2x3aaMyZU8wXAeOXiF3IDMkTMwQa 0dScCcMiBBbay0Tcz4kvu6ZWSy4aX+3FE2gZ9JtulmXCbM/ihY3i7HlzjYEi9FSMEoBu JwLK+f9edbJ57xDSKOJKErAM9J2wfhMKbuBpjnkt6WLVCmHKEaQWcmfEWhzkWJ+mvlY6 etbiX+QnfaGTTVPvpGul79xVnWnqvmez1lOdne5LjDYjclwReQ+t6tddukmpgLGKHzxk s/Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n70Mv7op54AEJELXZi3Jvkr/AjZhWQkapqD6RoMJhCM=; b=4EZLa7AinjwNwji1qYkKuz6ZBIQaCbmaFeuv1mMp0DE0Hpf9cwHMqaIVnk84lYW36+ doXIlWAmpuU0c02miJB+MoKFeLAmohPFJOWKCL7iKhJpnxVVcoDVY4xQ7UO/6YVeTMjn bZvp/w0VCs324WUxtJS1T47UGCdcKTNinxALWb+1sGRnUl0tBiTjKs9TNS6767nw/gWZ a/l15uqibMUAX0ZqA0fhXg9TqZJg2i/a9TDwqIZpHacDvdfQJYo1Mm+JiIkNCTN4M3// KiKSr/cvtZk/SXimtCv17sdwWHnCr3C3HkA7A5MccN/fcaVsJTQxWkkzHMVoPRenclAy 3GEg== X-Gm-Message-State: AOAM532KHMgUGCt0HIjdeiIEGiC3BYhBqtGzxpU9DOQaWGKgZQo4bb6B 3+RB3mzXqZLaCy/6j4FswqW8jQ== X-Received: by 2002:a05:6402:26d5:b0:42d:e827:3980 with SMTP id x21-20020a05640226d500b0042de8273980mr1086545edd.61.1654107243538; Wed, 01 Jun 2022 11:14:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f22-20020a1709067f9600b006f3ef214db6sm967459ejr.28.2022.06.01.11.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:13:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 66A991FFB7; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 18/33] tests/tcg: merge configure.sh back into main configure script Date: Wed, 1 Jun 2022 19:05:22 +0100 Message-Id: <20220601180537.2329566-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x532.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini tests/tcg/configure.sh has a complicated story. In the beginning its code ran as part of the creation of config-target.mak files, and that is where it placed the information on the target compiler. However, probing for the buildability of TCG tests required multiple inclusions of config-target.mak in the _main_ Makefile (not in Makefile.target, which took care of building the QEMU executables in the pre-Meson era), which polluted the namespace. Thus, it was moved to a separate directory. It created small config-*.mak files in $(BUILD_DIR)/tests/tcg. Those were also included multiple times, but at least they were small and manageable; this was also an important step in disentangling the TCG tests from Makefile.target. Since then, Meson has allowed the configure script to go on a diet. A few compilation tests survive (mostly for sanitizers) but these days it mostly takes care of command line parsing, looking for tools, and setting up the environment for Meson to do its stuff. It's time to extend configure with the capability to build for more than just one target: not just tests, but also firmware. As a first step, integrate all the logic to find cross compilers in the configure script, and move tests/tcg/configure.sh back there (though as a separate loop, not integrated in the one that generates target configurations for Meson). tests/tcg is actually very close to being buildable as a standalone project, so I actually expect the compiler tests to move back to tests/tcg, as a "configure" script of sorts which would run at Make time after the docker images are built. The GCC tree has a similar idea of doing only bare-bones tree-wide configuration and leaving the rest for Make time. Signed-off-by: Paolo Bonzini Acked-by: Richard Henderson Message-Id: <20220517092616.1272238-8-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-19-alex.bennee@linaro.org> diff --git a/configure b/configure index 7b6adc29fe..f91ac632e7 100755 --- a/configure +++ b/configure @@ -109,6 +109,20 @@ error_exit() { } do_compiler() { + # Run the compiler, capturing its output to the log. First argument + # is compiler binary to execute. + local compiler="$1" + shift + if test -n "$BASH_VERSION"; then eval ' + echo >>config.log " +funcs: ${FUNCNAME[*]} +lines: ${BASH_LINENO[*]}" + '; fi + echo $compiler "$@" >> config.log + $compiler "$@" >> config.log 2>&1 || return $? +} + +do_compiler_werror() { # Run the compiler, capturing its output to the log. First argument # is compiler binary to execute. compiler="$1" @@ -142,15 +156,15 @@ lines: ${BASH_LINENO[*]}" } do_cc() { - do_compiler "$cc" $CPU_CFLAGS "$@" + do_compiler_werror "$cc" $CPU_CFLAGS "$@" } do_cxx() { - do_compiler "$cxx" $CPU_CFLAGS "$@" + do_compiler_werror "$cxx" $CPU_CFLAGS "$@" } do_objc() { - do_compiler "$objcc" $CPU_CFLAGS "$@" + do_compiler_werror "$objcc" $CPU_CFLAGS "$@" } # Append $2 to the variable named $1, with space separation @@ -345,11 +359,9 @@ for opt do ;; --cross-cc-cflags-*) cc_arch=${opt#--cross-cc-cflags-}; cc_arch=${cc_arch%%=*} eval "cross_cc_cflags_${cc_arch}=\$optarg" - cross_cc_vars="$cross_cc_vars cross_cc_cflags_${cc_arch}" ;; --cross-cc-*) cc_arch=${opt#--cross-cc-}; cc_arch=${cc_arch%%=*} eval "cross_cc_${cc_arch}=\$optarg" - cross_cc_vars="$cross_cc_vars cross_cc_${cc_arch}" ;; esac done @@ -944,7 +956,6 @@ esac if eval test -z "\${cross_cc_$cpu}"; then eval "cross_cc_${cpu}=\$cc" - cross_cc_vars="$cross_cc_vars cross_cc_${cpu}" fi default_target_list="" @@ -1800,6 +1811,248 @@ case "$slirp" in ;; esac +########################################## +# functions to probe cross compilers + +container="no" +if test $use_containers = "yes"; then + if has "docker" || has "podman"; then + container=$($python $source_path/tests/docker/docker.py probe) + fi +fi + +# cross compilers defaults, can be overridden with --cross-cc-ARCH +: ${cross_cc_aarch64="aarch64-linux-gnu-gcc"} +: ${cross_cc_aarch64_be="$cross_cc_aarch64"} +: ${cross_cc_cflags_aarch64_be="-mbig-endian"} +: ${cross_cc_alpha="alpha-linux-gnu-gcc"} +: ${cross_cc_arm="arm-linux-gnueabihf-gcc"} +: ${cross_cc_cflags_armeb="-mbig-endian"} +: ${cross_cc_hexagon="hexagon-unknown-linux-musl-clang"} +: ${cross_cc_cflags_hexagon="-mv67 -O2 -static"} +: ${cross_cc_hppa="hppa-linux-gnu-gcc"} +: ${cross_cc_i386="i686-linux-gnu-gcc"} +: ${cross_cc_cflags_i386="-m32"} +: ${cross_cc_m68k="m68k-linux-gnu-gcc"} +: ${cross_cc_microblaze="microblaze-linux-musl-gcc"} +: ${cross_cc_mips64el="mips64el-linux-gnuabi64-gcc"} +: ${cross_cc_mips64="mips64-linux-gnuabi64-gcc"} +: ${cross_cc_mipsel="mipsel-linux-gnu-gcc"} +: ${cross_cc_mips="mips-linux-gnu-gcc"} +: ${cross_cc_nios2="nios2-linux-gnu-gcc"} +: ${cross_cc_ppc="powerpc-linux-gnu-gcc"} +: ${cross_cc_cflags_ppc="-m32"} +: ${cross_cc_ppc64="powerpc64-linux-gnu-gcc"} +: ${cross_cc_cflags_ppc64="-m64 -mbig-endian"} +: ${cross_cc_ppc64le="$cross_cc_ppc64"} +: ${cross_cc_cflags_ppc64le="-m64 -mlittle-endian"} +: ${cross_cc_riscv64="riscv64-linux-gnu-gcc"} +: ${cross_cc_s390x="s390x-linux-gnu-gcc"} +: ${cross_cc_sh4="sh4-linux-gnu-gcc"} +: ${cross_cc_cflags_sparc="-m32 -mcpu=supersparc"} +: ${cross_cc_sparc64="sparc64-linux-gnu-gcc"} +: ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"} +: ${cross_cc_x86_64="x86_64-linux-gnu-gcc"} +: ${cross_cc_cflags_x86_64="-m64"} + +# tricore is special as it doesn't have a compiler +: ${cross_as_tricore="tricore-as"} +: ${cross_ld_tricore="tricore-ld"} + +probe_target_compiler() { + # reset all output variables + container_image= + container_hosts= + container_cross_cc= + container_cross_as= + container_cross_ld= + target_cc= + target_as= + target_ld= + + case $1 in + aarch64) container_hosts="x86_64 aarch64" ;; + alpha) container_hosts=x86_64 ;; + arm) container_hosts="x86_64 aarch64" ;; + cris) container_hosts=x86_64 ;; + hexagon) container_hosts=x86_64 ;; + hppa) container_hosts=x86_64 ;; + i386) container_hosts=x86_64 ;; + m68k) container_hosts=x86_64 ;; + microblaze) container_hosts=x86_64 ;; + mips64el) container_hosts=x86_64 ;; + mips64) container_hosts=x86_64 ;; + mipsel) container_hosts=x86_64 ;; + mips) container_hosts=x86_64 ;; + nios2) container_hosts=x86_64 ;; + ppc) container_hosts=x86_64 ;; + ppc64|ppc64le) container_hosts=x86_64 ;; + riscv64) container_hosts=x86_64 ;; + s390x) container_hosts=x86_64 ;; + sh4) container_hosts=x86_64 ;; + sparc64) container_hosts=x86_64 ;; + tricore) container_hosts=x86_64 ;; + x86_64) container_hosts="aarch64 ppc64el x86_64" ;; + xtensa*) container_hosts=x86_64 ;; + esac + + for host in $container_hosts; do + test "$container" != no || continue + test "$host" = "$cpu" || continue + case $1 in + aarch64) + # We don't have any bigendian build tools so we only use this for AArch64 + container_image=debian-arm64-cross + container_cross_cc=aarch64-linux-gnu-gcc-10 + ;; + alpha) + container_image=debian-alpha-cross + container_cross_cc=alpha-linux-gnu-gcc + ;; + arm) + # We don't have any bigendian build tools so we only use this for ARM + container_image=debian-armhf-cross + container_cross_cc=arm-linux-gnueabihf-gcc + ;; + cris) + container_image=fedora-cris-cross + container_cross_cc=cris-linux-gnu-gcc + ;; + hexagon) + container_image=debian-hexagon-cross + container_cross_cc=hexagon-unknown-linux-musl-clang + ;; + hppa) + container_image=debian-hppa-cross + container_cross_cc=hppa-linux-gnu-gcc + ;; + i386) + container_image=fedora-i386-cross + container_cross_cc=gcc + ;; + m68k) + container_image=debian-m68k-cross + container_cross_cc=m68k-linux-gnu-gcc + ;; + microblaze) + container_image=debian-microblaze-cross + container_cross_cc=microblaze-linux-musl-gcc + ;; + mips64el) + container_image=debian-mips64el-cross + container_cross_cc=mips64el-linux-gnuabi64-gcc + ;; + mips64) + container_image=debian-mips64-cross + container_cross_cc=mips64-linux-gnuabi64-gcc + ;; + mipsel) + container_image=debian-mipsel-cross + container_cross_cc=mipsel-linux-gnu-gcc + ;; + mips) + container_image=debian-mips-cross + container_cross_cc=mips-linux-gnu-gcc + ;; + nios2) + container_image=debian-nios2-cross + container_cross_cc=nios2-linux-gnu-gcc + ;; + ppc) + container_image=debian-powerpc-test-cross + container_cross_cc=powerpc-linux-gnu-gcc-10 + ;; + ppc64|ppc64le) + container_image=debian-powerpc-test-cross + container_cross_cc=powerpc${1#ppc}-linux-gnu-gcc-10 + ;; + riscv64) + container_image=debian-riscv64-test-cross + container_cross_cc=riscv64-linux-gnu-gcc + ;; + s390x) + container_image=debian-s390x-cross + container_cross_cc=s390x-linux-gnu-gcc + ;; + sh4) + container_image=debian-sh4-cross + container_cross_cc=sh4-linux-gnu-gcc + ;; + sparc64) + container_image=debian-sparc64-cross + container_cross_cc=sparc64-linux-gnu-gcc + ;; + tricore) + container_image=debian-tricore-cross + container_cross_as=tricore-as + container_cross_ld=tricore-ld + ;; + x86_64) + container_image=debian-amd64-cross + container_cross_cc=x86_64-linux-gnu-gcc + ;; + xtensa*) + # FIXME: xtensa-linux-user? + container_hosts=x86_64 + container_image=debian-xtensa-cross + + # default to the dc232b cpu + container_cross_cc=/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc + ;; + esac + done + + eval "target_cflags=\${cross_cc_cflags_$1}" + if eval test -n "\"\${cross_cc_$1}\""; then + if eval has "\"\${cross_cc_$1}\""; then + eval "target_cc=\"\${cross_cc_$1}\"" + case $1 in + i386|x86_64) + if $target_cc --version | grep -qi "clang"; then + unset target_cc + fi + ;; + esac + fi + fi + if eval test -n "\"\${cross_as_$1}\""; then + if eval has "\"\${cross_as_$1}\""; then + eval "target_as=\"\${cross_as_$1}\"" + fi + fi + if eval test -n "\"\${cross_ld_$1}\""; then + if eval has "\"\${cross_ld_$1}\""; then + eval "target_ld=\"\${cross_ld_$1}\"" + fi + fi +} + +write_target_makefile() { + if test -n "$target_cc"; then + echo "CC=$target_cc" + fi + if test -n "$target_as"; then + echo "AS=$target_as" + fi + if test -n "$target_ld"; then + echo "LD=$target_ld" + fi +} + +write_container_target_makefile() { + if test -n "$container_cross_cc"; then + echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" + fi + if test -n "$container_cross_as"; then + echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" + fi + if test -n "$container_cross_ld"; then + echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" + fi +} + + + ########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -2107,11 +2360,136 @@ for f in $LINKS ; do fi done -(for i in $cross_cc_vars; do - export $i +# tests/tcg configuration +(makefile=tests/tcg/Makefile.prereqs +echo "# Automatically generated by configure - do not modify" > $makefile + +config_host_mak=tests/tcg/config-host.mak +echo "# Automatically generated by configure - do not modify" > $config_host_mak +echo "SRC_PATH=$source_path" >> $config_host_mak +echo "HOST_CC=$host_cc" >> $config_host_mak + +tcg_tests_targets= +for target in $target_list; do + arch=${target%%-*} + + probe_target_compiler ${arch} + config_target_mak=tests/tcg/config-$target.mak + + echo "# Automatically generated by configure - do not modify" > $config_target_mak + echo "TARGET_NAME=$arch" >> $config_target_mak + case $target in + *-softmmu) + test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || continue + qemu="qemu-system-$arch" + ;; + *-linux-user|*-bsd-user) + qemu="qemu-$arch" + ;; + esac + + got_cross_cc=no + unset build_static + + if test -n "$target_cc"; then + write_c_skeleton + if ! do_compiler "$target_cc" $target_cflags \ + -o $TMPE $TMPC -static ; then + # For host systems we might get away with building without -static + if do_compiler "$target_cc" $target_cflags \ + -o $TMPE $TMPC ; then + got_cross_cc=yes + fi + else + got_cross_cc=yes + build_static=y + fi + elif test -n "$target_as" && test -n "$target_ld"; then + # Special handling for assembler only tests + case $target in + tricore-softmmu) got_cross_cc=yes ;; + esac + fi + + if test $got_cross_cc = yes; then + # Test for compiler features for optional tests. We only do this + # for cross compilers because ensuring the docker containers based + # compilers is a requirememt for adding a new test that needs a + # compiler feature. + + echo "BUILD_STATIC=$build_static" >> $config_target_mak + write_target_makefile >> $config_target_mak + case $target in + aarch64-*) + if do_compiler "$target_cc" $target_cflags \ + -march=armv8.1-a+sve -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak + fi + if do_compiler "$target_cc" $target_cflags \ + -march=armv8.1-a+sve2 -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_SVE2=y" >> $config_target_mak + fi + if do_compiler "$target_cc" $target_cflags \ + -march=armv8.3-a -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak + fi + if do_compiler "$target_cc" $target_cflags \ + -mbranch-protection=standard -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_ARMV8_BTI=y" >> $config_target_mak + fi + if do_compiler "$target_cc" $target_cflags \ + -march=armv8.5-a+memtag -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_ARMV8_MTE=y" >> $config_target_mak + fi + ;; + ppc*) + if do_compiler "$target_cc" $target_cflags \ + -mpower8-vector -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak + fi + if do_compiler "$target_cc" $target_cflags \ + -mpower10 -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_POWER10=y" >> $config_target_mak + fi + ;; + i386-linux-user) + if do_compiler "$target_cc" $target_cflags \ + -Werror -fno-pie -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak + fi + ;; + esac + elif test -n "$container_image"; then + echo "build-tcg-tests-$target: docker-image-$container_image" >> $makefile + echo "BUILD_STATIC=y" >> $config_target_mak + write_container_target_makefile >> $config_target_mak + case $target in + aarch64-*) + echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak + echo "CROSS_CC_HAS_SVE2=y" >> $config_target_mak + echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak + echo "CROSS_CC_HAS_ARMV8_BTI=y" >> $config_target_mak + echo "CROSS_CC_HAS_ARMV8_MTE=y" >> $config_target_mak + ;; + ppc*) + echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak + echo "CROSS_CC_HAS_POWER10=y" >> $config_target_mak + ;; + i386-linux-user) + echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak + ;; + esac + got_cross_cc=yes + fi + if test $got_cross_cc = yes; then + mkdir -p tests/tcg/$target + echo "QEMU=$PWD/$qemu" >> $config_target_mak + echo "EXTRA_CFLAGS=$target_cflags" >> $config_target_mak + echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile + tcg_tests_targets="$tcg_tests_targets $target" + fi done -export target_list source_path use_containers cpu host_cc -$source_path/tests/tcg/configure.sh) +echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> $makefile) config_mak=pc-bios/optionrom/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak diff --git a/tests/Makefile.include b/tests/Makefile.include index 72ce0561f4..6a1688e33e 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -37,7 +37,6 @@ export SRC_PATH SPEED = quick -include tests/tcg/Makefile.prereqs -config-host.mak: $(SRC_PATH)/tests/tcg/configure.sh tests/tcg/Makefile.prereqs: config-host.mak # Per guest TCG tests diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh deleted file mode 100755 index 59f2403d1a..0000000000 --- a/tests/tcg/configure.sh +++ /dev/null @@ -1,376 +0,0 @@ -#! /bin/sh - -if test -z "$source_path"; then - echo Do not invoke this script directly. It is called - echo automatically by configure. - exit 1 -fi - -write_c_skeleton() { - cat > $TMPC </dev/null 2>&1 -} - -do_compiler() { - # Run the compiler, capturing its output to the log. First argument - # is compiler binary to execute. - local compiler="$1" - shift - if test -n "$BASH_VERSION"; then eval ' - echo >>config.log " -funcs: ${FUNCNAME[*]} -lines: ${BASH_LINENO[*]}" - '; fi - echo $compiler "$@" >> config.log - $compiler "$@" >> config.log 2>&1 || return $? -} - - -TMPDIR1="config-temp" -TMPC="${TMPDIR1}/qemu-conf.c" -TMPE="${TMPDIR1}/qemu-conf.exe" - -container="no" -if test $use_containers = "yes"; then - if has "docker" || has "podman"; then - container=$($python $source_path/tests/docker/docker.py probe) - fi -fi - -# cross compilers defaults, can be overridden with --cross-cc-ARCH -: ${cross_cc_aarch64="aarch64-linux-gnu-gcc"} -: ${cross_cc_aarch64_be="$cross_cc_aarch64"} -: ${cross_cc_cflags_aarch64_be="-mbig-endian"} -: ${cross_cc_alpha="alpha-linux-gnu-gcc"} -: ${cross_cc_arm="arm-linux-gnueabihf-gcc"} -: ${cross_cc_cflags_armeb="-mbig-endian"} -: ${cross_cc_hexagon="hexagon-unknown-linux-musl-clang"} -: ${cross_cc_cflags_hexagon="-mv67 -O2 -static"} -: ${cross_cc_hppa="hppa-linux-gnu-gcc"} -: ${cross_cc_i386="i686-linux-gnu-gcc"} -: ${cross_cc_cflags_i386="-m32"} -: ${cross_cc_m68k="m68k-linux-gnu-gcc"} -: ${cross_cc_microblaze="microblaze-linux-musl-gcc"} -: ${cross_cc_mips64el="mips64el-linux-gnuabi64-gcc"} -: ${cross_cc_mips64="mips64-linux-gnuabi64-gcc"} -: ${cross_cc_mipsel="mipsel-linux-gnu-gcc"} -: ${cross_cc_mips="mips-linux-gnu-gcc"} -: ${cross_cc_nios2="nios2-linux-gnu-gcc"} -: ${cross_cc_ppc="powerpc-linux-gnu-gcc"} -: ${cross_cc_cflags_ppc="-m32"} -: ${cross_cc_ppc64="powerpc64-linux-gnu-gcc"} -: ${cross_cc_cflags_ppc64="-m64 -mbig-endian"} -: ${cross_cc_ppc64le="$cross_cc_ppc64"} -: ${cross_cc_cflags_ppc64le="-m64 -mlittle-endian"} -: ${cross_cc_riscv64="riscv64-linux-gnu-gcc"} -: ${cross_cc_s390x="s390x-linux-gnu-gcc"} -: ${cross_cc_sh4="sh4-linux-gnu-gcc"} -: ${cross_cc_cflags_sparc="-m32 -mcpu=supersparc"} -: ${cross_cc_sparc64="sparc64-linux-gnu-gcc"} -: ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"} -: ${cross_cc_x86_64="x86_64-linux-gnu-gcc"} -: ${cross_cc_cflags_x86_64="-m64"} - -# tricore is special as it doesn't have a compiler -: ${cross_as_tricore="tricore-as"} -: ${cross_ld_tricore="tricore-ld"} - -makefile=tests/tcg/Makefile.prereqs -echo "# Automatically generated by configure - do not modify" > $makefile - -config_host_mak=tests/tcg/config-host.mak -echo "# Automatically generated by configure - do not modify" > $config_host_mak -echo "SRC_PATH=$source_path" >> $config_host_mak -echo "HOST_CC=$host_cc" >> $config_host_mak - -tcg_tests_targets= -for target in $target_list; do - arch=${target%%-*} - - # reset all container fields - container_image= - container_hosts= - container_cross_cc= - container_cross_as= - container_cross_ld= - - # suppress clang - supress_clang= - - case $target in - aarch64-*) - # We don't have any bigendian build tools so we only use this for AArch64 - container_hosts="x86_64 aarch64" - container_image=debian-arm64-cross - container_cross_cc=aarch64-linux-gnu-gcc-10 - ;; - alpha-*) - container_hosts=x86_64 - container_image=debian-alpha-cross - container_cross_cc=alpha-linux-gnu-gcc - ;; - arm-*) - # We don't have any bigendian build tools so we only use this for ARM - container_hosts="x86_64 aarch64" - container_image=debian-armhf-cross - container_cross_cc=arm-linux-gnueabihf-gcc - ;; - cris-*) - container_hosts=x86_64 - container_image=fedora-cris-cross - container_cross_cc=cris-linux-gnu-gcc - ;; - hexagon-*) - container_hosts=x86_64 - container_image=debian-hexagon-cross - container_cross_cc=hexagon-unknown-linux-musl-clang - ;; - hppa-*) - container_hosts=x86_64 - container_image=debian-hppa-cross - container_cross_cc=hppa-linux-gnu-gcc - ;; - i386-*) - container_hosts=x86_64 - container_image=fedora-i386-cross - container_cross_cc=gcc - supress_clang=yes - ;; - m68k-*) - container_hosts=x86_64 - container_image=debian-m68k-cross - container_cross_cc=m68k-linux-gnu-gcc - ;; - microblaze-*) - container_hosts=x86_64 - container_image=debian-microblaze-cross - container_cross_cc=microblaze-linux-musl-gcc - ;; - mips64el-*) - container_hosts=x86_64 - container_image=debian-mips64el-cross - container_cross_cc=mips64el-linux-gnuabi64-gcc - ;; - mips64-*) - container_hosts=x86_64 - container_image=debian-mips64-cross - container_cross_cc=mips64-linux-gnuabi64-gcc - ;; - mipsel-*) - container_hosts=x86_64 - container_image=debian-mipsel-cross - container_cross_cc=mipsel-linux-gnu-gcc - ;; - mips-*) - container_hosts=x86_64 - container_image=debian-mips-cross - container_cross_cc=mips-linux-gnu-gcc - ;; - nios2-*) - container_hosts=x86_64 - container_image=debian-nios2-cross - container_cross_cc=nios2-linux-gnu-gcc - ;; - ppc-*) - container_hosts=x86_64 - container_image=debian-powerpc-test-cross - container_cross_cc=powerpc-linux-gnu-gcc-10 - ;; - ppc64-*|ppc64le-*) - container_hosts=x86_64 - container_image=debian-powerpc-test-cross - container_cross_cc=${target%%-*}-linux-gnu-gcc-10 - container_cross_cc=powerpc${container_cross_cc#ppc} - ;; - riscv64-*) - container_hosts=x86_64 - container_image=debian-riscv64-test-cross - container_cross_cc=riscv64-linux-gnu-gcc - ;; - s390x-*) - container_hosts=x86_64 - container_image=debian-s390x-cross - container_cross_cc=s390x-linux-gnu-gcc - ;; - sh4-*) - container_hosts=x86_64 - container_image=debian-sh4-cross - container_cross_cc=sh4-linux-gnu-gcc - ;; - sparc64-*) - container_hosts=x86_64 - container_image=debian-sparc64-cross - container_cross_cc=sparc64-linux-gnu-gcc - ;; - tricore-softmmu) - container_hosts=x86_64 - container_image=debian-tricore-cross - container_cross_as=tricore-as - container_cross_ld=tricore-ld - ;; - x86_64-*) - container_hosts="aarch64 ppc64el x86_64" - container_image=debian-amd64-cross - container_cross_cc=x86_64-linux-gnu-gcc - supress_clang=yes - ;; - xtensa*-softmmu) - container_hosts=x86_64 - container_image=debian-xtensa-cross - - # default to the dc232b cpu - container_cross_cc=/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc - ;; - esac - - config_target_mak=tests/tcg/config-$target.mak - - echo "# Automatically generated by configure - do not modify" > $config_target_mak - echo "TARGET_NAME=$arch" >> $config_target_mak - case $target in - *-softmmu) - test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || continue - qemu="qemu-system-$arch" - ;; - *-linux-user|*-bsd-user) - qemu="qemu-$arch" - ;; - esac - - eval "target_compiler_cflags=\${cross_cc_cflags_$arch}" - - got_cross_cc=no - - if eval test "x\"\${cross_cc_$arch}\"" != xyes; then - eval "target_compiler=\"\${cross_cc_$arch}\"" - - if has $target_compiler; then - if test "$supress_clang" = yes && - $target_compiler --version | grep -qi "clang"; then - got_cross_cc=no - else - write_c_skeleton - if ! do_compiler "$target_compiler" $target_compiler_cflags \ - -o $TMPE $TMPC -static ; then - # For host systems we might get away with building without -static - if do_compiler "$target_compiler" $target_compiler_cflags \ - -o $TMPE $TMPC ; then - got_cross_cc=yes - echo "CC=$target_compiler" >> $config_target_mak - fi - else - got_cross_cc=yes - echo "BUILD_STATIC=y" >> $config_target_mak - echo "CC=$target_compiler" >> $config_target_mak - fi - fi - fi - - # Special handling for assembler only tests - eval "target_as=\"\${cross_as_$arch}\"" - eval "target_ld=\"\${cross_ld_$arch}\"" - if has $target_as && has $target_ld; then - case $target in - tricore-softmmu) - echo "AS=$target_as" >> $config_target_mak - echo "LD=$target_ld" >> $config_target_mak - got_cross_cc=yes - ;; - esac - fi - fi - - if test $got_cross_cc = yes; then - # Test for compiler features for optional tests. We only do this - # for cross compilers because ensuring the docker containers based - # compilers is a requirememt for adding a new test that needs a - # compiler feature. - - case $target in - aarch64-*) - if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=armv8.1-a+sve -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=armv8.1-a+sve2 -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_SVE2=y" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=armv8.3-a -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -mbranch-protection=standard -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_ARMV8_BTI=y" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=armv8.5-a+memtag -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_ARMV8_MTE=y" >> $config_target_mak - fi - ;; - ppc*) - if do_compiler "$target_compiler" $target_compiler_cflags \ - -mpower8-vector -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -mpower10 -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_POWER10=y" >> $config_target_mak - fi - ;; - i386-linux-user) - if do_compiler "$target_compiler" $target_compiler_cflags \ - -Werror -fno-pie -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak - fi - ;; - esac - elif test $got_cross_cc = no && test "$container" != no && \ - test -n "$container_image"; then - for host in $container_hosts; do - if test "$host" = "$cpu"; then - echo "build-tcg-tests-$target: docker-image-$container_image" >> $makefile - echo "BUILD_STATIC=y" >> $config_target_mak - echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" >> $config_target_mak - if test -n "$container_cross_as"; then - echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" >> $config_target_mak - fi - if test -n "$container_cross_ld"; then - echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" >> $config_target_mak - fi - case $target in - aarch64-*) - echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak - echo "CROSS_CC_HAS_SVE2=y" >> $config_target_mak - echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak - echo "CROSS_CC_HAS_ARMV8_BTI=y" >> $config_target_mak - echo "CROSS_CC_HAS_ARMV8_MTE=y" >> $config_target_mak - ;; - ppc*) - echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak - echo "CROSS_CC_HAS_POWER10=y" >> $config_target_mak - ;; - i386-linux-user) - echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak - ;; - esac - got_cross_cc=yes - break - fi - done - fi - if test $got_cross_cc = yes; then - mkdir -p tests/tcg/$target - echo "QEMU=$PWD/$qemu" >> $config_target_mak - echo "EXTRA_CFLAGS=$target_compiler_cflags" >> $config_target_mak - echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile - tcg_tests_targets="$tcg_tests_targets $target" - fi -done -echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> $makefile From patchwork Wed Jun 1 18:05:23 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: 577829 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp862135mab; Wed, 1 Jun 2022 11:34:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCDjZQmvHEXBxTKVnzDUZy+zOMNEoBzxFwuqCdHaQkktRW4h0uZFTenapnFLZmP8hquhIZ X-Received: by 2002:a05:6214:c4b:b0:462:508a:408b with SMTP id r11-20020a0562140c4b00b00462508a408bmr37052480qvj.59.1654108496545; Wed, 01 Jun 2022 11:34:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654108496; cv=none; d=google.com; s=arc-20160816; b=HTlvi4HyvZI9IC7jDsKIql0tYfR7TNU+UWuj4QuCiJBgiajZ1olxxxLMEfZeTvtUwy A+4hqRYiy3X0UFojSxFIBaiL840Br1oVi+yNBDTf88bABeChHFvhU4gNn/qWUoPwBQmS VJIr8si/PEl3h+6Kw7st0duzKL2FdJBcJ/K8O1+OI6R1Dl5YFi9kXlDBeNDIN5poE80i 142NhGqMZ0zMpx2nBJ3ahayf0Vk3rcogUckvULwiZVbeCCgyYXWHvQiXKAybM+tIr8Oz z1fTDV3a1xqklqw+cXklPxRB5Z+cZt8AOJTbHAshaZ1FEXtaolw7IFGzYhHBhQ5NjwEt menw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=sw2OZqRVvOz9tIkmle+PbxpD88wzm28TBbpK/4AWTv4=; b=H52r7cVNpOnKqOA2ATTVnDXbQBtXmqQOsbWFa8PY1fn9ovUDyddTmjMaK9Jwa1SGum MdIBVaXXdYteLlecORir33QM/e27yV45eAhACT6XvhP6tBc/IwtEmmVlTKyzxkO613G/ 3aQlrdxVkbbJXK/Ugo94Wbl+lfcUIXZdfbijJ7K0hVDpWnHP1ZcCUTX4sDK7HuQvgziv lqDitezVElrhzEcvcDUGzzfihVR8p1b510LsUkeu6KqTyY00ZExI6fHA7Mq8/iuH1D3x nZ8hgw+txL7fvjEOdRJEvVLIyZGf8ybIKO7/YDjaTPzoBVWESlpEXlzY0BmYpT4bCMh6 5p2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kNDzNz3l; 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=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 y9-20020ae9f409000000b006a5f932f2a7si1234328qkl.105.2022.06.01.11.34.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:34:56 -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=pass header.i=@linaro.org header.s=google header.b=kNDzNz3l; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwTBI-00086Q-3q for patch@linaro.org; Wed, 01 Jun 2022 14:34:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwT0n-0005iR-3c for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:24:06 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:42715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwT0k-0007wB-MD for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:24:04 -0400 Received: by mail-ej1-x62a.google.com with SMTP id q1so5443580ejz.9 for ; Wed, 01 Jun 2022 11:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sw2OZqRVvOz9tIkmle+PbxpD88wzm28TBbpK/4AWTv4=; b=kNDzNz3lLx/88IIoM3R1jkKc4NtduFyUinL0P4U5WzNDfL8K1AgKUk7iR486pwBL+T Al3XXwlIh3D0y2GAZDvQ5XAjmv8QBGc3W0PHFbHU9Hx7Z0lFCII6rq8ozrEjStc9aRlq tFQHbXGH3Iyqu7Le/5KVwykrsUsz/5OI4p5irTWeJ29CLPD+17aMLQQxldE2QcNrk0di GNZvhiBdZkp/T5X7uwjK0IR+wRRZzTqDVz8I+ExLJDxYHwEqCxHsa9H+9xyUN99TnNGR dzYXl/x9HDHgGElajIEHyZjJCDGPoCy4U55iIJBm1btES3cbjrLaAq5V7XhfXoNRNgv2 fG7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sw2OZqRVvOz9tIkmle+PbxpD88wzm28TBbpK/4AWTv4=; b=KoW+iSPD4n/Qh45GexDSzEfahBM0V9r6P/8gGI5mq/j6LvfZNLv+4sMj4+yBT8aU5X dCWu5AOAoY6IcDq0DZ37IVk8RykTlNS07xVxpnrp+Wo5/6uBmTocWN/Q1xfW5DyEw3zr FIhe9lT20cYCRGC3qB1sQwHvt3AXkwZi+K4pR8LaBleTWNJTfu7RaUesJJvM9g0fCI3j Y4B9gWYsFs/kruabyQogj16vmXC9EzYzU7a3taB3N3wnpD/XeGbWassUvEzJASbcox4r VU9oMavU0St3j8L+faWq3NX6Dof8RMF8TL3P4j52bixCiuQet/LnD/PXzsNlWoJOL1Fh NybA== X-Gm-Message-State: AOAM533aNnPtba2Qz5ovAerFhjXt3yfpMtBxmJ300gR16L6hPxF2f7u5 Hs2NUbmeBcGvx+8FCL6+d49t+Q== X-Received: by 2002:a17:906:974e:b0:6f5:2d44:7e3c with SMTP id o14-20020a170906974e00b006f52d447e3cmr740104ejy.167.1654107840752; Wed, 01 Jun 2022 11:24:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v4-20020aa7dbc4000000b0042de38b8c49sm1339509edt.34.2022.06.01.11.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:23:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7CD0E1FFCA; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 19/33] configure: add missing cross compiler fallbacks Date: Wed, 1 Jun 2022 19:05:23 +0100 Message-Id: <20220601180537.2329566-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini The arm compiler can be used for armeb, and the sparc64 compiler can be used for sparc. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Message-Id: <20220517092616.1272238-9-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-20-alex.bennee@linaro.org> diff --git a/configure b/configure index f91ac632e7..fbf6d39f96 100755 --- a/configure +++ b/configure @@ -1827,6 +1827,7 @@ fi : ${cross_cc_cflags_aarch64_be="-mbig-endian"} : ${cross_cc_alpha="alpha-linux-gnu-gcc"} : ${cross_cc_arm="arm-linux-gnueabihf-gcc"} +: ${cross_cc_armeb="$cross_cc_arm"} : ${cross_cc_cflags_armeb="-mbig-endian"} : ${cross_cc_hexagon="hexagon-unknown-linux-musl-clang"} : ${cross_cc_cflags_hexagon="-mv67 -O2 -static"} @@ -1849,9 +1850,10 @@ fi : ${cross_cc_riscv64="riscv64-linux-gnu-gcc"} : ${cross_cc_s390x="s390x-linux-gnu-gcc"} : ${cross_cc_sh4="sh4-linux-gnu-gcc"} -: ${cross_cc_cflags_sparc="-m32 -mcpu=supersparc"} : ${cross_cc_sparc64="sparc64-linux-gnu-gcc"} : ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"} +: ${cross_cc_sparc="$cross_cc_sparc64"} +: ${cross_cc_cflags_sparc="-m32 -mcpu=supersparc"} : ${cross_cc_x86_64="x86_64-linux-gnu-gcc"} : ${cross_cc_cflags_x86_64="-m64"} From patchwork Wed Jun 1 18:05:24 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: 577835 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp872900mab; Wed, 1 Jun 2022 11:47:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxuyGMEz9shVe4U8TwT0huoeck22WoyCYH46/lkTC1SogY7vc/o+Dp0zpcJl5wIkYbhJYss X-Received: by 2002:a05:620a:746:b0:6a3:8939:b82b with SMTP id i6-20020a05620a074600b006a38939b82bmr693850qki.319.1654109274143; Wed, 01 Jun 2022 11:47:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654109274; cv=none; d=google.com; s=arc-20160816; b=IgzjxUa2sYv9RfEEkilcUkikNdjKh6Xanzd4VlaDEKOCIL9pgr382YSKp3S9Pl26Dh 3y6CzU8QZEREWaSPgDk2FVuUq5nnPviV/e4e9xPuTokYCn/GVblreK1PXN6X/kNjYOEF 7Sf76J5Bq7TihtriX6S9/aoLF8TXkN3BHx2yblY6RZ+K1NXRRh90ogD0LnPa+AI/czlW hJDbcCqrMmfRqmXsROVRCqYE47YUefoEa9vvwbMaZ3bolA1x6KC2bUkkAqD4lsBStAAu TvHV+j6TCJRabc5aKg72SCEs1VcqIp2SIUnYUX7fY87j1BD9blvXOTjBrVSX6ybG7oNb 0XtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=l6wSZzTZH+UuAV+xIj6vY8Z6NNL8CvUpk5/yn56lmqI=; b=vShZMZPmBdIPAPgvCdRejoZ/eqdtBqp4Zy/79vNNaCGXgHLNjd6WlUfkGgR1oELwRw +IM9gblVHDQFs41TMUGclWSHGhQl2tVBTwqWMQQQxIQC4IeE1LgjPYY76UjvH02rBAnm oVfDpvaDnVVtrxl9AGwSF3/K2eak8ps7kxxxzrkFyuuP0ZWk9qEztq5ykHczuuDJ5NG9 m0soNwbYbvNf9M5SMRBbdNUMnHaij9eR32tAfLciJxHKpWQnOV+ssgQkw2e91Dh47tCr 1vsHSNRLiXsdsl9KiRmZI+3WuoZOhjRDK42zAd/ut4/W1IBpKVi3RPt8JugD+qIHeqar nz+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mApJFjRt; 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=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 u5-20020a379205000000b006a648cbab58si1222269qkd.351.2022.06.01.11.47.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:47:54 -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=pass header.i=@linaro.org header.s=google header.b=mApJFjRt; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwTNp-0007um-Nf for patch@linaro.org; Wed, 01 Jun 2022 14:47:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwT0n-0005iQ-4B for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:24:06 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:37767) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwT0l-0007wD-6R for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:24:04 -0400 Received: by mail-ed1-x529.google.com with SMTP id v19so3334341edd.4 for ; Wed, 01 Jun 2022 11:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l6wSZzTZH+UuAV+xIj6vY8Z6NNL8CvUpk5/yn56lmqI=; b=mApJFjRtRc6t+LdcNDmbDQTxRUi37aDor5R2UTUkqOx4JBeFFXs6A3sjVqsztjprwK 74LOzlRGCaIqdmZXfvojWAf+bdJtyGlckJhOvs9Txjt0FTpms2kjo527BLdJL8lWXFhJ TxSC1f5YHxZR0fWakzE8PtdoOKTvqbe2Sg4IDl7ldNXUXRXnH163K2ISpqHVSGPdJvgA hmLjoN8X2mKy8Th1zbUyAm6lQx4tbgACCc8cNXVjmPd93lSANV9BjWK9isUQ8W3C5vHQ cXvkGPGLgxKExTrN/buCEHmU8YZFw+OwTUzZr6GEoyjlbDoKL+p9nEN57KjCq9m/FUJ1 M1uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l6wSZzTZH+UuAV+xIj6vY8Z6NNL8CvUpk5/yn56lmqI=; b=y5UQ7G1QIxC1S2J5JrJR0RIfIaEFSI4EhW2QRBAS14G/3OOErSx+zUq9V0ap95kHDY m106eQ+OsfWYF81KHz//ZXUo0aRF/GLu9+EtKsIOpbfwgjWpoq+dOehdoXr53pOVrRVK 5n7S3RuauEuP6gOhiyDhU1OS/hy27188Jx6WQJfcOxfvMwDtvEZ5ymVkipDabEH38ZlY vpLfWyFhqTAfTuQDWVlBaA8EAmOB79oIIbVOHmOtv211Q/+pjUcQDaaQdcKQt0QXYBFT sOk7/CYNY7jg/RUzO3gMAxbd+9BrpEn1CLXvUZbQ/29XDClhdwTDXIANfKkkxahlGUM+ fMkw== X-Gm-Message-State: AOAM531BF86Egnx8L5ZZTVZ8aBRBL2sdFo7V5m2B7PmShk5wAD6BmyXF EX9tqRB+dVXhe58tWWW1Jy+LaA== X-Received: by 2002:a05:6402:2696:b0:42d:e816:8378 with SMTP id w22-20020a056402269600b0042de8168378mr1106178edd.143.1654107841668; Wed, 01 Jun 2022 11:24:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p3-20020aa7c4c3000000b0042db87b5ff4sm1340647edr.88.2022.06.01.11.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:23:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 880091FFCB; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 20/33] configure: handle host compiler in probe_target_compiler Date: Wed, 1 Jun 2022 19:05:24 +0100 Message-Id: <20220601180537.2329566-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x529.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini In preparation for handling more binaries than just cc, handle the case of "probe_target_compiler $cpu" directly in the function, setting the target_* variables based on the ones that are used to build QEMU. The clang check also needs to be moved after this fallback. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Message-Id: <20220517092616.1272238-10-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-21-alex.bennee@linaro.org> diff --git a/configure b/configure index fbf6d39f96..217c8b3cac 100755 --- a/configure +++ b/configure @@ -954,10 +954,6 @@ case $git_submodules_action in ;; esac -if eval test -z "\${cross_cc_$cpu}"; then - eval "cross_cc_${cpu}=\$cc" -fi - default_target_list="" mak_wilds="" @@ -2008,13 +2004,6 @@ probe_target_compiler() { if eval test -n "\"\${cross_cc_$1}\""; then if eval has "\"\${cross_cc_$1}\""; then eval "target_cc=\"\${cross_cc_$1}\"" - case $1 in - i386|x86_64) - if $target_cc --version | grep -qi "clang"; then - unset target_cc - fi - ;; - esac fi fi if eval test -n "\"\${cross_as_$1}\""; then @@ -2027,6 +2016,20 @@ probe_target_compiler() { eval "target_ld=\"\${cross_ld_$1}\"" fi fi + if test "$1" = $cpu; then + : ${target_cc:=$cc} + : ${target_as:=$as} + : ${target_ld:=$ld} + fi + if test -n "$target_cc"; then + case $1 in + i386|x86_64) + if $target_cc --version | grep -qi "clang"; then + unset target_cc + fi + ;; + esac + fi } write_target_makefile() { From patchwork Wed Jun 1 18:05:25 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: 577803 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp841692mab; Wed, 1 Jun 2022 11:09:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwt/dDwKCKmztko9zspwViVQbhHEFGdI+mgox8O4WabNCk4/z2yEB7/JFgGJjPXX3xA93Jo X-Received: by 2002:ad4:5346:0:b0:461:c8df:d9c4 with SMTP id v6-20020ad45346000000b00461c8dfd9c4mr55880490qvs.23.1654106991200; Wed, 01 Jun 2022 11:09:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654106991; cv=none; d=google.com; s=arc-20160816; b=h3KKU5RmAue40wCmRXYFHqPVMji5Tdz86Pa1zAZLqHW0zmdLexthNvPmItUcBs6gLZ S9Ae9gXp+wRbgkSbsQujBQW7Mm4JL9wZ+2Fg4HOp9BBPiOBcVVSYe6ISd0Xd27rX5QZv 6qBiouEAij7CHj9mZ7qO9ip8wc/w6G2n6rigY7F5iu7tLuTdjZPyUTs3WnxQBlYE6aZF xpkXPRswY8lxZ5fHbb7rOuHS0thkWbHU4dpguv+JJnXzUB9dMtaBolFEheqPXFyAZcxT noAruPYpC/dWkHhPgppXAnTaAXvADy6aRWrcnfTopHDPMhfoeiuQOlYDMGgoaEWYWl1G 9lQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=iBL0XOSODfEHetIjDjNAdTd949wca33dTCbjN+2/aeY=; b=I1oBKDqKvLCJg6dtFLkq2qQ/ZGhuuJI+Nn2/MvycC6A2IVTTETsspTyUrr7dQz4pAY PlwbOHHdfQoG0vXlRx/TLkTWkVDhabRxktKBG5+d9lQG4u8zpDqVwp2Xu+hcrg6cH+Vn Wz7lJvhJVuYloqPfKHNeHJvhd7atA4OKT7DhYP3yVTeCgImGAqfuLVnJkfeogBIS/aN7 9dj2IhC2fmkukiiXtFbR/k3xr95LnL8JvmlN04oQDsTxNq4qTH5htNklTqXBRY5fytbm cg83nQ6TU0spQavvHEBfPsnbGogT/Ddgk+5P1YEDo5km8ZySL28mJINbYrjblkV+eYQP +VQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AQ84CWsb; 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=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 f200-20020a379cd1000000b006a35626d180si1157689qke.734.2022.06.01.11.09.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:09:51 -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=pass header.i=@linaro.org header.s=google header.b=AQ84CWsb; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSn0-00073k-3Y for patch@linaro.org; Wed, 01 Jun 2022 14:09:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjO-0001Ov-6r for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:06:06 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:36549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSjM-00050z-2B for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:06:05 -0400 Received: by mail-ej1-x631.google.com with SMTP id gi33so5383989ejc.3 for ; Wed, 01 Jun 2022 11:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iBL0XOSODfEHetIjDjNAdTd949wca33dTCbjN+2/aeY=; b=AQ84CWsb40CljUzLnmy+UvruBgW71tBMKDPl7py9+2sturyAz5QFkuyjkBUOBwj32k 7WVPR1lFS3uO+obSe0A4yA6RQpBUpBlYI3OPIe1HSz2x9N1VSr7O7d084dAhm0430cCo HgrcawUvIPAFAFTpQg+lxEnJnUpVkT26AiQlJv1YkE1n+StuI8ux7iA2ov0B66KtxwLB yWWauqsVika+9+RjyFMH3+POT08u6WHbOKiJRoPMni+gHfcUpfEWUdf9oHoKeXhEDNJR YoakoTvFtlYdnvyyz7FnILz8alyPSbhlC1VrJSUSzwHiBmE94KseUIt+7WOrNrWqm5Gg l98w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iBL0XOSODfEHetIjDjNAdTd949wca33dTCbjN+2/aeY=; b=sHektZZ3PZoUU3NDl8KFrMXlc4Gz4i68Ksd4GA+OJV2nVKwIrITQbYa/GYeKVbr8Sc hiWyxEddCk4DM1FCD7iD8wIi4jE1uxIVz13Oh+qfo3I6iFXagVofQDroHLVmhXJRQnES VOiYvG/u2nfKxKgWC0YUFxx2Oab3UuhpO5orRSGc5qVstBAGRbqTxBxKx8K8G1Qx29m1 JUnoSi0S7eS2KMnu8lHqcZJV21C7u7DnkFQnHzee5Qwef5qS78blD2lf5nWqXrq0w/ic 24gEMqjRT1LKSVSTEvDhn6PmEDZTDv8QJxy5GIQMFcHmqhjjKVB5ELMqG05dVC9p6jfa HdCw== X-Gm-Message-State: AOAM532M+8QkHtwSRmgt/J4/HSYopEG23C+OSBI9kuL6bB1y/M5Q8pzx Hi+geJXQ7R2zshn/XOEl2L1PpQ== X-Received: by 2002:a17:907:8a1f:b0:6fe:f4fc:750f with SMTP id sc31-20020a1709078a1f00b006fef4fc750fmr657508ejc.399.1654106761654; Wed, 01 Jun 2022 11:06:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r23-20020a170906365700b006fef51aa566sm960786ejb.2.2022.06.01.11.05.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:06:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9E5471FFCC; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 21/33] configure: introduce --cross-prefix-*= Date: Wed, 1 Jun 2022 19:05:25 +0100 Message-Id: <20220601180537.2329566-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Also in preparation for handling more binaries from the cross binutils, support an option --cross-prefix-ARCH. All cross_cc_* defaults are replaced with cross_prefix_*; the cross_cc_* fallbacks are extended to the cross-compilation prefix, but the compiler fallbacks remain as well. This way, for example, --cross-cc-arm=arm-linux-gnueabihf-clang also applies to armeb binaries. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini Message-Id: <20220517092616.1272238-11-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-22-alex.bennee@linaro.org> diff --git a/configure b/configure index 217c8b3cac..f55ae82a5d 100755 --- a/configure +++ b/configure @@ -363,6 +363,11 @@ for opt do --cross-cc-*) cc_arch=${opt#--cross-cc-}; cc_arch=${cc_arch%%=*} eval "cross_cc_${cc_arch}=\$optarg" ;; + --cross-prefix-*[!a-zA-Z0-9_-]*=*) error_exit "Passed bad --cross-prefix-FOO option" + ;; + --cross-prefix-*) cc_arch=${opt#--cross-prefix-}; cc_arch=${cc_arch%%=*} + eval "cross_prefix_${cc_arch}=\$optarg" + ;; esac done # OS specific @@ -728,6 +733,8 @@ for opt do ;; --cross-cc-*) ;; + --cross-prefix-*) + ;; --enable-debug-info) meson_option_add -Ddebug=true ;; --disable-debug-info) meson_option_add -Ddebug=false @@ -1016,6 +1023,7 @@ Advanced options (experts only): --extra-ldflags=LDFLAGS append extra linker flags LDFLAGS --cross-cc-ARCH=CC use compiler when building ARCH guest test cases --cross-cc-cflags-ARCH= use compiler flags when building ARCH guest tests + --cross-prefix-ARCH=PREFIX cross compiler prefix when building ARCH guest test cases --make=MAKE use specified make [$make] --python=PYTHON use specified python [$python] --meson=MESON use specified meson [$meson] @@ -1818,44 +1826,54 @@ if test $use_containers = "yes"; then fi # cross compilers defaults, can be overridden with --cross-cc-ARCH -: ${cross_cc_aarch64="aarch64-linux-gnu-gcc"} +: ${cross_prefix_aarch64="aarch64-linux-gnu-"} +: ${cross_prefix_aarch64_be="$cross_prefix_aarch64"} +: ${cross_prefix_alpha="alpha-linux-gnu-"} +: ${cross_prefix_arm="arm-linux-gnueabihf-"} +: ${cross_prefix_armeb="$cross_prefix_arm"} +: ${cross_prefix_hexagon="hexagon-unknown-linux-musl-"} +: ${cross_prefix_hppa="hppa-linux-gnu-"} +: ${cross_prefix_i386="i686-linux-gnu-"} +: ${cross_prefix_m68k="m68k-linux-gnu-"} +: ${cross_prefix_microblaze="microblaze-linux-musl-"} +: ${cross_prefix_mips64el="mips64el-linux-gnuabi64-"} +: ${cross_prefix_mips64="mips64-linux-gnuabi64-"} +: ${cross_prefix_mipsel="mipsel-linux-gnu-"} +: ${cross_prefix_mips="mips-linux-gnu-"} +: ${cross_prefix_nios2="nios2-linux-gnu-"} +: ${cross_prefix_ppc="powerpc-linux-gnu-"} +: ${cross_prefix_ppc64="powerpc64-linux-gnu-"} +: ${cross_prefix_ppc64le="$cross_prefix_ppc64"} +: ${cross_prefix_riscv64="riscv64-linux-gnu-"} +: ${cross_prefix_s390x="s390x-linux-gnu-"} +: ${cross_prefix_sh4="sh4-linux-gnu-"} +: ${cross_prefix_sparc64="sparc64-linux-gnu-"} +: ${cross_prefix_sparc="$cross_prefix_sparc64"} +: ${cross_prefix_x86_64="x86_64-linux-gnu-"} + : ${cross_cc_aarch64_be="$cross_cc_aarch64"} : ${cross_cc_cflags_aarch64_be="-mbig-endian"} -: ${cross_cc_alpha="alpha-linux-gnu-gcc"} -: ${cross_cc_arm="arm-linux-gnueabihf-gcc"} : ${cross_cc_armeb="$cross_cc_arm"} : ${cross_cc_cflags_armeb="-mbig-endian"} : ${cross_cc_hexagon="hexagon-unknown-linux-musl-clang"} : ${cross_cc_cflags_hexagon="-mv67 -O2 -static"} -: ${cross_cc_hppa="hppa-linux-gnu-gcc"} -: ${cross_cc_i386="i686-linux-gnu-gcc"} : ${cross_cc_cflags_i386="-m32"} -: ${cross_cc_m68k="m68k-linux-gnu-gcc"} -: ${cross_cc_microblaze="microblaze-linux-musl-gcc"} -: ${cross_cc_mips64el="mips64el-linux-gnuabi64-gcc"} -: ${cross_cc_mips64="mips64-linux-gnuabi64-gcc"} -: ${cross_cc_mipsel="mipsel-linux-gnu-gcc"} -: ${cross_cc_mips="mips-linux-gnu-gcc"} -: ${cross_cc_nios2="nios2-linux-gnu-gcc"} -: ${cross_cc_ppc="powerpc-linux-gnu-gcc"} : ${cross_cc_cflags_ppc="-m32"} -: ${cross_cc_ppc64="powerpc64-linux-gnu-gcc"} : ${cross_cc_cflags_ppc64="-m64 -mbig-endian"} : ${cross_cc_ppc64le="$cross_cc_ppc64"} : ${cross_cc_cflags_ppc64le="-m64 -mlittle-endian"} -: ${cross_cc_riscv64="riscv64-linux-gnu-gcc"} -: ${cross_cc_s390x="s390x-linux-gnu-gcc"} -: ${cross_cc_sh4="sh4-linux-gnu-gcc"} -: ${cross_cc_sparc64="sparc64-linux-gnu-gcc"} : ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"} : ${cross_cc_sparc="$cross_cc_sparc64"} : ${cross_cc_cflags_sparc="-m32 -mcpu=supersparc"} -: ${cross_cc_x86_64="x86_64-linux-gnu-gcc"} : ${cross_cc_cflags_x86_64="-m64"} -# tricore is special as it doesn't have a compiler -: ${cross_as_tricore="tricore-as"} -: ${cross_ld_tricore="tricore-ld"} +compute_target_variable() { + if eval test -n "\"\${cross_prefix_$1}\""; then + if eval has "\"\${cross_prefix_$1}\$3\""; then + eval "$2=\"\${cross_prefix_$1}\$3\"" + fi + fi +} probe_target_compiler() { # reset all output variables @@ -1901,93 +1919,99 @@ probe_target_compiler() { aarch64) # We don't have any bigendian build tools so we only use this for AArch64 container_image=debian-arm64-cross - container_cross_cc=aarch64-linux-gnu-gcc-10 + container_cross_prefix=aarch64-linux-gnu- + container_cross_cc=${container_cross_prefix}gcc-10 ;; alpha) container_image=debian-alpha-cross - container_cross_cc=alpha-linux-gnu-gcc + container_cross_prefix=alpha-linux-gnu- ;; arm) # We don't have any bigendian build tools so we only use this for ARM container_image=debian-armhf-cross - container_cross_cc=arm-linux-gnueabihf-gcc + container_cross_prefix=arm-linux-gnueabihf- ;; cris) container_image=fedora-cris-cross - container_cross_cc=cris-linux-gnu-gcc + container_cross_prefix=cris-linux-gnu- ;; hexagon) container_image=debian-hexagon-cross - container_cross_cc=hexagon-unknown-linux-musl-clang + container_cross_prefix=hexagon-unknown-linux-musl- + container_cross_cc=${container_cross_prefix}clang ;; hppa) container_image=debian-hppa-cross - container_cross_cc=hppa-linux-gnu-gcc + container_cross_prefix=hppa-linux-gnu- ;; i386) container_image=fedora-i386-cross - container_cross_cc=gcc + container_cross_prefix= ;; m68k) container_image=debian-m68k-cross - container_cross_cc=m68k-linux-gnu-gcc + container_cross_prefix=m68k-linux-gnu- ;; microblaze) container_image=debian-microblaze-cross - container_cross_cc=microblaze-linux-musl-gcc + container_cross_prefix=microblaze-linux-musl- ;; mips64el) container_image=debian-mips64el-cross - container_cross_cc=mips64el-linux-gnuabi64-gcc + container_cross_prefix=mips64el-linux-gnuabi64- ;; mips64) container_image=debian-mips64-cross - container_cross_cc=mips64-linux-gnuabi64-gcc + container_cross_prefix=mips64-linux-gnuabi64- ;; mipsel) container_image=debian-mipsel-cross - container_cross_cc=mipsel-linux-gnu-gcc + container_cross_prefix=mipsel-linux-gnu- ;; mips) container_image=debian-mips-cross - container_cross_cc=mips-linux-gnu-gcc + container_cross_prefix=mips-linux-gnu- ;; nios2) container_image=debian-nios2-cross - container_cross_cc=nios2-linux-gnu-gcc + container_cross_prefix=nios2-linux-gnu- ;; ppc) container_image=debian-powerpc-test-cross - container_cross_cc=powerpc-linux-gnu-gcc-10 + container_cross_prefix=powerpc-linux-gnu- + container_cross_cc=${container_cross_prefix}gcc-10 ;; ppc64|ppc64le) container_image=debian-powerpc-test-cross - container_cross_cc=powerpc${1#ppc}-linux-gnu-gcc-10 + container_cross_prefix=powerpc${1#ppc}-linux-gnu- + container_cross_cc=${container_cross_prefix}gcc-10 ;; riscv64) container_image=debian-riscv64-test-cross - container_cross_cc=riscv64-linux-gnu-gcc + container_cross_prefix=riscv64-linux-gnu- ;; s390x) container_image=debian-s390x-cross - container_cross_cc=s390x-linux-gnu-gcc + container_cross_prefix=s390x-linux-gnu- ;; sh4) container_image=debian-sh4-cross - container_cross_cc=sh4-linux-gnu-gcc + container_cross_prefix=sh4-linux-gnu- ;; sparc64) container_image=debian-sparc64-cross - container_cross_cc=sparc64-linux-gnu-gcc + container_cross_prefix=sparc64-linux-gnu- ;; tricore) container_image=debian-tricore-cross + container_cross_prefix=tricore- container_cross_as=tricore-as container_cross_ld=tricore-ld + break ;; x86_64) container_image=debian-amd64-cross - container_cross_cc=x86_64-linux-gnu-gcc + container_cross_prefix=x86_64-linux-gnu- ;; xtensa*) # FIXME: xtensa-linux-user? @@ -1995,9 +2019,12 @@ probe_target_compiler() { container_image=debian-xtensa-cross # default to the dc232b cpu - container_cross_cc=/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc + container_cross_prefix=/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232b-elf- ;; esac + : ${container_cross_cc:=${container_cross_prefix}gcc} + : ${container_cross_as:=${container_cross_prefix}as} + : ${container_cross_ld:=${container_cross_prefix}ld} done eval "target_cflags=\${cross_cc_cflags_$1}" @@ -2005,17 +2032,11 @@ probe_target_compiler() { if eval has "\"\${cross_cc_$1}\""; then eval "target_cc=\"\${cross_cc_$1}\"" fi + else + compute_target_variable $1 target_cc gcc fi - if eval test -n "\"\${cross_as_$1}\""; then - if eval has "\"\${cross_as_$1}\""; then - eval "target_as=\"\${cross_as_$1}\"" - fi - fi - if eval test -n "\"\${cross_ld_$1}\""; then - if eval has "\"\${cross_ld_$1}\""; then - eval "target_ld=\"\${cross_ld_$1}\"" - fi - fi + compute_target_variable $1 target_as as + compute_target_variable $1 target_ld ld if test "$1" = $cpu; then : ${target_cc:=$cc} : ${target_as:=$as} @@ -2048,12 +2069,8 @@ write_container_target_makefile() { if test -n "$container_cross_cc"; then echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" fi - if test -n "$container_cross_as"; then - echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" - fi - if test -n "$container_cross_ld"; then - echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" - fi + echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" + echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" } From patchwork Wed Jun 1 18:05:26 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: 577830 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp862255mab; Wed, 1 Jun 2022 11:35:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyG7puZui7Y60J3v6O4whgjvVeTCQ+VM+ww5p4y6e8lu+8xzzOSHIVg5kK3rmxoDAv7Mdow X-Received: by 2002:ac8:5b87:0:b0:2f8:ab4:a050 with SMTP id a7-20020ac85b87000000b002f80ab4a050mr904583qta.183.1654108503880; Wed, 01 Jun 2022 11:35:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654108503; cv=none; d=google.com; s=arc-20160816; b=hgAOADgooX9znzM/2nqHfrGPhojnfWMKRqJhOkv9j/Q9a4s79z19EljncWaXBu0SNa YpoFDlR4XtybYdvUbnPdgg5iOMMf/Gw4v87SYbEF2gtw+Tzzw3+GSB+UxUbJ7hdzLay3 o8fwJ+v7CdSQRJOd2qO0PGvzaU4lb6CODtMxfEQXem6vf3bzWUB1rZJImvMtpOqTzsQ/ cpyBeV7aYHI/SN9V1wnbMXTNpwhfyhsopAcK4Ki1UVestr+J3W1FQUUEr+LGW9iZ/V/i UFQVrlhcJEPz7t8FQJJfjg/GSPODRQwn3+q9XhOHY4D/T35SK5ombdkk6FiU3momZpLW +BiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=SggIrXO00sxHMAsPIste7YnBa0r2qAGuzdNu5DhkgtY=; b=xOvOLHOSr6algjtO4EIpzZKZWgubQkMPWFV5GolZZEV1kys9wX/XGdpPyLKV5SbloH vRpD4ehaKH3jR/1EUND5jQm13TTKor8cp7uYBdj8ulXIvMaf/f97rGp8gC8iHPlSpINs XXgyeHYut8cRGkkVgPFA2xBlhkODKjjlupqbdcjFQ0zKbGIA5X7DM9qTJFfHAU8SoKhA ZUc1ZGvVDYLos0rIR52LMMqHr7cygBsVC84WypGbK0+ODi8stwGPbaQAoQ8roJYKjzuk wc6oDesKgfqEXGNVRYKVQg0ISyfifN9koGZNYWhF8zWXOXockm0iN/q318Pf5SfQkd/0 M9Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pF7paceU; 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=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 d3-20020a05620a240300b006a66f274192si664396qkn.507.2022.06.01.11.35.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:35:03 -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=pass header.i=@linaro.org header.s=google header.b=pF7paceU; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwTBP-0008KE-FU for patch@linaro.org; Wed, 01 Jun 2022 14:35:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSrH-0002Gv-W7 for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:16 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:38414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSrG-0006b4-8T for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:15 -0400 Received: by mail-ed1-x52e.google.com with SMTP id c2so3292477edf.5 for ; Wed, 01 Jun 2022 11:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SggIrXO00sxHMAsPIste7YnBa0r2qAGuzdNu5DhkgtY=; b=pF7paceUQAvC16W+HqVltakNJbc7grhwTFF3+MLs/KBoauD0ttEGJ1/qbKSOwF22wE kGlAxu870u6OYLlSRmgbo9uDcHZA20j9RB3iExH7/KvdPG6zk0sD/7xsNopIExAXJBnm nqPks8yZvitp7vWs4pT7u3FM/MHPh9JcUb+nIxWe6SfD1OYe+avrBNh38V/ksOx6aMNC FWHIlQBncTiWTjaS+RrdfMfK6Ht/iI70jbYecX0qNRcnBbibBTt8PwpQAq23gN1Zhv1c ZpitU6PRkZP3KoPhM3I22WJiVRV+qA+2rbwIYG3Si1YVWlRQ+FnJoPpwGhOcGdKHkcNf cBSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SggIrXO00sxHMAsPIste7YnBa0r2qAGuzdNu5DhkgtY=; b=leYT7BTmU37nUZzEFL9Pomah9MpXrwVRDwxSjOwWFnoYUiCaJPET62qJ8ZV9uVKbJm xLslviMVyjNcdTifxNvsse9gHpoeIBlfKy/Msl51Bil7uwY0RHfezmyZrUzQ0TbSXm3B QwXWJGFO4ImcWym1e7bLKPEx8J5dTmnOOhR0j9WYxaoGfQlqn7kVNPqKvbUtLYFWxgCp NZZR26p+n4EyehKl31TnnvDLjFmXUtxbMuCvGUQ34/Y3p6jUsxvJQSSfA56tN6NvEd/l 3+lKkKOpdsF+/N7809bVkgXBtMpK6QJsS2Wk627igBOEOs6HAPjp5T9dFhYBa2FBtdym P48g== X-Gm-Message-State: AOAM53309BMKEgY55Spvh3Y5P4N1I1icrlh3PAh1Jkm917KLYBSvVDpb J7DBiIUINx/SIQYd1RQ44Z+E9A== X-Received: by 2002:a05:6402:524a:b0:42d:fb80:f734 with SMTP id t10-20020a056402524a00b0042dfb80f734mr1072128edd.153.1654107252959; Wed, 01 Jun 2022 11:14:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y3-20020a170906524300b006fee16142b9sm954987ejm.110.2022.06.01.11.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:14:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AA88B1FFCD; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 22/33] configure: include more binutils in tests/tcg makefile Date: Wed, 1 Jun 2022 19:05:26 +0100 Message-Id: <20220601180537.2329566-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Firmware builds require paths to all the binutils; it is not enough to use only cc, or even as/ld as in the case of tests/tcg/tricore. Adjust the cross-compiler configurator to detect also ar, nm, objcopy, ranlib and strip. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini Message-Id: <20220517092616.1272238-12-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-23-alex.bennee@linaro.org> diff --git a/configure b/configure index f55ae82a5d..ced8283b98 100755 --- a/configure +++ b/configure @@ -1880,11 +1880,21 @@ probe_target_compiler() { container_image= container_hosts= container_cross_cc= + container_cross_ar= container_cross_as= container_cross_ld= + container_cross_nm= + container_cross_objcopy= + container_cross_ranlib= + container_cross_strip= target_cc= + target_ar= target_as= target_ld= + target_nm= + target_objcopy= + target_ranlib= + target_strip= case $1 in aarch64) container_hosts="x86_64 aarch64" ;; @@ -2023,8 +2033,13 @@ probe_target_compiler() { ;; esac : ${container_cross_cc:=${container_cross_prefix}gcc} + : ${container_cross_ar:=${container_cross_prefix}ar} : ${container_cross_as:=${container_cross_prefix}as} : ${container_cross_ld:=${container_cross_prefix}ld} + : ${container_cross_nm:=${container_cross_prefix}nm} + : ${container_cross_objcopy:=${container_cross_prefix}objcopy} + : ${container_cross_ranlib:=${container_cross_prefix}ranlib} + : ${container_cross_strip:=${container_cross_prefix}strip} done eval "target_cflags=\${cross_cc_cflags_$1}" @@ -2035,12 +2050,26 @@ probe_target_compiler() { else compute_target_variable $1 target_cc gcc fi + target_ccas=$target_cc + compute_target_variable $1 target_ar ar compute_target_variable $1 target_as as compute_target_variable $1 target_ld ld + compute_target_variable $1 target_nm nm + compute_target_variable $1 target_objcopy objcopy + compute_target_variable $1 target_ranlib ranlib + compute_target_variable $1 target_strip strip if test "$1" = $cpu; then : ${target_cc:=$cc} + : ${target_ccas:=$ccas} : ${target_as:=$as} : ${target_ld:=$ld} + : ${target_ar:=$ar} + : ${target_as:=$as} + : ${target_ld:=$ld} + : ${target_nm:=$nm} + : ${target_objcopy:=$objcopy} + : ${target_ranlib:=$ranlib} + : ${target_strip:=$strip} fi if test -n "$target_cc"; then case $1 in @@ -2056,6 +2085,10 @@ probe_target_compiler() { write_target_makefile() { if test -n "$target_cc"; then echo "CC=$target_cc" + echo "CCAS=$target_ccas" + fi + if test -n "$target_ar"; then + echo "AR=$target_ar" fi if test -n "$target_as"; then echo "AS=$target_as" @@ -2063,14 +2096,32 @@ write_target_makefile() { if test -n "$target_ld"; then echo "LD=$target_ld" fi + if test -n "$target_nm"; then + echo "NM=$target_nm" + fi + if test -n "$target_objcopy"; then + echo "OBJCOPY=$target_objcopy" + fi + if test -n "$target_ranlib"; then + echo "RANLIB=$target_ranlib" + fi + if test -n "$target_strip"; then + echo "STRIP=$target_strip" + fi } write_container_target_makefile() { if test -n "$container_cross_cc"; then echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" + echo "CCAS=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" fi + echo "AR=\$(DOCKER_SCRIPT) cc --cc $container_cross_ar -i qemu/$container_image -s $source_path --" echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" + echo "NM=\$(DOCKER_SCRIPT) cc --cc $container_cross_nm -i qemu/$container_image -s $source_path --" + echo "OBJCOPY=\$(DOCKER_SCRIPT) cc --cc $container_cross_objcopy -i qemu/$container_image -s $source_path --" + echo "RANLIB=\$(DOCKER_SCRIPT) cc --cc $container_cross_ranlib -i qemu/$container_image -s $source_path --" + echo "STRIP=\$(DOCKER_SCRIPT) cc --cc $container_cross_strip -i qemu/$container_image -s $source_path --" } From patchwork Wed Jun 1 18:05:27 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: 577834 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp871489mab; Wed, 1 Jun 2022 11:45:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5TKLV2YpDM6e96/msnB7ztxxiHTMv6pkOhATlP4097pNt1vT5wGmqaZvmXlQ61dmr/JFv X-Received: by 2002:a05:620a:40cb:b0:6a0:922b:2d67 with SMTP id g11-20020a05620a40cb00b006a0922b2d67mr1008892qko.20.1654109159443; Wed, 01 Jun 2022 11:45:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654109159; cv=none; d=google.com; s=arc-20160816; b=WzCz26c3BYZVWi3l83x0TWhkExyJAMdBHCeMv5w0I7sBdVYyCTeXaPwFDuQlx/VPEU Tk69IezQhXfw69tbycvQKnVGvyIHQ/oA0XD9MSAgST/8lIuJKVaMK1K3F24CXUgkrOWE vropsIjyopyMOE5Q+hZ1Q4482lVTM8XqizfCcwsC9jMxS5yflb5NWH1I0g6oclhlMtT+ 9AAs7afBTYkCIU6o0p3D+cBI+daw2qAOXnnTvSCoN2jET37a1zQjIFYc08YkYV870JFJ 1N86XjTFpw2XxbB1LoY0EfxR2k2xpesCRWMvLBTMCgfPgE2Go7rZVNco9871BOr5ReqS OS9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=J4oIXDaFkPNgpbtozhms7v34rFtzZXvcjlt+SBmQ1bM=; b=KeZFB49f0HG2oaQnmmJJDJ7RJAOQdzdauiYvPp+HDIc2gzRQBvz/8N/QMTJ2Eokch0 uhbmxZOhVQ111c8nJpd+g2TQjy4rupVEg6m1rWkQxQr/vIWGkuGkik5c8OvIc+mTpsMC jTvikKVgseA9CTnATg32MbVux3LNTc5Zvhv1B9hXEIy/Djk8b37MkQ8TWt3KbljpU6gD svLuas02ODODcAmW9X2R3nq5/xwHulfkXttU8KV+QfvTQmfv1tyOC+0rdXgYi7oGsqIq 7ucp/edn+Fdg+Bjazyb1jGJcId22VaGU7ruE25PKKW2zaz0WieOI/EOx7WFK/G8U8t4M cQ4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ry9IwEci; 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=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 r77-20020a374450000000b0069f8abb5c2csi1341002qka.360.2022.06.01.11.45.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:45:59 -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=pass header.i=@linaro.org header.s=google header.b=Ry9IwEci; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwTLy-0004TF-VZ for patch@linaro.org; Wed, 01 Jun 2022 14:45:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwT0k-0005fK-RL for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:24:03 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:36479) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwT0j-0007uz-0z for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:24:02 -0400 Received: by mail-ed1-x52c.google.com with SMTP id fd25so3342440edb.3 for ; Wed, 01 Jun 2022 11:24:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J4oIXDaFkPNgpbtozhms7v34rFtzZXvcjlt+SBmQ1bM=; b=Ry9IwEci1BH58bNoqJ/AJg4HC86bwCOnYkf4y1tlIVjV5PNW0uCcOvhw45F27NSFkz 23PKwzsMFk0Rf0mx6qPQAUPxn0Sepgn2MlHcXowF3qSF/UQVgJGSTQcOWwd8hAkI00jb 8rqvEYUI6TL5vQYhCtocpzapzdarDvApKMeI7ufL0VVvrP3eW9NzHJeB0icR2qh/nhA/ my3jA3zdmFecoFc0MxqGUo/mDvOL98Msp4STHg+DuL4oi1dctNm4y2yRkfmAmeZAwTlP iDnCua2y2v9PAu44xkhCDwlkyMG/QnY8exfKEhLvHX/0V2aocvnnVLRQQlMpe0J7vys4 QrHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J4oIXDaFkPNgpbtozhms7v34rFtzZXvcjlt+SBmQ1bM=; b=yR9hcL86Pl8+wQhBXQZ+EH3hGD05g6O22yehLMDFQT/kVjyJd/xflVMyiV6zb06+zD +i3H6VJkrpkhjNuabO7lx8c8Qn/sxlmBO1tlGbHSbBbaPNeY2znzFRptWTkH4vrwqdmg pdMmf8mi5jzJ1xgWRT0Cl18zj9/aNgdPkO+yCZ+8v/yZKPgHFD/SSp9At8jVB46bol/R vkrwxYUj80kpI7XlzKqs8YOp9jYtwzHLuwC3JgwELCv3zO8zt1ld7wuYsEHzbl02Ygb6 U2VsnC2I4tqGTgWiQO7PXsJunr7UBB1PLoJxO0lFe2d9pPx2eoA/eDDJZ/zMjiz/O1q2 6F0A== X-Gm-Message-State: AOAM533Q6bJyHXuJZ7UMEpFTdbYt7QiqjgDvzvIF942MR8I+KhD8wKM9 m0ZJr27SHQfbjW5KaogoWEi/PQ== X-Received: by 2002:a05:6402:40d4:b0:42b:3203:aafe with SMTP id z20-20020a05640240d400b0042b3203aafemr1117280edb.376.1654107838965; Wed, 01 Jun 2022 11:23:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f24-20020a05640214d800b0042617ba63basm1341619edx.68.2022.06.01.11.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:23:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C0B891FFCE; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 23/33] configure: move symlink configuration earlier Date: Wed, 1 Jun 2022 19:05:27 +0100 Message-Id: <20220601180537.2329566-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Ensure that the pc-bios/optionrom and pc-bios/s390-ccw directory exist at the time when we'll write out the compiler configuration for them. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini Message-Id: <20220517092616.1272238-13-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-24-alex.bennee@linaro.org> diff --git a/configure b/configure index ced8283b98..aa17b0fa55 100755 --- a/configure +++ b/configure @@ -2190,6 +2190,30 @@ if test "$QEMU_GA_VERSION" = ""; then QEMU_GA_VERSION=$(cat $source_path/VERSION) fi +# Set up build tree symlinks that point back into the source tree +# (these can be both files and directories). +# Caution: avoid adding files or directories here using wildcards. This +# will result in problems later if a new file matching the wildcard is +# added to the source tree -- nothing will cause configure to be rerun +# so the build tree will be missing the link back to the new file, and +# tests might fail. Prefer to keep the relevant files in their own +# directory and symlink the directory instead. +LINKS="Makefile" +LINKS="$LINKS tests/tcg/Makefile.target" +LINKS="$LINKS pc-bios/optionrom/Makefile" +LINKS="$LINKS pc-bios/s390-ccw/Makefile" +LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit +LINKS="$LINKS tests/avocado tests/data" +LINKS="$LINKS tests/qemu-iotests/check" +LINKS="$LINKS python" +LINKS="$LINKS contrib/plugins/Makefile " +for f in $LINKS ; do + if [ -e "$source_path/$f" ]; then + mkdir -p `dirname ./$f` + symlink "$source_path/$f" "$f" + fi +done + # Mac OS X ships with a broken assembler roms= if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ @@ -2408,31 +2432,6 @@ if test "$safe_stack" = "yes"; then echo "CONFIG_SAFESTACK=y" >> $config_host_mak fi -# If we're using a separate build tree, set it up now. -# LINKS are things to symlink back into the source tree -# (these can be both files and directories). -# Caution: do not add files or directories here using wildcards. This -# will result in problems later if a new file matching the wildcard is -# added to the source tree -- nothing will cause configure to be rerun -# so the build tree will be missing the link back to the new file, and -# tests might fail. Prefer to keep the relevant files in their own -# directory and symlink the directory instead. -LINKS="Makefile" -LINKS="$LINKS tests/tcg/Makefile.target" -LINKS="$LINKS pc-bios/optionrom/Makefile" -LINKS="$LINKS pc-bios/s390-ccw/Makefile" -LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit -LINKS="$LINKS tests/avocado tests/data" -LINKS="$LINKS tests/qemu-iotests/check" -LINKS="$LINKS python" -LINKS="$LINKS contrib/plugins/Makefile " -for f in $LINKS ; do - if [ -e "$source_path/$f" ]; then - mkdir -p `dirname ./$f` - symlink "$source_path/$f" "$f" - fi -done - # tests/tcg configuration (makefile=tests/tcg/Makefile.prereqs echo "# Automatically generated by configure - do not modify" > $makefile From patchwork Wed Jun 1 18:05:28 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: 577824 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp857660mab; Wed, 1 Jun 2022 11:29:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrHQlEUOsakhpRV595rcK+QaeXzliaq7dQARG4fbERBziR2lhhem66ZFKTpDFeqHmBHZhJ X-Received: by 2002:a05:622a:14c:b0:2fc:5024:c8bc with SMTP id v12-20020a05622a014c00b002fc5024c8bcmr895097qtw.426.1654108172073; Wed, 01 Jun 2022 11:29:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654108172; cv=none; d=google.com; s=arc-20160816; b=dsHj9ajLnfwIbXS69qqsCawVlmW2b/zusXBs5wkUlJw+GNif2SOVr1jai6Dhox6Yvs GMAkqzdjqjETfLjdTqr1QrEDrPGhImKezkyiURwU4+g3X9+YbGCDymn7n5azOTSMnrlf B0ZkI0sw3BYaFyUShiT+rZIDpzQol481V88WgorlHpIXtz/CPln2Xq5tYSgG16p2whIs pQBYo+Pqcr9L/8nltyVYzug/OuGM9z66UhIKXwfHtl52NRhtO9Um7K80ETGGAouHPB/L YezKQPhr6VGrJDQwxv4mKKYHWze628EGMG4MRTI4GNz2iT0M/YCzUeYd2TeMxC0fp7K1 UtIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=1r2rKk9p3Z4WuyVHz9vKxY76XN/AUS8op6qSsWyyueQ=; b=O/wYT8YIElvvFH9uchI5d65rSDQBeyz4RWZCqZhbx2ietC7QvYO3hFTsj4lxkBHvxq 35uK/WDxRiXIaPmoWwPYy36C3imPODxWW+XXUrQPLIHhfagedDoLbz5HdV0H4Cx3/C+W gaL8R7WtNVD2pIXXdcdAQ43JWFnQw85nCFGBDCZw9KZ3hkZZhv0/vohJL35awiXgASO5 3hRQoJD7toGiyS/2aLgInDhfnkRs1gVzaFPAXd4EMkrUuFO5eyZn4zrqUz5HJ81rnVMR UnvVcWTct77viwui1UnT/eXxOynycsk4fpd+nrq0AqYq978kR7Xjy5aYbEtSioxZooNH dBmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D5Hr4Fs5; 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=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 fo9-20020ad45f09000000b00453b38bd86dsi1093873qvb.301.2022.06.01.11.29.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:29:32 -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=pass header.i=@linaro.org header.s=google header.b=D5Hr4Fs5; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwT63-0000lj-LO for patch@linaro.org; Wed, 01 Jun 2022 14:29:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSr7-0001jf-5k for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:05 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:42584) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSr4-0006Z8-Ti for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:04 -0400 Received: by mail-ej1-x62e.google.com with SMTP id q1so5395663ejz.9 for ; Wed, 01 Jun 2022 11:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1r2rKk9p3Z4WuyVHz9vKxY76XN/AUS8op6qSsWyyueQ=; b=D5Hr4Fs5RLuWq/vyoBRX2Dsjtxxs80rnS/u4Mmt2UXc77lgoDoy6foPgD34PDe2njt A+QrJ9zsiGowVIkbYqCx9Ld7v5Gg/Zv5l+t/LiiXnQKaVVJemIb+lxW2l3g5tuiQPEqB lXf2H2eCjLirAQQLVUpMSY/tfOan1NXkzmZyfk+QG51crpzpAyhnjePPzWyVRmB0OKnN 3PJpktSg8sYt6QUN6So8jbAcKTN4UlBJ3DUhuKpwrgaWd2M5Fam2iWuzCJoQZgRkqLqD +WUeJmbAGx8POlj2hN89KGnep99nWDlFvlF48+GKqI6IskSdgzLqkScKBPsa/0umZTMZ du2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1r2rKk9p3Z4WuyVHz9vKxY76XN/AUS8op6qSsWyyueQ=; b=hiEygkD2EeRUz6lqdwpJRja1Qlwc0eez66NU5uk4X3qjG/U/D1M+1P8purwGP0SOW6 qMI+fZNtS66iB4gN0hthjXDFaklJJNYfQ+FK8DFwrIGdIPdQ/tpJBdx6FtCgK3Z9DPXv R/FHUy9O01FwpCNx6BAiQx0KWuvJPqAVf4t5HIASIajz7kQMxBWFRbbGBhwFLLALqGLn II7nM5PHGmNYfTuFCSA8YXRfsv0WaUaJdCYIBaz/bNSCv/1dWxuBEJdjR4BAo8JLT5Q/ 40zgh9XxlOJjzH0OXGFq9dgDWYQbeO2L9wmoMq3T8+OwtDLFbBPbQGZHpXJz+kPDF5vt /0kg== X-Gm-Message-State: AOAM530qKZK1npHueaNEBiPnKJ45oRujNqRwRGQh91SGFFoMyt/NTKBO kx1iaPlO1AoBA7o215ozh7/0Fg== X-Received: by 2002:a17:907:6ea5:b0:6fa:967d:6d57 with SMTP id sh37-20020a1709076ea500b006fa967d6d57mr748802ejc.276.1654107241559; Wed, 01 Jun 2022 11:14:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m11-20020a056402050b00b0042dd7e13391sm1367056edv.45.2022.06.01.11.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:13:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D091C1FFCF; Wed, 1 Jun 2022 19:05:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , Thomas Huth , Christian Borntraeger , Cornelia Huck , qemu-s390x@nongnu.org (open list:S390-ccw boot) Subject: [PULL 24/33] configure: enable cross-compilation of s390-ccw Date: Wed, 1 Jun 2022 19:05:28 +0100 Message-Id: <20220601180537.2329566-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini While container-based cross compilers are not supported, this already makes it possible to build s390-ccw on any machine that has s390x GCC and binutils installed. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini Message-Id: <20220517092616.1272238-14-pbonzini@redhat.com> Signed-off-by: Alex Bennée Acked-by: Thomas Huth Message-Id: <20220527153603.887929-25-alex.bennee@linaro.org> diff --git a/configure b/configure index aa17b0fa55..f509bce304 100755 --- a/configure +++ b/configure @@ -2231,24 +2231,32 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ done fi -# Only build s390-ccw bios if we're on s390x and the compiler has -march=z900 -# or -march=z10 (which is the lowest architecture level that Clang supports) -if test "$cpu" = "s390x" ; then +# Only build s390-ccw bios if the compiler has -march=z900 or -march=z10 +# (which is the lowest architecture level that Clang supports) +probe_target_compiler s390x +if test -n "$target_cc" && test "$softmmu" = yes; then write_c_skeleton - compile_prog "-march=z900" "" + do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC has_z900=$? - if [ $has_z900 = 0 ] || compile_object "-march=z10 -msoft-float -Werror"; then + if [ $has_z900 = 0 ] || do_compiler "$target_cc" $target_cc_cflags -march=z10 -msoft-float -Werror -o $TMPO -c $TMPC; then if [ $has_z900 != 0 ]; then echo "WARNING: Your compiler does not support the z900!" echo " The s390-ccw bios will only work with guest CPUs >= z10." fi roms="$roms s390-ccw" + config_mak=pc-bios/s390-ccw/config-host.mak + echo "# Automatically generated by configure - do not modify" > $config_mak + echo "SRC_PATH=$source_path/pc-bios/s390-ccw" >> $config_mak + write_target_makefile >> $config_mak # SLOF is required for building the s390-ccw firmware on s390x, # since it is using the libnet code from SLOF for network booting. git_submodules="${git_submodules} roms/SLOF" fi fi +####################################### +# generate config-host.mak + # Check that the C++ compiler exists and works with the C compiler. # All the QEMU_CXXFLAGS are based on QEMU_CFLAGS. Keep this at the end to don't miss any other that could be added. if has $cxx; then diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak index 68b4d7edcb..1a06befa4b 100644 --- a/pc-bios/s390-ccw/netboot.mak +++ b/pc-bios/s390-ccw/netboot.mak @@ -1,5 +1,5 @@ -SLOF_DIR := $(SRC_PATH)/roms/SLOF +SLOF_DIR := $(SRC_PATH)/../../roms/SLOF NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index 0eb68efc7b..6eb713bf37 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -2,8 +2,9 @@ all: build-all # Dummy command so that make thinks it has done something @true -include ../../config-host.mak +include config-host.mak CFLAGS = -O2 -g +MAKEFLAGS += -rR quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \ @@ -11,7 +12,7 @@ cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \ VPATH_SUFFIXES = %.c %.h %.S %.m %.mak %.sh %.rc Kconfig% %.json.in set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(PATTERN) $1))) -$(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw) +$(call set-vpath, $(SRC_PATH)) # Flags for dependency generation QEMU_DGFLAGS = -MMD -MP -MT $@ -MF $(@D)/$(*F).d @@ -49,8 +50,8 @@ s390-ccw.img: s390-ccw.elf $(OBJECTS): Makefile -ifneq ($(wildcard $(SRC_PATH)/roms/SLOF/lib/libnet),) -include $(SRC_PATH)/pc-bios/s390-ccw/netboot.mak +ifneq ($(wildcard $(SRC_PATH)/../../roms/SLOF/lib/libnet),) +include $(SRC_PATH)/netboot.mak else s390-netboot.img: @echo "s390-netboot.img not built since roms/SLOF/ is not available." From patchwork Wed Jun 1 18:05:29 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: 577826 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp859044mab; Wed, 1 Jun 2022 11:31:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxu+4AcDBPZrp/Baomh1FhAgHcA3QMmLBMg2g3wy4DjYoasodORjj8NafPMAm3QKGRI5HkY X-Received: by 2002:ac8:5d8a:0:b0:2f3:dcaa:f1c7 with SMTP id d10-20020ac85d8a000000b002f3dcaaf1c7mr841486qtx.529.1654108270285; Wed, 01 Jun 2022 11:31:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654108270; cv=none; d=google.com; s=arc-20160816; b=amZ6nEJnSqQdVkPZqNdXYjOrAmNlVroPuOt4YcAoG0uLpIbcok0QMkdgl4KFz76ozI HXuStiLjbU7khGRaw+sEwNJNAEyvTtyB8CaGd1Irl9C3/He4Z2H63gDMwGrkT9Il6iCJ fSdbWRgKaGXclwZlhJovCBRzCkmWHngxFGL6I41hsaBFiXwUelerCXN8EFqfvJfvC8Pk n3JHDHU+1t0NzrSTDb+z4IUCEBf2tcNfDFCIN6HrizRnKbSj0W3UaTpbLYjzWzzMLJWE /jDmTErhMjcjHdoX00c/bdiucPZwAPfJOj7pU5l1bi9ylUCvZ+1QULR6ZAXzm/0m9uzu obow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=3D8/UyD+ztVeocgeehcA/xb0KzGAE86uC41XX1vBnSs=; b=Cyu9pVNKhVINNzUsw33Fj4adnX81bAu4Xck6wxQtzC3jfJ49EPwxDEEW0cFxXSQ4Eq p8OhVL5iJ9+hXuHYrs1dYHON//I66j7iyAEK84y1k7dIgWCOZNSOwEiXSPnj9geteYpl aRGqDgMdLeqcLQ9UAe0hdFz5gv0xF/ctX4CxJFkcsYmORKFX1FC5RFidfxC6zXsd6Eb9 bwxSbzprolQEkQmBTqaMaFdkettxk4Q7OahoOT8bH3CDC+iHfRTM6lOEYPg2EAweMy8h aNLm03I/x9d0YVNIugHiCCO0rgCE6VaYURnIKVmKLLO0YYsB5fU8oPXgbbZAPIDBK+pd vn2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wEHO5EN1; 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=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 e12-20020a0562140d8c00b004620e890fe1si1143256qve.272.2022.06.01.11.31.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:31:10 -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=pass header.i=@linaro.org header.s=google header.b=wEHO5EN1; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwT7c-0002MK-OL for patch@linaro.org; Wed, 01 Jun 2022 14:31:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSr5-0001dx-DO for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:03 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:45961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSr3-0006Xa-Hy for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:03 -0400 Received: by mail-ej1-x62e.google.com with SMTP id jx22so5361624ejb.12 for ; Wed, 01 Jun 2022 11:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3D8/UyD+ztVeocgeehcA/xb0KzGAE86uC41XX1vBnSs=; b=wEHO5EN1aGj4BbNXnK77aPshmjP+Ksk+4YpNovNp6ZZW5AkTwrI4S2j1ckcIsFzUrO u3aDFSYb3U8kmZRzfMrRu3522JnfigsrbA1wfB8BP031QbSzd0zR1KVJp/yfAC5w/uOu RngoonLfaz1efkh6qsF6owusdN2Y4ebG2mPToopZiq4lN860oPDHMtkgNTH8ylhKtngg 5DKA9GUWaw2Ryiz1n9MaxO2aM8T7J0w/NsVvDLMXEDYt7CiO0FAK9iyFszFilx/mUgxy s4HjJeGB1xc25D943jVVuYUCb9SQzqufAwYxOEDdZNXHYMVhyc6fvxDMJk77GP5Q7fyP N5ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3D8/UyD+ztVeocgeehcA/xb0KzGAE86uC41XX1vBnSs=; b=57VaqCf/i+LkJButQr2o252cxxvwhM2cEFZkOE2NDAxH1bSRSGRERb3/OuINwHY0H3 hiBM3uELU/2OlqkmAn7UAHlmneF+HqaZ9iTY2waENNw9IOkejM5frMidw5khdwU58fMW Y/+uK3Zfdll9DuYjlYwvJnnNcRJGBPsMEFd1QKhNKqlz/spEC+onfkTglR5lzSQdGtkE yf/ptcJ44LeVaCsHu28uPrYH5ZRP8MUPBGu6mOsB9JwkOE4gE+BplZmHbpxtI1J6dU0f PTIAGMxrgKtpMuycwQzHtP+z9I4ETmn8vcVeiNrOivgT+vdL94XspWiyJOewh05hgjNT M1rg== X-Gm-Message-State: AOAM532FzXHOz0IaPhnBz9Gahs5T2DIfGjJrskOs473aXL49VDRBnQuh LC18YzGWyHKgg3YrSR6WMxxeKg== X-Received: by 2002:a17:906:6a29:b0:705:dc2b:727b with SMTP id qw41-20020a1709066a2900b00705dc2b727bmr737227ejc.80.1654107239012; Wed, 01 Jun 2022 11:13:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m3-20020aa7c483000000b0042de29d8fc0sm1329097edq.94.2022.06.01.11.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:13:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 15D481FFD0; Wed, 1 Jun 2022 19:05:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 25/33] configure: enable cross-compilation of optionrom Date: Wed, 1 Jun 2022 19:05:29 +0100 Message-Id: <20220601180537.2329566-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini While container-based cross compilers are not supported, this already makes it possible to build x86 optionroms on any machine that has an installation of GCC and binutils for 32- or 64-bit x86. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini Message-Id: <20220517092616.1272238-15-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-26-alex.bennee@linaro.org> diff --git a/configure b/configure index f509bce304..1ae5c950f0 100755 --- a/configure +++ b/configure @@ -2082,6 +2082,13 @@ probe_target_compiler() { fi } +probe_target_compilers() { + for i; do + probe_target_compiler $i + test -n "$target_cc" && return 0 + done +} + write_target_makefile() { if test -n "$target_cc"; then echo "CC=$target_cc" @@ -2190,6 +2197,10 @@ if test "$QEMU_GA_VERSION" = ""; then QEMU_GA_VERSION=$(cat $source_path/VERSION) fi + +####################################### +# cross-compiled firmware targets + # Set up build tree symlinks that point back into the source tree # (these can be both files and directories). # Caution: avoid adding files or directories here using wildcards. This @@ -2216,19 +2227,27 @@ done # Mac OS X ships with a broken assembler roms= -if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ +probe_target_compilers i386 x86_64 +if test -n "$target_cc" && test "$targetos" != "darwin" && test "$targetos" != "sunos" && \ test "$targetos" != "haiku" && test "$softmmu" = yes ; then # Different host OS linkers have different ideas about the name of the ELF # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the _fbsd # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386pe. for emu in elf_i386 elf_i386_fbsd elf_i386_obsd i386pe; do - if "$ld" -verbose 2>&1 | grep -q "^[[:space:]]*$emu[[:space:]]*$"; then + if "$target_ld" -verbose 2>&1 | grep -q "^[[:space:]]*$emu[[:space:]]*$"; then ld_i386_emulation="$emu" - roms="optionrom" break fi done + if test -n "$ld_i386_emulation"; then + roms="optionrom" + config_mak=pc-bios/optionrom/config.mak + echo "# Automatically generated by configure - do not modify" > $config_mak + echo "TOPSRC_DIR=$source_path" >> $config_mak + echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_mak + write_target_makefile >> $config_mak + fi fi # Only build s390-ccw bios if the compiler has -march=z900 or -march=z10 @@ -2381,7 +2400,6 @@ echo "GLIB_LIBS=$glib_libs" >> $config_host_mak echo "GLIB_BINDIR=$glib_bindir" >> $config_host_mak echo "GLIB_VERSION=$(pkg-config --modversion glib-2.0)" >> $config_host_mak echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak -echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak echo "STRIP=$strip" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak @@ -2571,10 +2589,6 @@ for target in $target_list; do done echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> $makefile) -config_mak=pc-bios/optionrom/config.mak -echo "# Automatically generated by configure - do not modify" > $config_mak -echo "TOPSRC_DIR=$source_path" >> $config_mak - if test "$skip_meson" = no; then cross="config-meson.cross.new" meson_quote() { diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 17ccc76241..f639915b4f 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -6,7 +6,6 @@ all: multiboot.bin multiboot_dma.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bi # Dummy command so that make thinks it has done something @true -include ../../config-host.mak CFLAGS = -O2 -g quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) @@ -44,7 +43,6 @@ Wa = -Wa, override ASFLAGS += -32 override CFLAGS += $(call cc-option, $(Wa)-32) -LD_I386_EMULATION ?= elf_i386 override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds pvh.img: pvh.o pvh_main.o From patchwork Wed Jun 1 18:05:30 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: 577825 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp858823mab; Wed, 1 Jun 2022 11:30:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9+FCHpyCKBDpHHeqML9RpaHmPoAZxT8ScXlzmPkqdkMLn2T0viglZKCLrerFbDTfNf1Ev X-Received: by 2002:ae9:ee09:0:b0:69f:5b81:f544 with SMTP id i9-20020ae9ee09000000b0069f5b81f544mr614673qkg.641.1654108255229; Wed, 01 Jun 2022 11:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654108255; cv=none; d=google.com; s=arc-20160816; b=0bT/KYll2+A7qP5AwpFh3i5KfVzoQGi+NCJVTMjrPvT6fCoamlwLaqpSUh6QvIMt60 XqO8lWa6yBiDk7SJ5MLJzBjVeBgMzO43M1dcw90PpaXtlUSqx/BCFXRJVFGrzHgSVlde H/a3xtYEPqSqHEyzb89Gwfkab3ApUcKEySFJLRKmKr78CRHKZP5RcBkD6RTsntgqVkC+ AX1+eWyHFX2rJdQ5eW8wDIotbGmnFbPHmGt8HLvEtoJTrCmxojhImoVyA6CM1yC+RSmQ fz3CpkI1VoA/P6hMIWzsQRpYTDwqPRl2KtZ+OBG4d1dNqDrt87WZ7UICRzD7JUpF+8O9 hlyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=NNlCCRkYehUnHF3YUoY5VU3xBO+CrXihXdIThtLGzC4=; b=DGhol6ow0KvTlEbb/nwtyaZs4/P5rdA+QM33hjZlIe5gWlZffViUN7Dz6ac5nZ/m47 S0j46UudpeG8ycwr+NAsW/xWxCkwuHXT4OfnvN9sUjwra+qV2To+RAMnLYqD9x6t9si7 mH8Qxi2gTypTsJW8lo8a2vtSZElO0EJ9XU1oEX8rBLJn7WEteJsQgxq+ntAkcNU3sEBn fSKWthruQ0/3mEdloBUCrvtZl6tdgFsPF4uPSh9Qrtb/pVdTcIX+7TewoY4fl/aJ8P13 QNrznFbUrXQIU8SG98aCcnr8TeIfUJ1Flj3JU5NoZ0mLd84SQS3i0Ld/77nzob+esJyR fokA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sgrmBKKN; 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=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 u19-20020a05620a455300b006a362885b48si1482787qkp.223.2022.06.01.11.30.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:30:55 -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=pass header.i=@linaro.org header.s=google header.b=sgrmBKKN; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwT7M-0001yT-Lj for patch@linaro.org; Wed, 01 Jun 2022 14:30:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSrN-0002Zn-Ts for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:21 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:36385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSrK-0006bU-60 for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:21 -0400 Received: by mail-ed1-x529.google.com with SMTP id fd25so3310826edb.3 for ; Wed, 01 Jun 2022 11:14:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NNlCCRkYehUnHF3YUoY5VU3xBO+CrXihXdIThtLGzC4=; b=sgrmBKKNXwwf1SWSY9JJni5LMaye7ab8bkR4L4NBLJ5UTUX5NGpopj309uu7CSXrc+ t9YWbcezkWLtt066O7jv2dyoMIybLnbwSyFtgokEl8tvTQR5DOaoPTUTvn+V1aR6zMb7 rnXlTw0z5EE8bEMxfFRTkBUIFWsh1EjFUPg9gAIYT4GKh5NewtzprUK/olsM/GhMvn01 tkAfL5LKb7DfVQSmCFYrF8OCssLObGdwV4I6l8C2ULaMicxo2ZO1+UuOmRGAemUhQweM aQVs6kkw8Sb3hqt0wbJX5IK6RX4m1FlWk1ga5RGA9sXOf3kcisV3tEWqgdZOY6sTdA8V AbhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NNlCCRkYehUnHF3YUoY5VU3xBO+CrXihXdIThtLGzC4=; b=ExJCPIBNOD3D4XTW5zUVn288SjIkaIoeS1/9JuNzNkD8g0OBJ5egIDOuiZk+VcoPB1 3GY5qyU1K4eU5Hk1VHX6oR9DaBBWSzxRqujQhS8whRhOtsaHxvVdxqZ96HDMeAbQTAUC TovIqQ5TYOPLdygbl5869tkhEO9JiCOPLp4K+CwkeE+CmhWPbrFW8v36xLIzHeDrNMy0 bILrNo/ybiyV8ZeAdEtZTCw7W1lIqbb0X5phC2StdWnc+QiG3fWJ86YNNT3cVhsyL/yH GGFO4lGdfA1CoBVsvkPEpZ966PHD/zAnQZKA2mpNSi37rPJxUlcXMKi/Th2y6wewRdlv JbYw== X-Gm-Message-State: AOAM531SQg86slD4EbrFJqxaAsjwOPonC+jF6SSgMsGofYXYFnnWieb5 bIc3O5NMJcPIPVIDj9iaMnnX/A== X-Received: by 2002:a05:6402:2713:b0:42b:7127:8614 with SMTP id y19-20020a056402271300b0042b71278614mr1071562edd.317.1654107256857; Wed, 01 Jun 2022 11:14:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k24-20020aa7c398000000b0042dcac2afc6sm1299864edq.72.2022.06.01.11.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:14:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 298211FFD1; Wed, 1 Jun 2022 19:05:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , Alexey Kardashevskiy , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Daniel Henrique Barboza , David Gibson , Greg Kurz , qemu-ppc@nongnu.org (open list:Virtual Open Firm...) Subject: [PULL 26/33] configure: enable cross compilation of vof Date: Wed, 1 Jun 2022 19:05:30 +0100 Message-Id: <20220601180537.2329566-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x529.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini While container-based cross compilers are not supported, this already makes it possible to build vof on any machine that has an installation of GCC and binutils for 32- or 64-bit PowerPC. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini Message-Id: <20220517092616.1272238-16-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-27-alex.bennee@linaro.org> diff --git a/configure b/configure index 1ae5c950f0..11e7f30553 100755 --- a/configure +++ b/configure @@ -2213,6 +2213,7 @@ LINKS="Makefile" LINKS="$LINKS tests/tcg/Makefile.target" LINKS="$LINKS pc-bios/optionrom/Makefile" LINKS="$LINKS pc-bios/s390-ccw/Makefile" +LINKS="$LINKS pc-bios/vof/Makefile" LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit LINKS="$LINKS tests/avocado tests/data" LINKS="$LINKS tests/qemu-iotests/check" @@ -2250,6 +2251,15 @@ if test -n "$target_cc" && fi fi +probe_target_compilers ppc ppc64 +if test -n "$target_cc" && test "$softmmu" = yes; then + roms="$roms vof" + config_mak=pc-bios/vof/config.mak + echo "# Automatically generated by configure - do not modify" > $config_mak + echo "SRC_DIR=$source_path/pc-bios/vof" >> $config_mak + write_target_makefile >> $config_mak +fi + # Only build s390-ccw bios if the compiler has -march=z900 or -march=z10 # (which is the lowest architecture level that Clang supports) probe_target_compiler s390x diff --git a/pc-bios/vof/Makefile b/pc-bios/vof/Makefile index aa1678c4d8..391ac0d600 100644 --- a/pc-bios/vof/Makefile +++ b/pc-bios/vof/Makefile @@ -1,11 +1,10 @@ -all: build-all +include config.mak +VPATH=$(SRC_DIR) +all: vof.bin -build-all: vof.bin - -CROSS ?= -CC = $(CROSS)gcc -LD = $(CROSS)ld -OBJCOPY = $(CROSS)objcopy +CC ?= $(CROSS)gcc +LD ?= $(CROSS)ld +OBJCOPY ?= $(CROSS)objcopy %.o: %.S $(CC) -m32 -mbig-endian -mcpu=power4 -c -o $@ $< @@ -14,10 +13,12 @@ OBJCOPY = $(CROSS)objcopy $(CC) -m32 -mbig-endian -mcpu=power4 -c -fno-stack-protector -o $@ $< vof.elf: entry.o main.o ci.o bootmem.o libc.o - $(LD) -nostdlib -e_start -Tvof.lds -EB -o $@ $^ + $(LD) -nostdlib -e_start -T$(SRC_DIR)/vof.lds -EB -o $@ $^ %.bin: %.elf $(OBJCOPY) -O binary -j .text -j .data -j .toc -j .got2 $^ $@ clean: rm -f *.o vof.bin vof.elf *~ + +.PHONY: all clean From patchwork Wed Jun 1 18:05:31 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: 577815 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp854258mab; Wed, 1 Jun 2022 11:24:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhZbQ6zsOQ2616b4lRQ3HXGgxQ5YZOuoktVuEOgg5O5KR/MXDcm1nvFsBtyEiOIbQCdzGU X-Received: by 2002:a05:620a:4142:b0:6a6:4960:720c with SMTP id k2-20020a05620a414200b006a64960720cmr664117qko.580.1654107895545; Wed, 01 Jun 2022 11:24:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107895; cv=none; d=google.com; s=arc-20160816; b=x2Lzin3qjiWO/9zQwTLO5lz2pdZ1F2jeh4+qJXlrYMQBb/Av+I506PHitod+1sYYte ffI2d2iv/Z+5Tzc3H9Kdx+Z6Pz6z1AQtsS+h1IVyLzIwLJ7HX8KDBUJ/lVxtWPSp44uP tVm9UBlFvivnY9ALdsv0fOl6hgIssJHUgIIgSUQ81JFTQcKQK9xbeDtM3hb0PXzZFLje qxf/8URiNxPLrH8azHrjImchsTPgWxV8btC4qjH/lFk9stjTzPDL/uBFUJ0KQ5H4hstq xo7I2i2S5mvIQkG1go2XRVx5lqAQza6T6fKDj5Uk5ft35bU5sVty3Dvs2TBJKrRgi/+y S1sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=QKJN+0byB62TurI1iE/iR4Hl0KYyS1GPnfCuVvTNJ/8=; b=JKNeuYwf72RRgBdIEo8M7YSD3tZEpciuVm8KyhYPNJbiKwF49CsYEpnYOV/8jrh1fi 5t9CNN5pJiYiQypJKYQKbRTX2ZBHJ9sVHE1YS4fiuYEd7JLwawXI1VefT5jBg7C903X9 y/1rAVad9J5HuRqdwoaVKIKZ+TAomBT0OYEs7qnAigojEv256UZScWbJPvkmHA/Gnejo TFowjMpjsZJ0oG4e+CDsWmmCs8cAB8PxD+j+yAy1ok+9iGc/7XoNF/yFKzzdVvIm1p6z ZbW81cEiuqJGsUZ8AdMGQ3lxaiYF7+z4skv1BwlDAEzcPtaPhaxYaizPKmTkCSg4rFg9 56+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OZPcqmJl; 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=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 de3-20020a05620a370300b006a41373b5afsi1286030qkb.494.2022.06.01.11.24.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:24:55 -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=pass header.i=@linaro.org header.s=google header.b=OZPcqmJl; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwT1b-0004US-4r for patch@linaro.org; Wed, 01 Jun 2022 14:24:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSrJ-0002ND-Pe for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:17 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:36660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSrI-0006bG-8P for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:17 -0400 Received: by mail-ej1-x630.google.com with SMTP id gi33so5425976ejc.3 for ; Wed, 01 Jun 2022 11:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QKJN+0byB62TurI1iE/iR4Hl0KYyS1GPnfCuVvTNJ/8=; b=OZPcqmJlbcLVisMoVS80x8Q6bAgi3dODeV/wcr5bdpr5pSlL3qqNOoxsaYfETDr/Do aBOPvP3garnNH4/hKNtru287vpMq0r38gcVey9X1LNRn29t/AwfXgk0L7/n78Xw0koeB NGkinc1sar1FeRObm47MHcROWH8qMpO2F+WmnM7eVhpOCSwg99L7g5a9xPQCcYrtgCan faBsidxqu2ginCuKMBWdWdQwoxUuIsyhqzRUvoE7iIzu/NO8A/DMHT3Xqk34wGzV4NT9 vJrRrJ6I1jgKFgwhMdHhdEpzeBC90uEPwjENqgfNDBwPbAM9KDx6uTkQfiRzU27hye1J PGhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QKJN+0byB62TurI1iE/iR4Hl0KYyS1GPnfCuVvTNJ/8=; b=UDjzVhG4vlx9unFpQ5nm7w2fAwH99270wkSIy2ba1+fQRmK9zYJqPP3RHIkCn2Rkd5 0tuYxUVt+jNWIT0fO70E26AIQqklk43pxvhwpm4F/pGR/ObKo13uS7BMPEGl7QqFvefg qmbpZFDxK7WdrDcusZ6f/+qzpNR0JDtkiTnYPb2wy/zxZQFnDQbNtCKR49iei0QWxHVY QTEpRLuyOesslBXOJjFi/GQW6KvZxkxvFA9mJKdDjIDtUkC8wVUY7srLUMCKy0TYOJfk y/ODEmU+EL7EfdBB5R3ooXsnMOVssnoyCzid7YHdp5FdeIuxiCxdGMgCwV0ClYRQUF3d 67LA== X-Gm-Message-State: AOAM530LSBg5I3tBMp/w8url0O1ciltpoWHC36QTzltRk8FKoqhhTYy6 TLKKg6B0KrXeTPmv8ubnNMdZdw== X-Received: by 2002:a17:907:2dab:b0:6fe:e1f0:3e8b with SMTP id gt43-20020a1709072dab00b006fee1f03e8bmr733281ejc.55.1654107254875; Wed, 01 Jun 2022 11:14:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u19-20020aa7db93000000b00428bb4c952bsm1298886edt.31.2022.06.01.11.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:14:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 43CB01FFD2; Wed, 1 Jun 2022 19:05:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 27/33] configure: remove unused variables from config-host.mak Date: Wed, 1 Jun 2022 19:05:31 +0100 Message-Id: <20220601180537.2329566-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini The only compiler variable that is still needed is $(CC), for contrib/plugins/Makefile. All firmware builds have their own config-host.mak file. Signed-off-by: Paolo Bonzini Message-Id: <20220517092616.1272238-17-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-28-alex.bennee@linaro.org> diff --git a/configure b/configure index 11e7f30553..b9ccff9067 100755 --- a/configure +++ b/configure @@ -2397,11 +2397,6 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak echo "MESON=$meson" >> $config_host_mak echo "NINJA=$ninja" >> $config_host_mak echo "CC=$cc" >> $config_host_mak -echo "AR=$ar" >> $config_host_mak -echo "AS=$as" >> $config_host_mak -echo "CCAS=$ccas" >> $config_host_mak -echo "OBJCOPY=$objcopy" >> $config_host_mak -echo "LD=$ld" >> $config_host_mak echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak echo "QEMU_OBJCFLAGS=$QEMU_OBJCFLAGS" >> $config_host_mak @@ -2410,7 +2405,6 @@ echo "GLIB_LIBS=$glib_libs" >> $config_host_mak echo "GLIB_BINDIR=$glib_bindir" >> $config_host_mak echo "GLIB_VERSION=$(pkg-config --modversion glib-2.0)" >> $config_host_mak echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak -echo "STRIP=$strip" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak # use included Linux headers From patchwork Wed Jun 1 18:05:32 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: 577814 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp853701mab; Wed, 1 Jun 2022 11:24:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOy+OqLMA+HAlFFxCXLpGBneUBrsYdn4j2gzkPfQtHkgJQ4fSAU9vbp+KWqbeNukTYyGOP X-Received: by 2002:ad4:5d4b:0:b0:464:6c5d:f525 with SMTP id jk11-20020ad45d4b000000b004646c5df525mr3694941qvb.122.1654107850112; Wed, 01 Jun 2022 11:24:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107850; cv=none; d=google.com; s=arc-20160816; b=glxVQtJzyQtCgCU+oJq4TBRoF7Mzy8K/NPLQIhJoRfYCvXW45qulZWvNLI6b5yA56j xiuKAXYKb8oQkuqB6Jtct9tZ/SqLI5cyz4kuyDP43nGi9djbup4NZ7SeWqY5YR2K/jnz pKMxHRfbBIG1U0U3WQ0dnFYtrjBfS3pqYMYymaAmVcf1M/lWx8TBGqulk1vdmUxvdkQ0 HwGi/kv9Xw4xvR0Qv41/moBEF9Na7ms8eqf3U4opf84mESfh8ArJUbGrnhKhbmpARUrj 3ZAfHo53Zdzbp1w3JIZTZUU6xJR00LQJd9oYRk4+AWCjCjGvAqBcmi104mkWxZN3uSZ3 M3NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=9ZI6PLSlRMEqMQdx3EhC/9GDtUUl7MXmj9n2SWhz5Ng=; b=ll39sLea+oqjuzkucAiPkV3SdAJbqpZbDjQlC2duRpCTX158c5L7VqS7djJfU2uNph I5e1sGxxn++eGVWndmuz0yXeFBZzdQNNgdu01DNpBJ/BorM3Hp38M8zhMvZ7PI4fKQCz nz9CKu4j6WPcFQBoAEqOTf99ak/EFUSrOcyMDTjkP6NKFBd4eIYbFlsnqrC7R3GX+ET3 F5asRmiG3qGWk59Bl/GDxnbX/zltNIYUpW5JT6xHS7nsdfoJcxcOJrl229989k1pocah +N7UZaOaYTk63OyNze9tlYaWfzL9+KbybzU0AoJvSjwyy0dg5x8uMDohRkBoOp1MFD2C CxEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E8vuohhh; 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=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 hu2-20020a056214234200b00461eff5f9b8si1143207qvb.250.2022.06.01.11.24.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:24:10 -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=pass header.i=@linaro.org header.s=google header.b=E8vuohhh; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwT0r-0003DY-Le for patch@linaro.org; Wed, 01 Jun 2022 14:24:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSr7-0001k9-5n for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:05 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:33667) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSr4-0006Yw-4U for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:04 -0400 Received: by mail-ed1-x530.google.com with SMTP id h19so3338607edj.0 for ; Wed, 01 Jun 2022 11:14:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9ZI6PLSlRMEqMQdx3EhC/9GDtUUl7MXmj9n2SWhz5Ng=; b=E8vuohhhmAy7a2UNMUOrrfeqyyYV/Jg84aEk/WjGE+ZbcbK1oWGJ4I0xVWlnbV5oI1 1eiAItuSUR6LCf1IaWjUPzcMY0K/rgzCqyXJdxs5fe6fiDg1JrHiE5g3Twb6FKrhlRWp UvmU4GGErrhfTgNrgnVvKRdqtYhN4+d9mgT8widtsHYZw2n8iRzn8MJ+1PH3vF+EZUBA /sJX5AMgKNfAyIVjC+5mnyNvLxDXdplcE+e91zFpiEsd2Kff85qCDITB5Me2VSiKlrHP LmRnLvbdatJTn/OSQzEqwTSh9ImjFZR6FxRbfi9RU44gOXplkQtHKUCdJjJCfqj3La+U j9Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9ZI6PLSlRMEqMQdx3EhC/9GDtUUl7MXmj9n2SWhz5Ng=; b=x9a5cR/iymXJSqOSF5XvWUAzRLm0dxPRpWWF9ZAM3iVCU5LvJ6lDdween126vp9Sqc v00BeVnu1oY3Or5sP44YWlv1Q4GAMMTEUW6B8/5Dn4+ip1UbZV228kv+gWJHMVNYTNsV FHwvgdCkH4Keubl1vqJokdhCNo79T5Em0S2AHkk7+njKwNLvvuwqqfcy535p8KSBkuPf OXf8CJKXNGjdxXuZfWunHmZq25Gs7DNLY/GXpTga4HrKbnytpd0P0bRbThvhNuViMg2e A7KWJOgv0jGEtn0/IzKBVMPp2bUQPw4kh3BTIjNX1sb9e5LqZUswXaSMuoxWsX2NLHFh 0HFw== X-Gm-Message-State: AOAM531wGXMw8eXFkvfN+swfvgB/LAJXBv+8h12Smesf7Vzoel0mP4+i 39N7dcF4JK35vXF6/IQO/LL8cg== X-Received: by 2002:a50:9b11:0:b0:42a:c1b2:b2ca with SMTP id o17-20020a509b11000000b0042ac1b2b2camr1027447edi.313.1654107240650; Wed, 01 Jun 2022 11:14:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a8-20020a170906368800b006f4c557b7d2sm957712ejc.203.2022.06.01.11.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:13:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 621D71FFD3; Wed, 1 Jun 2022 19:05:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 28/33] gitlab: introduce a common base job template Date: Wed, 1 Jun 2022 19:05:32 +0100 Message-Id: <20220601180537.2329566-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé Currently job rules are spread across the various templates and jobs, making it hard to understand exactly what runs in what scenario. This leads to inconsistency in the rules and increased maint burden. The intent is that we introduce a common '.base_job_template' which will have a general purpose 'rules:' block. No other template or job should define 'rules:', but instead they must rely on the inherited rules. To allow behaviour to be tweaked, rules will be influenced by a number of variables with the naming scheme 'QEMU_JOB_nnnn'. Signed-off-by: Daniel P. Berrangé Message-Id: <20220526110705.59952-2-berrange@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220527153603.887929-29-alex.bennee@linaro.org> diff --git a/docs/devel/ci-jobs.rst.inc b/docs/devel/ci-jobs.rst.inc index 92e25872aa..eb6a9e6122 100644 --- a/docs/devel/ci-jobs.rst.inc +++ b/docs/devel/ci-jobs.rst.inc @@ -28,7 +28,35 @@ For further information about how to set these variables, please refer to:: https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd -Here is a list of the most used variables: +Variable naming and grouping +---------------------------- + +The variables used by QEMU's CI configuration are grouped together +in a handful of namespaces + + * QEMU_JOB_nnnn - variables to be defined in individual jobs + or templates, to influence the shared rules defined in the + .base_job_template. + + * QEMU_CI_nnn - variables to be set by contributors in their + repository CI settings, or as git push variables, to influence + which jobs get run in a pipeline + + * nnn - other misc variables not falling into the above + categories, or using different names for historical reasons + and not yet converted. + +Maintainer controlled job variables +----------------------------------- + +The following variables may be set when defining a job in the +CI configuration file. + +Contributor controlled runtime variables +---------------------------------------- + +The following variables may be set by contributors to control +job execution QEMU_CI_AVOCADO_TESTING ~~~~~~~~~~~~~~~~~~~~~~~ @@ -38,6 +66,12 @@ these artifacts are not already cached, downloading them make the jobs reach the timeout limit). Set this variable to have the tests using the Avocado framework run automatically. +Other misc variables +-------------------- + +These variables are primarily to control execution of jobs on +private runners + AARCH64_RUNNER_AVAILABLE ~~~~~~~~~~~~~~~~~~~~~~~~ If you've got access to an aarch64 host that can be used as a gitlab-CI diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml new file mode 100644 index 0000000000..10eb6ab8bc --- /dev/null +++ b/.gitlab-ci.d/base.yml @@ -0,0 +1,28 @@ + +# The order of rules defined here is critically important. +# They are evaluated in order and first match wins. +# +# Thus we group them into a number of stages, ordered from +# most restrictive to least restrictive +# +.base_job_template: + rules: + ############################################################# + # Stage 1: exclude scenarios where we definitely don't + # want jobs to run + ############################################################# + + + ############################################################# + # Stage 2: fine tune execution of jobs in specific scenarios + # where the catch all logic is inapprorpaite + ############################################################# + + + ############################################################# + # Stage 3: catch all logic applying to any job not matching + # an earlier criteria + ############################################################# + + # Jobs can run if any jobs they depend on were successfull + - when: on_success diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml index 871262fe0e..691d9bf5dc 100644 --- a/.gitlab-ci.d/qemu-project.yml +++ b/.gitlab-ci.d/qemu-project.yml @@ -2,6 +2,7 @@ # https://gitlab.com/qemu-project/qemu/-/pipelines include: + - local: '/.gitlab-ci.d/base.yml' - local: '/.gitlab-ci.d/stages.yml' - local: '/.gitlab-ci.d/edk2.yml' - local: '/.gitlab-ci.d/opensbi.yml' From patchwork Wed Jun 1 18:05:33 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: 577828 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp861552mab; Wed, 1 Jun 2022 11:34:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/DKzG4vkjwbfFzqqVLE28/aChtkbu1QBzVQ0koj7jpR8wI8YW8t3svbnUuzufwByx6Y5+ X-Received: by 2002:ac8:7dcc:0:b0:2f3:e050:bfe with SMTP id c12-20020ac87dcc000000b002f3e0500bfemr953591qte.16.1654108454967; Wed, 01 Jun 2022 11:34:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654108454; cv=none; d=google.com; s=arc-20160816; b=cEWQbtON7agW+zXn1Qb0YflgZeyrBnPU5o+JWtq9tGoI3/LXEDcpIzg754NdsyTexT WxCnzBAgvycw7565SoBUWlk/MOG5eswjNE6C+5XMy5v3T1zk0lx9VU+xbMeCs+5ers8A 4CYODOEJPloZHz2SEXIAJm2a0qZQRhYTKplybYuVockPRe1mYzOqk9ZoTYXhMg7vheLA BMx+MpdhnXvQ44Uc5qQtXCvD66W/3YJM1XDny7eMEy3YpoeVGlYyuoRj7x2iSwUMZE+V eLTtoBkAl5Ea0ZAD+SCH3foofWUYSoTmsMr5YF+KkpX+h2O/5m3dUqg6Y2vGjdKBxuwD bH4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=CgrZcRvEC92TB5SicobcmdhVz8wTpWobClc7Uf+aGt4=; b=s4is2XT0n4z0WPn+byCh1erBvE/0Z6nC2z5iuWnybPcyrI1bAbGCnFxeaAx5cMvhhK hK3WiXMuQNPDelco0V52HbhOIrFDKWA0bw1k/4o/3IaT3SAU3i/ZNCROqRyh3Id56RfU bCeQz7w1RBjrxsCQQ/RwHXBpyM4gGcfwDbMS0Lmg9AI85CED/QwLKt87l3NazmU739Vi MqfzmPVQzUqKTOvNxuuiEPFRaqT+b3ypkjr6EflTtZbu9AmthkbrAC5eSvCY9gQMqyeb RGNCkownsrusZbtY+eqpg1jEnswVQ6IhsitLZcqcFI0agFhdtwP0ewdRq1ZBXmIDTa+r 8DsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aF4PaLdL; 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=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 fv15-20020a056214240f00b00440e46a7c71si1075066qvb.271.2022.06.01.11.34.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:34:14 -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=pass header.i=@linaro.org header.s=google header.b=aF4PaLdL; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwTAc-0006WO-Hv for patch@linaro.org; Wed, 01 Jun 2022 14:34:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSrH-0002ES-Dh for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:15 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:41760) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSrF-0006aw-JK for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:15 -0400 Received: by mail-ed1-x536.google.com with SMTP id 25so3038549edw.8 for ; Wed, 01 Jun 2022 11:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CgrZcRvEC92TB5SicobcmdhVz8wTpWobClc7Uf+aGt4=; b=aF4PaLdLf8rwIpc+89gKetlg8JhP6PFDIKfInBzrKMjuatrfx3emJjORW9gWX2AUjO Tqtsqth7x2/9EZeN3pjNyLoMTf5YHmjzXaonQKdn0GsaLQSrlriv4Zos5mYWAeJz9vek lQWFeKrevsMJFc5lKTl/qFEBCR9metVzm5rmU6EPIPopzvpDsuydDEHIMYJ/2Nrtgl66 5+9GFyEdtU9GiF8Jj9FNRLLfyI7ShyDSOzOAXuOBKVUWgrKjhnPKFbN6krrX5lTpUT1x 5/ZBW5X9euodHRK9dGL02Xf96CTa1wwT7IJp4mQ1L6+jvIvO7gqY3RE1BBGzdaIUs2ZA Qg6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CgrZcRvEC92TB5SicobcmdhVz8wTpWobClc7Uf+aGt4=; b=zFduaboKvl2sSKcy69Nv0An96192GnY1UGsIBnW6Nk86OA5CREDZ5aRGUcgOaCQmWa KDouxboZuMqDePlWkVBOT9vUw1uuI3db97e8XR2ORsY5nTIFQrocQQwKj3+00fSihMgi RpiEVsgkw2LBmkMWt7NSTWOr7wnAThySLzkxmfQB/GA5NznKc4SOY6IICmUp2ltd9O7v FMmEBFC11ui+0NSRy4K24QMpQiqEZYFNsq/RJS/4PxOE9oDCRlVWmaXGpx8HwcG7bl3J M7kGOTJ+r7VTqfFgLPL8bg3EIauVATWse/bbRzajgQDixRct/C9iLPxI2zsaweu44RVQ cI3g== X-Gm-Message-State: AOAM531fgqumMbndqNlvRsQ19XGveZfQxS3wYwu81tl2R50XguW/YIDl /4DY0K/TCnrqlNfzNJovfHsF4w== X-Received: by 2002:a05:6402:1cb5:b0:42d:ddda:7459 with SMTP id cz21-20020a0564021cb500b0042dddda7459mr1157829edb.16.1654107252157; Wed, 01 Jun 2022 11:14:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f7-20020a170906560700b006fef5088792sm977430ejq.108.2022.06.01.11.14.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:14:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7D0E01FFD4; Wed, 1 Jun 2022 19:05:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 29/33] gitlab: convert Cirrus jobs to .base_job_template Date: Wed, 1 Jun 2022 19:05:33 +0100 Message-Id: <20220601180537.2329566-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This folds the Cirrus job rules into the base job template, introducing two new variables - QEMU_JOB_CIRRUS - identifies the job as making use of Cirrus CI via cirrus-run - QEMU_JOB_OPTIONAL - identifies the job as one that is not run by default, primarily due to resource constraints. It can be manually invoked by users if they wish to validate that scenario. Signed-off-by: Daniel P. Berrangé Message-Id: <20220526110705.59952-3-berrange@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220527153603.887929-30-alex.bennee@linaro.org> diff --git a/docs/devel/ci-jobs.rst.inc b/docs/devel/ci-jobs.rst.inc index eb6a9e6122..a539f502da 100644 --- a/docs/devel/ci-jobs.rst.inc +++ b/docs/devel/ci-jobs.rst.inc @@ -52,6 +52,20 @@ Maintainer controlled job variables The following variables may be set when defining a job in the CI configuration file. +QEMU_JOB_CIRRUS +~~~~~~~~~~~~~~~ + +The job makes use of Cirrus CI infrastructure, requiring the +configuration setup for cirrus-run to be present in the repository + +QEMU_JOB_OPTIONAL +~~~~~~~~~~~~~~~~~ + +The job is expected to be successful in general, but is not run +by default due to need to conserve limited CI resources. It is +available to be started manually by the contributor in the CI +pipelines UI. + Contributor controlled runtime variables ---------------------------------------- diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index 10eb6ab8bc..5734caf9fe 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -12,12 +12,21 @@ # want jobs to run ############################################################# + # Cirrus jobs can't run unless the creds / target repo are set + - if: '$QEMU_JOB_CIRRUS && ($CIRRUS_GITHUB_REPO == "" || $CIRRUS_API_TOKEN == "")' + when: never + ############################################################# # Stage 2: fine tune execution of jobs in specific scenarios # where the catch all logic is inapprorpaite ############################################################# + # Optional jobs should not be run unless manually triggered + - if: '$QEMU_JOB_OPTIONAL' + when: manual + allow_failure: true + ############################################################# # Stage 3: catch all logic applying to any job not matching diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index b96b22e269..609c364308 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -11,6 +11,7 @@ # special care, because we can't just override it at the GitLab CI job # definition level or we risk breaking it completely. .cirrus_build_job: + extends: .base_job_template stage: build image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master needs: [] @@ -40,11 +41,8 @@ <.gitlab-ci.d/cirrus/build.yml >.gitlab-ci.d/cirrus/$NAME.yml - cat .gitlab-ci.d/cirrus/$NAME.yml - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml - rules: - # Allow on 'staging' branch and 'stable-X.Y-staging' branches only - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH !~ /staging/' - when: never - - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN" + variables: + QEMU_JOB_CIRRUS: 1 x64-freebsd-12-build: extends: .cirrus_build_job @@ -90,11 +88,11 @@ x64-macos-11-base-build: # The following jobs run VM-based tests via KVM on a Linux-based Cirrus-CI job .cirrus_kvm_job: + extends: .base_job_template stage: build image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master needs: [] timeout: 80m - allow_failure: true script: - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g" -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g" @@ -105,8 +103,10 @@ x64-macos-11-base-build: <.gitlab-ci.d/cirrus/kvm-build.yml >.gitlab-ci.d/cirrus/$NAME.yml - cat .gitlab-ci.d/cirrus/$NAME.yml - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml - rules: - - when: manual + variables: + QEMU_JOB_CIRRUS: 1 + QEMU_JOB_OPTIONAL: 1 + x86-netbsd: extends: .cirrus_kvm_job From patchwork Wed Jun 1 18:05:34 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: 577832 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp865719mab; Wed, 1 Jun 2022 11:38:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOLUhSac/zA19WspV+JRy5/LKC0tRLGkZFW9eg5BRqrSsIHmHhAYzsdNQYEpK4uUeJOBGX X-Received: by 2002:a37:9c4a:0:b0:6a5:ac5a:2b66 with SMTP id f71-20020a379c4a000000b006a5ac5a2b66mr956403qke.356.1654108717714; Wed, 01 Jun 2022 11:38:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654108717; cv=none; d=google.com; s=arc-20160816; b=oZ0oPx4H5WMdybJ5kWH9wqDeiFB3lfxDmJU+BEC9RV/+R33YQNfecN6rPlmrSSxkui qW2nHPPTquyS3M27Afi+DXz8nfhYdFNujxLe8UWz4U8iBQn2bapklv6aisVM4xJKpJeV EdBV+jT7X+pingomYA8aWOHrj1wQz7ZoxBbZ231dbT12JNVM0Vb+ey+KqYs8tro0e/bK RTZqolg16uVXv9T0d7otOhV8FK0718rUBxepcCrHQU7ZEBgSHiCV9PTzaDw7XFaXAMYe P9BTpDMO85LZecUql92tJ3FoaFBzhQq0AtDGjHniUXPm0VQs6K4RteleXkYBXe8jDLhN zqdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=tG3XVIgRlYICdHMGLmxPrKM99tTN6zMZGL49EBiZlFI=; b=kIU/r3cdzKPd6LjzqzF/4iagUXPSmCqfOulDk3+9eOfceXPffTvmHlswBjeaRldESZ zR9FtEg7+HWOaj+HWveNbF5sfOfa0jr6Ab8JprVI/k3nJafzLq7YP09FaOSPZT2o+Q36 JYIoXAL0m6v0uqNWbto4PZMKvnLEfA5KNKDAYHDFUt0M38NiB/yO7t2vvmIQPlRNM+mh Vpa+r5u+JRrnfm8XanTm7SFRm7HuU+PfiSb15cmYHCnqz49xy9etxh56YTBBbcAODawN LEQ6sszR1L5P3PG7lLkIG8bEzee477gMceq1p3eaaCHdbrCum77LVHpcUsfXA/VGaqL9 OmsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gF1qKuBO; 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=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 p10-20020a05621421ea00b004644af48d97si1042748qvj.156.2022.06.01.11.38.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:38:37 -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=pass header.i=@linaro.org header.s=google header.b=gF1qKuBO; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwTEr-00047F-8N for patch@linaro.org; Wed, 01 Jun 2022 14:38:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSrN-0002Zo-UA for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:21 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:35568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSrL-0006be-1q for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:21 -0400 Received: by mail-ed1-x52d.google.com with SMTP id t5so3306034edc.2 for ; Wed, 01 Jun 2022 11:14:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tG3XVIgRlYICdHMGLmxPrKM99tTN6zMZGL49EBiZlFI=; b=gF1qKuBOBkJ7TB788RdmtmifV67/NGUcmA5W9AkCB+5GceiNBCN5/H1jSt+EQTtvan vJstANsBfKtuJuvMPbcVKUH/OYfTZ/lrVvHyYD2NJTLS5RaveNBkQgoXzeyNJX7Va9Vh m1JfqEOXfLLTs9e98i483PJRLDIHJ08ZJtNNyiYzs7Zmv1681eZBccuvR26oMssk5Hns tlT+C3BRseranhtieHIctJyf8uJdwBkrWerOIU4Wxo9M5nW/fDULBp9xJOJVVxH0KJdt pGF8+8HY1XuL2QgJe4DT/EQldTAWacmqGTvFj92W3evT7knbIwuMe7CjoB0dNZ9wGwl4 kCFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tG3XVIgRlYICdHMGLmxPrKM99tTN6zMZGL49EBiZlFI=; b=bWw17wEWlgUAS8/EWQe9mLZyVSigLg+5j/W63BuZVYmKDw699ePpvTTZGMxPnIH0D0 Sv0Qh2wvjXjY5/OwHtTGr6ISEnBNlkB1XF9KIP9/35VIMBN2y8aQPhjRRA7wiD44CMei y/XN4paNeJCjnHsUx6lt3NdAYrAzUl0/R4eM1d0+MHWpSK5muz3YEmjFgxpPbrUlYChQ r4g5lMmt9DH2cYdc0qVmrnMWAm+QtDrv9uxbNywsjp0izSa3WmYfs7HFFbcjLrZTGRmk /2eejy7LbF5MH6LIV5BHZ1mdTUrGmuBGr4Qtir4Fa6Of8ZbipTi8i8O6ElYEK9AjavIn KQTw== X-Gm-Message-State: AOAM532RArbfLdXDvOcOEL50wDN2qCmmOq2tttQAIkcy8nHJUzi7PFg7 fTddtoiFNJVeNWfHIJipMD4oNQ== X-Received: by 2002:aa7:d557:0:b0:42a:c6a0:7c28 with SMTP id u23-20020aa7d557000000b0042ac6a07c28mr1101621edr.426.1654107257562; Wed, 01 Jun 2022 11:14:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o23-20020a056402039700b0042df2371b1bsm1341020edv.89.2022.06.01.11.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:14:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8D6001FFD5; Wed, 1 Jun 2022 19:05:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 30/33] gitlab: convert static checks to .base_job_template Date: Wed, 1 Jun 2022 19:05:34 +0100 Message-Id: <20220601180537.2329566-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This folds the static checks into using the base job template rules, introducing one new variable - QEMU_JOB_ONLY_FORKS - a job that should never run on an upstream pipeline. The information it reports is only applicable to contributors in a pre-submission scenario, not time of merge. Signed-off-by: Daniel P. Berrangé Message-Id: <20220526110705.59952-4-berrange@redhat.com> [AJB: fix typo] Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220527153603.887929-31-alex.bennee@linaro.org> diff --git a/docs/devel/ci-jobs.rst.inc b/docs/devel/ci-jobs.rst.inc index a539f502da..4c7e30ab08 100644 --- a/docs/devel/ci-jobs.rst.inc +++ b/docs/devel/ci-jobs.rst.inc @@ -66,6 +66,13 @@ by default due to need to conserve limited CI resources. It is available to be started manually by the contributor in the CI pipelines UI. +QEMU_JOB_ONLY_FORKS +~~~~~~~~~~~~~~~~~~~ + +The job results are only of interest to contributors prior to +submitting code. They are not required as part of the gating +CI pipeline. + Contributor controlled runtime variables ---------------------------------------- diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index 5734caf9fe..e6953c77ae 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -16,6 +16,10 @@ - if: '$QEMU_JOB_CIRRUS && ($CIRRUS_GITHUB_REPO == "" || $CIRRUS_API_TOKEN == "")' when: never + # Jobs only intended for forks should always be skipped on upstream + - if: '$QEMU_JOB_ONLY_FORKS == "1" && $CI_PROJECT_NAMESPACE == "qemu-project"' + when: never + ############################################################# # Stage 2: fine tune execution of jobs in specific scenarios diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml index 94858e3272..289ad1359e 100644 --- a/.gitlab-ci.d/static_checks.yml +++ b/.gitlab-ci.d/static_checks.yml @@ -1,4 +1,5 @@ check-patch: + extends: .base_job_template stage: build image: python:3.10-alpine needs: [] @@ -6,15 +7,13 @@ check-patch: - .gitlab-ci.d/check-patch.py variables: GIT_DEPTH: 1000 + QEMU_JOB_ONLY_FORKS: 1 before_script: - apk -U add git perl - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' - when: never - - when: on_success - allow_failure: true + allow_failure: true check-dco: + extends: .base_job_template stage: build image: python:3.10-alpine needs: [] @@ -23,12 +22,9 @@ check-dco: GIT_DEPTH: 1000 before_script: - apk -U add git - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - when: never - - when: on_success check-python-pipenv: + extends: .base_job_template stage: test image: $CI_REGISTRY_IMAGE/qemu/python:latest script: @@ -39,6 +35,7 @@ check-python-pipenv: job: python-container check-python-tox: + extends: .base_job_template stage: test image: $CI_REGISTRY_IMAGE/qemu/python:latest script: @@ -46,8 +43,6 @@ check-python-tox: variables: GIT_DEPTH: 1 QEMU_TOX_EXTRA_ARGS: --skip-missing-interpreters=false + QEMU_JOB_OPTIONAL: 1 needs: job: python-container - rules: - - when: manual - allow_failure: true From patchwork Wed Jun 1 18:05:35 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: 577813 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp851389mab; Wed, 1 Jun 2022 11:21:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLrYF8yG53UqMaAqWhZlI052/QgCPriuHhGX2vuX5q0EYh7n29E7IJ7K2O5Dp8E1+rA2Ju X-Received: by 2002:a05:622a:7:b0:2f3:c136:b7bc with SMTP id x7-20020a05622a000700b002f3c136b7bcmr838249qtw.243.1654107677158; Wed, 01 Jun 2022 11:21:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107677; cv=none; d=google.com; s=arc-20160816; b=r65/bVxl93SMWPD33UYJjIe8z/T6lMiLoZRrM5HPQ3Plf/rfZV/xyKSHkx8i65x9Ph tgxkgJLkRBqwYfa9OF8uSjDFQ9h5K7RLsQWcND0n7Xf/TfR15X+y8zNxdnCvj8OEVYQX ep08+fV3TNYZ/Hqk1J/rzULR56YvHs/SV+yzPqcnMpghD4QOOYWK6YVBafstLaeI+8gx 0A7WSgqmnIuwJcAE+Y4XAzOUUVcPzzHDGlzp0G6/fFrIMyBfIJWf45dsqHvruhGJnyUK 3+qIokP9KRIsrRgPymLzcmm+q9QaHlZ7hUlmTS2vsrB42XG8gcgbJZU0Aj6t1cjB3HDg 3txQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=wP6PigJHNuoayhBp2jmawNd+sISxnEobctLFhdKZNZs=; b=nSuNxqcFrKItU+MT1xTD1Gd8yRLvF9qxPcGwAZHTypjd3jmtBdHiS469ipxNGRaPNO wR1nK6fxyLi4XmLLb8wJz/Vgdo/6bVPk+jeXHsHKAoDi3TIMMsxblfrFXX6RWAShZw5j TrtcKLEkFDKm0x7Wjt+IK0CoSYpmBG4eGIBEYHOk7UO8/3l+d22IsDtRVv3ghwGhUxv3 01s+O4bYRGuN3NyphXFmwDx5VEGHWZ8dRo/ctal5fOyAto2gTi/H+4GXPuFY2AWOa1Al 0Etxiu9PCG4Aut8PD6ln5uU0tfgca6AmAd71Ng7dkS7qDUpmG960Quh/AlI8RFBeoGu6 63DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S2Pnkx70; 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=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 q5-20020a05620a0d8500b006a39db1d696si1416770qkl.474.2022.06.01.11.21.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:21:17 -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=pass header.i=@linaro.org header.s=google header.b=S2Pnkx70; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSy0-0008D6-Fb for patch@linaro.org; Wed, 01 Jun 2022 14:21:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSrA-0001sg-9h for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:08 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:33635) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSr8-0006Z7-76 for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:08 -0400 Received: by mail-ej1-x633.google.com with SMTP id f9so5500542ejc.0 for ; Wed, 01 Jun 2022 11:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wP6PigJHNuoayhBp2jmawNd+sISxnEobctLFhdKZNZs=; b=S2Pnkx70a4SXO+5DLAHXX1O3HP2LDiWk8iWrDBJEbyZGeq3klOgfPtgU3UK50QKJYu 5pi16BciBjSX91Q+ZacgzHH7Gho/kkI0Wd3xVl9jYnkcUK5JO/REKilnZh9gNoA0LWQn DqBJeAk4i4SsM8sSOlVIFo4SoTtrPw4r/vGX6fmPD6rAmt0UG34QtzXvT+V3nP0mqYAH c7/Oln/LRrVk5/uoTt5P0936nJrCCwo+Vu7ceuC5cMIfntvCkeslZqoELCs72v3kAaNK pZUb7f5hsHWKoJWazb1hbqv02GcBosv/gp7nB74WOJVB6nB1aWuDgMzzepFBp5KUYvgN eiGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wP6PigJHNuoayhBp2jmawNd+sISxnEobctLFhdKZNZs=; b=OLVFVjvXiLsNsTvJClEjGUk0q5Pb+a/GbdZjJPaShzAq1ZgQaTk8Pu/WeJtuD+yCeP FrV65CV6lrfdOCCDfb5B6SRTi0qBtxy+H09wstbHlOX/HZDFLytdKlrPtCvcVOTJaFyM T98lenKartkGDareoDzSrDie865V1GotCNx1Iyuhp8CnWKUG4nK3h8T+atgMe77VmB2y fKvr2J1/p/oxi7MyTyyiG3vyRuaVXNM7Z+u1wycZYMVPNZZS6raLWhzf/re8nrfC1kGJ rMjkc+7ioCwOq80iRduVQdNmdVHUeRRqBiiPqN2cZQ2UeAxu0yNoS5D9ieNVXJmB22VS 3hqg== X-Gm-Message-State: AOAM5308IfrttcpeEbVn+Nb8Lf3ripOBlpORTBEc2GHtI3dBnzFz9UAR 1WhzDsUKI9OX6cfiHPx0Lk3nQg== X-Received: by 2002:a17:907:3f90:b0:6fe:cd08:dc21 with SMTP id hr16-20020a1709073f9000b006fecd08dc21mr784747ejc.136.1654107245453; Wed, 01 Jun 2022 11:14:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f27-20020a17090624db00b006f3ef214dcdsm983138ejb.51.2022.06.01.11.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:14:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B3D691FFD6; Wed, 1 Jun 2022 19:05:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 31/33] gitlab: convert build/container jobs to .base_job_template Date: Wed, 1 Jun 2022 19:05:35 +0100 Message-Id: <20220601180537.2329566-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This converts the main build and container jobs to use the base job rules, defining the following new variables - QEMU_JOB_SKIPPED - jobs that are known to be currently broken and should not be run. Can still be manually launched if desired. - QEMU_JOB_AVOCADO - jobs that run the Avocado integration test harness. - QEMU_JOB_PUBLISH - jobs that publish content after the branch is merged upstream As build-tools-and-docs runs on master we declare the requirement of building amd64-debian-container optional as it should already exits once we merge. Signed-off-by: Daniel P. Berrangé Message-Id: <20220526110705.59952-5-berrange@redhat.com> [AJB: fix upstream typo, mention optional container req] Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220527153603.887929-32-alex.bennee@linaro.org> diff --git a/docs/devel/ci-jobs.rst.inc b/docs/devel/ci-jobs.rst.inc index 4c7e30ab08..0b4926e537 100644 --- a/docs/devel/ci-jobs.rst.inc +++ b/docs/devel/ci-jobs.rst.inc @@ -73,6 +73,25 @@ The job results are only of interest to contributors prior to submitting code. They are not required as part of the gating CI pipeline. +QEMU_JOB_SKIPPED +~~~~~~~~~~~~~~~~ + +The job is not reliably successsful in general, so is not +currently suitable to be run by default. Ideally this should +be a temporary marker until the problems can be addressed, or +the job permanently removed. + +QEMU_JOB_PUBLISH +~~~~~~~~~~~~~~~~ + +The job is for publishing content after a branch has been +merged into the upstream default branch. + +QEMU_JOB_AVOCADO +~~~~~~~~~~~~~~~~ + +The job runs the Avocado integration test suite + Contributor controlled runtime variables ---------------------------------------- diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index e6953c77ae..4f091d5aad 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -16,10 +16,22 @@ - if: '$QEMU_JOB_CIRRUS && ($CIRRUS_GITHUB_REPO == "" || $CIRRUS_API_TOKEN == "")' when: never + # Publishing jobs should only run on the default branch in upstream + - if: '$QEMU_JOB_PUBLISH == "1" && $CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH' + when: never + + # Non-publishing jobs should only run on staging branches in upstream + - if: '$QEMU_JOB_PUBLISH != "1" && $CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH !~ /staging/' + when: never + # Jobs only intended for forks should always be skipped on upstream - if: '$QEMU_JOB_ONLY_FORKS == "1" && $CI_PROJECT_NAMESPACE == "qemu-project"' when: never + # Avocado jobs don't run in forks unless $QEMU_CI_AVOCADO_TESTING is set + - if: '$QEMU_JOB_AVOCADO && $QEMU_CI_AVOCADO_TESTING != "1" && $CI_PROJECT_NAMESPACE != "qemu-project"' + when: never + ############################################################# # Stage 2: fine tune execution of jobs in specific scenarios @@ -31,6 +43,16 @@ when: manual allow_failure: true + # Skipped jobs should not be run unless manually triggered + - if: '$QEMU_JOB_SKIPPED' + when: manual + allow_failure: true + + # Avocado jobs can be manually start in forks if $QEMU_CI_AVOCADO_TESTING is unset + - if: '$QEMU_JOB_AVOCADO && $CI_PROJECT_NAMESPACE != "qemu-project"' + when: manual + allow_failure: true + ############################################################# # Stage 3: catch all logic applying to any job not matching diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index b381345dbc..73ecfabb8d 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -1,4 +1,5 @@ .native_build_job_template: + extends: .base_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest before_script: @@ -27,6 +28,7 @@ fi .common_test_job_template: + extends: .base_job_template stage: test image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: @@ -77,15 +79,5 @@ after_script: - cd build - du -chs ${CI_PROJECT_DIR}/avocado-cache - rules: - # Only run these jobs if running on the mainstream namespace, - # or if the user set the QEMU_CI_AVOCADO_TESTING variable (either - # in its namespace setting or via git-push option, see documentation - # in /.gitlab-ci.yml of this repository). - - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' - when: on_success - - if: '$QEMU_CI_AVOCADO_TESTING' - when: on_success - # Otherwise, set to manual (the jobs are created but not run). - - when: manual - allow_failure: true + variables: + QEMU_JOB_AVOCADO: 1 diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index e9620c3074..ecac3ec50c 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -360,12 +360,11 @@ build-cfi-aarch64: expire_in: 2 days paths: - build - rules: + variables: # FIXME: This job is often failing, likely due to out-of-memory problems in # the constrained containers of the shared runners. Thus this is marked as - # manual until the situation has been solved. - - when: manual - allow_failure: true + # skipped until the situation has been solved. + QEMU_JOB_SKIPPED: 1 check-cfi-aarch64: extends: .native_test_job_template @@ -402,12 +401,11 @@ build-cfi-ppc64-s390x: expire_in: 2 days paths: - build - rules: + variables: # FIXME: This job is often failing, likely due to out-of-memory problems in # the constrained containers of the shared runners. Thus this is marked as - # manual until the situation has been solved. - - when: manual - allow_failure: true + # skipped until the situation has been solved. + QEMU_JOB_SKIPPED: 1 check-cfi-ppc64-s390x: extends: .native_test_job_template @@ -579,6 +577,7 @@ build-without-default-features: MAKE_CHECK_ARGS: check-unit check-qtest SPEED=slow build-libvhost-user: + extends: .base_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/fedora:latest needs: @@ -595,10 +594,13 @@ build-tools-and-docs-debian: extends: .native_build_job_template needs: job: amd64-debian-container + # when running on 'master' we use pre-existing container + optional: true variables: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check-unit check-softfloat ctags TAGS cscope CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable-tools + QEMU_JOB_PUBLISH: 1 artifacts: expire_in: 2 days paths: @@ -618,6 +620,7 @@ build-tools-and-docs-debian: # that users can see the results of their commits, regardless # of what topic branch they're currently using pages: + extends: .base_job_template image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest stage: test needs: @@ -635,10 +638,5 @@ pages: artifacts: paths: - public - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - when: on_success - - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' - when: never - - if: '$CI_PROJECT_NAMESPACE != "qemu-project"' - when: on_success + variables: + QEMU_JOB_PUBLISH: 1 diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 147e667744..b7963498a3 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -40,15 +40,13 @@ armhf-debian-cross-container: # We never want to build hexagon in the CI system and by default we # always want to refer to the master registry where it lives. hexagon-cross-container: + extends: .base_job_template image: docker:stable stage: containers - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' - when: never - - when: always variables: NAME: debian-hexagon-cross GIT_DEPTH: 1 + QEMU_JOB_ONLY_FORKS: 1 services: - docker:dind before_script: diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index 1baecd9460..c434b9c8f3 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -1,4 +1,5 @@ .container_job_template: + extends: .base_job_template image: docker:stable stage: containers services: diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml index 29c3c2b826..28b2142ec2 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -1,4 +1,5 @@ .cross_system_build_job: + extends: .base_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest timeout: 80m @@ -24,6 +25,7 @@ # KVM), and set extra options (such disabling other accelerators) via the # $EXTRA_CONFIGURE_OPTS variable. .cross_accel_build_job: + extends: .base_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest timeout: 30m @@ -36,6 +38,7 @@ - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS .cross_user_build_job: + extends: .base_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index cf7724b8e5..1b2ede49e1 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -1,4 +1,5 @@ .shared_msys2_builder: + extends: .base_job_template tags: - shared-windows - windows From patchwork Wed Jun 1 18:05:36 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: 577827 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp859512mab; Wed, 1 Jun 2022 11:31:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxu+kyhahCQH5YRTbGgZh5dD3/YcUEIoBEx4qOd5DXUolQr+z3NvQkbjdAzoNz85HLQJfJn X-Received: by 2002:a05:620a:1588:b0:6a3:5a44:5ff5 with SMTP id d8-20020a05620a158800b006a35a445ff5mr694932qkk.556.1654108303060; Wed, 01 Jun 2022 11:31:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654108303; cv=none; d=google.com; s=arc-20160816; b=er/yA1vwmqmkysnoH1Q0+mIz+QyRKBR0o8VlBiqJSzUF0wk33Bk/1mAsDL3pQ8Qrxk y9eNwCEasSqS/v2Jz5J1oy9CxdNF9PZ1TnQ6wAxT9cLVjZ+atyh6cjnr0XE6A1MOHecD b3Q8IliuCxrWt6baFhxgPfnNaMekC1C0gY0dHL3hb5cZ3JHQiKEcoiQnmvkkCricNkMq zwr+NufKCr59XCLVOY8LUC17kqr7gbOl695l53SPOC5pXLTDuj6coJ0Z+YCVDk++CF3Z JyipIgcxlA80f+tNhcmm+2Wp860ArL28sM2mmzvrAlsVu2XrnH6W+pBGXb6XP7D08ked A1Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=zB9PzY9absq/vVv3/mkPW7xF9ulwG7GOEfvmbfDqI38=; b=aaLYFk9BJUoNynrL1fCFKz8C9fugsSGv6ZM5coiNs6zCktmK/ADL8TWLBX5rj/hcwn Vp4pJMn0DIiCLdlmOXIPIoJCedyCymjAe0SEATGw991zI7GX9t8C8XjcbwZxndZn4U8Z Zi95Xg768ftk9Y4DPD1eQ/PODPOuyB8O3jwScX04FKTaD43BIqKB4Z0zsJeEqU3QvoFT ECjyutiQJdH4OToNJDZpdc+rmh7d2hgk0Qm5xQyv+z3qyX7KgoEbQet3ezo9HK/E3r/v YKY7aZIj8zi5j+VFkpzT1itsB4puTOVPPhmCBYxS5eD8BFcnAtJh+udpmLxHWIJGNXW5 oe+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k4fsHiHr; 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=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 h20-20020ac85854000000b00300f2883a87si1290044qth.51.2022.06.01.11.31.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:31:43 -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=pass header.i=@linaro.org header.s=google header.b=k4fsHiHr; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwT8A-0003Mr-Ft for patch@linaro.org; Wed, 01 Jun 2022 14:31:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSrA-0001uo-Px for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:08 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:45961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSr9-0006Xa-0B for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:08 -0400 Received: by mail-ej1-x62e.google.com with SMTP id jx22so5361624ejb.12 for ; Wed, 01 Jun 2022 11:14:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zB9PzY9absq/vVv3/mkPW7xF9ulwG7GOEfvmbfDqI38=; b=k4fsHiHrSYRCBTIkgXdosAyWSnJFEPlLSWpg+V1W0/GiaOZoKsT9YkFFbHSGtKsrDt oI2mnyhBGhKax08lDZR+IwQTX4fnMMeCcGc7NSDlnCkQsNv5J/oJoMqn0kSoOFOxcY2t wzr5b6mst0UC4P6tiUexEZI9zSBQly2T/9LHKdnoiyceYSGApC0aTy34KdkU4XDLEdZU tCZEYdyzd0rvXkL7ZXCtQeAS8a+xOwIzuuKkWVT4P5BfQ+lX+QzDcWDdToJzW456TaRV S8S9IPin/cf9Mi4Yz6y1e3LPHq8YWLN2zDXnPCk1gfR0QXn3UvH5CBUMQR3cmnLi5A4G h7NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zB9PzY9absq/vVv3/mkPW7xF9ulwG7GOEfvmbfDqI38=; b=4yiNevuahLmNJJO7GtrhtQx7fGMHvLYkTTDglsgCoKqwGXBHg2D1Y8lis/gVmM/e7n JGaJCPwgwFrxBXBn+UD+bROPFZm21xtLIqXVqThY4T0BfNNo1pqpdFA/pOsg6nnURHw5 azepfsIFM1ihhi/Vn5QSPu/4/p1in8EMuzx5N8sD9B5lpVxbkhJZOxW86ngGC/th1lD2 aFfabS///1J75ownYBbWCZ4Lk13basCbcM8GeiurhyObKfpnF9r7+5gKeug2HikxBfbH RcfzlUJMMcgCsn+0ssYhTpD//wnSBeKPdi7UCjVwClHu86IDEYtoZkIu7PWw9pz/EbgW F23Q== X-Gm-Message-State: AOAM530Lb9xudYzZ4GnnlRzxO97a3agqT7L7Rgdfq2LKl49K7/mWBmt1 isT8YjhnRRVVF/tV/cSGlvhtJQ== X-Received: by 2002:a17:906:b816:b0:708:2e56:97d7 with SMTP id dv22-20020a170906b81600b007082e5697d7mr712344ejb.502.1654107246246; Wed, 01 Jun 2022 11:14:06 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d9-20020a1709063ec900b006fec63e564bsm990358ejj.30.2022.06.01.11.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:14:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C32881FFD7; Wed, 1 Jun 2022 19:05:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 32/33] gitlab: don't run CI jobs in forks by default Date: Wed, 1 Jun 2022 19:05:36 +0100 Message-Id: <20220601180537.2329566-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé To preserve CI shared runner credits we don't want to run pipelines on every push. This sets up the config so that pipelines are never created for contributors by default. To override this the QEMU_CI variable can be set to a non-zero value. If set to 1, the pipeline will be created but all jobs will remain manually started. The contributor can selectively run jobs that they care about. If set to 2, the pipeline will be created and all jobs will immediately start. This behavior can be controlled using push variables git push -o ci.variable=QEMU_CI=1 To make this more convenient define an alias git config --local alias.push-ci "push -o ci.variable=QEMU_CI=1" git config --local alias.push-ci-now "push -o ci.variable=QEMU_CI=2" Which lets you run git push-ci to create the pipeline, or git push-ci-now to create and run the pipeline Signed-off-by: Daniel P. Berrangé Message-Id: <20220526110705.59952-6-berrange@redhat.com> [AJB: fix typo, replicate alias tips in ci.rst] Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220527153603.887929-33-alex.bennee@linaro.org> diff --git a/docs/devel/ci-jobs.rst.inc b/docs/devel/ci-jobs.rst.inc index 0b4926e537..9118a61a17 100644 --- a/docs/devel/ci-jobs.rst.inc +++ b/docs/devel/ci-jobs.rst.inc @@ -28,6 +28,32 @@ For further information about how to set these variables, please refer to:: https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd +Setting aliases in your git config +---------------------------------- + +You can use aliases to make it easier to push branches with different +CI configurations. For example define an alias for triggering CI: + +.. code:: + + git config --local alias.push-ci "push -o ci.variable=QEMU_CI=1" + git config --local alias.push-ci-now "push -o ci.variable=QEMU_CI=2" + +Which lets you run: + +.. code:: + + git push-ci + +to create the pipeline, or: + +.. code:: + + git push-ci-now + +to create and run the pipeline + + Variable naming and grouping ---------------------------- @@ -98,6 +124,18 @@ Contributor controlled runtime variables The following variables may be set by contributors to control job execution +QEMU_CI +~~~~~~~ + +By default, no pipelines will be created on contributor forks +in order to preserve CI credits + +Set this variable to 1 to create the pipelines, but leave all +the jobs to be manually started from the UI + +Set this variable to 2 to create the pipelines and run all +the jobs immediately, as was historicaly behaviour + QEMU_CI_AVOCADO_TESTING ~~~~~~~~~~~~~~~~~~~~~~~ By default, tests using the Avocado framework are not run automatically in diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index 4f091d5aad..f334f3ded7 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -28,6 +28,10 @@ - if: '$QEMU_JOB_ONLY_FORKS == "1" && $CI_PROJECT_NAMESPACE == "qemu-project"' when: never + # Forks don't get pipelines unless QEMU_CI=1 or QEMU_CI=2 is set + - if: '$QEMU_CI != "1" && $QEMU_CI != "2" && $CI_PROJECT_NAMESPACE != "qemu-project"' + when: never + # Avocado jobs don't run in forks unless $QEMU_CI_AVOCADO_TESTING is set - if: '$QEMU_JOB_AVOCADO && $QEMU_CI_AVOCADO_TESTING != "1" && $CI_PROJECT_NAMESPACE != "qemu-project"' when: never @@ -59,5 +63,10 @@ # an earlier criteria ############################################################# + # Forks pipeline jobs don't start automatically unless + # QEMU_CI=2 is set + - if: '$QEMU_CI != "2" && $CI_PROJECT_NAMESPACE != "qemu-project"' + when: manual + # Jobs can run if any jobs they depend on were successfull - when: on_success From patchwork Wed Jun 1 18:05:37 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: 577831 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp864336mab; Wed, 1 Jun 2022 11:37:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfBXfmRPIRQ8NTl7bzIMIJ87n/VWee8UM7lJNVOXepBcdztznyoRIRXqqydIBRPy4THA4/ X-Received: by 2002:a37:6804:0:b0:6a6:49ad:79ca with SMTP id d4-20020a376804000000b006a649ad79camr936128qkc.264.1654108628367; Wed, 01 Jun 2022 11:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654108628; cv=none; d=google.com; s=arc-20160816; b=RgF9BQoBaqyLWeVlkzL4C4NdGX9eVeAjwB1RhBzmbrmSSLTkR4tA00o/U0h/hY5c70 y5yacMqjG+8jewEQKGoTejf5idws5ta/WpQHrhKI115BZHvL5RevXUYOcW1UR8tareKf V8cI/2Ziq6cBdByy99wYgbF+pduJ3G3/uh5A6fGiiXBWdvZpeZ7W7/lb6hxQL7e+Q1pB 2X5EuZd2wV3FJk5Vy9iIJsTbFzGsIW/g3BNCRb2E+GEnTZS6vrQhv4zA2GgaHLhWexUy iADSlFnPOJfuTIDrDmhMumr4GZxf+bxxZO2cNBkalnCoW7ESE+/HwGRHOs3R+jFOqFOf vvVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=BGHJqDPZiBsXA4KMwayHRfHrfRJevIHycdJ2aG2O/T8=; b=hKYh/stXY+AYIG2NFQzmbmhOYtCHRq/q0pakbcTDSbTc1gi/W79LEXBoypT4HMyRNf sS71WpbfMTeTm6ssyxYjRHPUeYdZDi3bBoN2Edf+aM3I4GM86+Uj4guQIL00L+b0/4Ah YbU5OU+3sRx/Sa6djEoMBGKbvMcOo1uqSzNKjioOqVVGuCaWqI13YVvIglA9i7VCJltc l7tyJXINBHshbPq7wNToSbkal3h5Sl7miQQsMvh6mCJSXvtueWyh3FQr3M9hYUjdDuWe Uoah8JkW5UHPxFMUwPp9//kwJEGqSLYN3cJTjTNb4I4lnzM0O8M2ZPqxs2t+gv6BIxxc GeGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DxZeShGL; 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=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 h5-20020a05620a400500b006a3718d3f01si1581115qko.490.2022.06.01.11.37.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:37:08 -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=pass header.i=@linaro.org header.s=google header.b=DxZeShGL; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwTDP-0000xn-1D for patch@linaro.org; Wed, 01 Jun 2022 14:37:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSrF-00027M-FU for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:13 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:41749) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSrD-0006ah-Ky for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:14:13 -0400 Received: by mail-ed1-x52b.google.com with SMTP id 25so3038430edw.8 for ; Wed, 01 Jun 2022 11:14:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BGHJqDPZiBsXA4KMwayHRfHrfRJevIHycdJ2aG2O/T8=; b=DxZeShGLnpqpvMerxQeTkKBU9e8VTNADRgKgFW7u6LUFboMr9aR/u1WaLuqMHWJQBw PqJXVTEYw6yIOfuqqPYo/9M9bDdt6m/XReckuS0zsQ21gh96ogiO9fExEL+dRnltNlKj SwWD5N8ZJ1x+NsHv/g8IinIFVEbIZKOnYlLk3Wke32YXOPvWDPNEv12ReiUqCXMS1B2t dt4exus8PPQ5ZZuJXjfBfuGxbgh7iJHwD6pvEQkMCxGu6FG4olVb/holNx/70NUqRMeV jj4Fa4N0GIQsKv+qeA7CpleCaDBQJXq7K+1S4cnYIH4LE0BDIbbBIP0/w/9OrI5TL5Kc CkMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BGHJqDPZiBsXA4KMwayHRfHrfRJevIHycdJ2aG2O/T8=; b=ehmaCaALbTP8kl+zGRyaIMG/t6UmUFUHa4HNWek5yHxckjthHUQYTFLyHqo3il7v9n svpQGFIGnLUNA4qV7zgIe/VQN9sgkESNrrhvXrcVVganvWhyhVfpB4gssidGTXje/MuM 6x37D9PHEPaJxGId77JOrUYNnLHSU99tbDyGWhyKVl1pbbRsU8qMj1JjwpsDLV2Yna1Y H6j8RZ+7gnwJZbOlPOVKcKE70zgfsY2+AjuRiutND+Iq9lM3hu8ZBXD+duCtHCrOQRRM 5txct38ot+X7FdvR8dD8WNizm/VZo4Gk1DY69BQ8irhnS/bgWW5zA5oA8rOhhdy3c0HF ObBw== X-Gm-Message-State: AOAM530kJnJT3j+Tinb82DKAG+CDxT5s2EFAOYysoi3SEVBD5/oblQmY jH7Fu7YOqKrXvRP7nxIaVplS+g== X-Received: by 2002:a05:6402:280a:b0:42d:d562:9b01 with SMTP id h10-20020a056402280a00b0042dd5629b01mr1114337ede.290.1654107250339; Wed, 01 Jun 2022 11:14:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id hz22-20020a1709072cf600b006fec4ee28d0sm952343ejc.189.2022.06.01.11.14.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:14:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E53851FFD8; Wed, 1 Jun 2022 19:05:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PULL 33/33] docs/devel: clean-up the CI links in the docs Date: Wed, 1 Jun 2022 19:05:37 +0100 Message-Id: <20220601180537.2329566-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There where some broken links so fix those up with proper references to the devel docs. I also did a little light copy-editing to reflect the current state and broke up a paragraph to reduce the "wall of text" effect. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Message-Id: <20220527153603.887929-34-alex.bennee@linaro.org> diff --git a/docs/devel/ci-jobs.rst.inc b/docs/devel/ci-jobs.rst.inc index 9118a61a17..1f28fec0d0 100644 --- a/docs/devel/ci-jobs.rst.inc +++ b/docs/devel/ci-jobs.rst.inc @@ -1,3 +1,5 @@ +.. _ci_var: + Custom CI/CD variables ====================== diff --git a/docs/devel/ci.rst b/docs/devel/ci.rst index d106610096..ed88a2010b 100644 --- a/docs/devel/ci.rst +++ b/docs/devel/ci.rst @@ -1,12 +1,13 @@ +.. _ci: + == CI == -QEMU has configurations enabled for a number of different CI services. -The most up to date information about them and their status can be -found at:: - - https://wiki.qemu.org/Testing/CI +Most of QEMU's CI is run on GitLab's infrastructure although a number +of other CI services are used for specialised purposes. The most up to +date information about them and their status can be found on the +`project wiki testing page `_. .. include:: ci-definitions.rst.inc .. include:: ci-jobs.rst.inc diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-patch.rst index e51259eb9c..d3876ec1b7 100644 --- a/docs/devel/submitting-a-patch.rst +++ b/docs/devel/submitting-a-patch.rst @@ -204,23 +204,25 @@ log`` for these keywords for example usage. Test your patches ~~~~~~~~~~~~~~~~~ -Although QEMU has `continuous integration -services `__ that attempt to test -patches submitted to the list, it still saves everyone time if you have -already tested that your patch compiles and works. Because QEMU is such -a large project, it's okay to use configure arguments to limit what is -built for faster turnaround during your development time; but it is -still wise to also check that your patches work with a full build before -submitting a series, especially if your changes might have an unintended -effect on other areas of the code you don't normally experiment with. -See `Testing `__ for more details on what tests are available. -Also, it is a wise idea to include a testsuite addition as part of your -patches - either to ensure that future changes won't regress your new -feature, or to add a test which exposes the bug that the rest of your -series fixes. Keeping separate commits for the test and the fix allows -reviewers to rebase the test to occur first to prove it catches the -problem, then again to place it last in the series so that bisection -doesn't land on a known-broken state. +Although QEMU uses various :ref:`ci` services that attempt to test +patches submitted to the list, it still saves everyone time if you +have already tested that your patch compiles and works. Because QEMU +is such a large project the default configuration won't create a +testing pipeline on GitLab when a branch is pushed. See the :ref:`CI +variable documentation` for details on how to control the +running of tests; but it is still wise to also check that your patches +work with a full build before submitting a series, especially if your +changes might have an unintended effect on other areas of the code you +don't normally experiment with. See :ref:`testing` for more details on +what tests are available. + +Also, it is a wise idea to include a testsuite addition as part of +your patches - either to ensure that future changes won't regress your +new feature, or to add a test which exposes the bug that the rest of +your series fixes. Keeping separate commits for the test and the fix +allows reviewers to rebase the test to occur first to prove it catches +the problem, then again to place it last in the series so that +bisection doesn't land on a known-broken state. .. _submitting_your_patches: diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 5b60a31807..3f6ebd5073 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -1,3 +1,5 @@ +.. _testing: + Testing in QEMU ===============