From nobody Sat Nov 15 07:41:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754326805; cv=none; d=zohomail.com; s=zohoarc; b=l7W4BQehZbQmnTlLN0QUHokIhaOg1g36Iucmim39VV6iGYgEgLSyw5QkDOdlNMm6GjkoIW8yBxLlU72oYjcP1HB13cavw4D8jfn4EIaQqCSyUurFUSj9BVP5cPspsRevEWb2jxkPT09AOkg/TAGVdaeVeUaqZXZKxlR50q5S8WU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754326805; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=E+Wh1VP6DOxrn+VlvqLuE2O5pLk0j4qlYRsPTraobhg=; b=XmjaL4cGTXPpzm9d5uxG6Ac7kQ3SfbUD59/Teiu1fJzhokm7TamAEopDE+9dDrCCLeOxDp/pk5XbC7Gg5PVB5ph1EsuREccGYuDgFyLSk4c7iE04hczDUeXQpNLF/o1e+XzrZBkcNZavUNqau1lut2yLfvAfWRZ987MT5o4LlGM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754326805752965.1087068618841; Mon, 4 Aug 2025 10:00:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uiyX5-0001zV-KC; Mon, 04 Aug 2025 12:59:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uiwup-0000hp-Lg for qemu-devel@nongnu.org; Mon, 04 Aug 2025 11:15:55 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiwul-0000Zv-JS for qemu-devel@nongnu.org; Mon, 04 Aug 2025 11:15:54 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-459d40d16bdso9707765e9.0 for ; Mon, 04 Aug 2025 08:15:51 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c4a2f03sm15670698f8f.72.2025.08.04.08.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 08:15:46 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 26BEA5F88D; Mon, 04 Aug 2025 16:15:46 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754320550; x=1754925350; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E+Wh1VP6DOxrn+VlvqLuE2O5pLk0j4qlYRsPTraobhg=; b=UzWMTinQF1vv2//eO3kgA40nWwVzq/mxnDDwtTCMQiASF3xjJx6JfQXir16xiWt29x uKog57vH4nNHuWqXMAuDROOCuFXdozdpzdO/w/Rwjzw7KvOOgO07Z1NYIzECveAs000V WfjOUIWT4k4VLMucakC2boowfvj3aWQyKU56VRICAtaYTlb4OWyIlIxSfwtOtuIwSvsx doz9AjU70fQCb028KeTRefbekzzfbqLjj/FSUAib8ZqT5IqMyTEAdiJ5D7wjmQwa7u6/ b7197Yxy02thCPU/gVe6DekC7Gugup4DegttfUCBvIFGM+aaKQnCONCpECY9eX7RPBEa ue9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754320550; x=1754925350; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E+Wh1VP6DOxrn+VlvqLuE2O5pLk0j4qlYRsPTraobhg=; b=YuVP0e5EEUAIxToRMgIKdHmnHgp7TpWj9vwIR+/6pfmZu8KH2LQp57rf4ccVw+zRw+ CGVK0qQJWatxqJCt5+vktqcxmgo0hovjWbXXTFrtgdGEWjDZVaEe8vYoqnNrTgjwm3iS OCKeXwLgAAeYm9BBgMTmj/QxfVt1COhLI9VdfCbTYz7UvE+2t8OJlzTif8b5EsR9gddN 6OKyt+YmKoMVZHtGJ0o7cA1422jnisRA5Q7/0SDeY2T2CRp35znuZDJn1ulqFIHF8OAp 70baoh3SlkXZwlwvfcnQade80uDpQCfQYQ2lN5QxO/F0YfchVqwF9uY0dKoVRaRlRQ6O 6RIQ== X-Gm-Message-State: AOJu0Yx1iUZSqjE2kJbxl7cMOE2yHns1yz3wmm2oNZFzKr5Do0LeMVFR RZyih2QB8+PVZYYBK8cP5dn5vXYE8zS/+GpVEEfrZBULuM+/OCijcRZuJt7LCnh29P8= X-Gm-Gg: ASbGncu+Ap39ugvEjzckOhLp9CGxijw7I/QPpRY0AMnPJ3ypcw7jeRIlZSIYYVmZ5Js TuzmkxxGSmoqKNrXuJClpyyT7NAeBK4Euv2iTW+AjuEzkVvFGxpJhGSgW3qxmvCbhAP+WwwMehF oGia+t0NFd9//RDdzJGW7JmmQZQCDE/kBs0Y965V4BnIUTz49v0sxVYUsBZ88woW5wB+jsQDPir j4uTLm0rHbTN9Zk4Z1eB9dLDv8gsk8fVdIVSMgtkjNchAiz9ji33vLyPA7ZplOF1jDhXDCPeu36 X2gMGspdM6K7GGFOI74Zcb1bG2wvPE8bQE/N6HoipFn+7ZS/F1Ts9KKq64LAgJ9RqPzeEAepAQQ Bm7IbIcqLWCMxxtET3bRGh9E= X-Google-Smtp-Source: AGHT+IGoxwLPYZYAX4bPbMYhrbjYfSngR483Ks3jO4CteVFsUqxuivuPHxUip/X0DACqR5JYn7M99w== X-Received: by 2002:a05:600c:4f14:b0:458:bdd1:b7ef with SMTP id 5b1f17b1804b1-458bdd1b9a3mr64003455e9.19.1754320549948; Mon, 04 Aug 2025 08:15:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , Gustavo Romero , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 1/3] docs/devel/submitting-a-patch.rst: add b4 section Date: Mon, 4 Aug 2025 16:15:43 +0100 Message-ID: <20250804151545.311042-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250804151545.311042-1-alex.bennee@linaro.org> References: <20250804151545.311042-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754326807345124100 From: Manos Pitsidianakis Add a section about b4, an actively maintained and widely packaged CLI tool for contributing to patch-based development projects. Reviewed-by: Gustavo Romero Signed-off-by: Manos Pitsidianakis Message-ID: <20250717-docs_add_b4_section-v2-1-69212ed39299@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-pa= tch.rst index f7917b899f6..dd1cf32ad35 100644 --- a/docs/devel/submitting-a-patch.rst +++ b/docs/devel/submitting-a-patch.rst @@ -235,6 +235,38 @@ to another list.) ``git send-email`` (`step-by-step se= tup guide works best for delivering the patch without mangling it, but attachments can be used as a last resort on a first-time submission. =20 +.. _use_b4: + +Use B4 +~~~~~~ + +The `b4`_ tool, used for Linux kernel development, can also be used for QE= MU +development. It is packaged in most distros and PyPi. The QEMU source tree +includes a ``b4`` project configuration file at the root: ``.b4-config``. + +Example workflow to prepare a patch series: + +1. Start with a clean checkout of the ``master`` branch. +2. Create a new series with a topical branch name using ``b4 prep -n descr= iptive-name``. + ``b4`` will create a ``b4/descriptive-name`` branch and switch to it. +3. Commit your changes, following this page's guidelines about proper comm= it messages etc. +4. Write a descriptive cover letter with ``b4 prep --edit-cover``. +5. Add maintainer and reviewer CCs with ``b4 prep --auto-to-cc``. You can = make + changes to Cc: and To: recipients by editing the cover letter. +6. Run patch checks with ``b4 prep --check``. +7. Optionally review the patches with ``b4 send --dry-run`` which will pri= nt the + raw patches in standard output. + +To send the patches, you can: + +- Setup ``git-send-email`` and use ``b4 send``, or +- Export the patches to files using ``b4 send -o OUTPUT_DIR`` and send the= m manually. + +For more details, consult the `b4 documentation`_. + +.. _b4 documentation: https://b4.docs.kernel.org/ +.. _b4: https://github.com/mricon/b4/ + .. _use_git_publish: =20 Use git-publish @@ -418,7 +450,7 @@ Retrieve an existing series --------------------------- =20 If you want to apply an existing series on top of your tree, you can simpl= y use -`b4 `__. +`b4`_. =20 :: =20 @@ -533,7 +565,11 @@ summary belongs. The `git-publish `__ script can help with tracking a good summary across versions. Also, the `git-backport-diff `__ script can help focus -reviewers on what changed between revisions. +reviewers on what changed between revisions. The ``b4`` tool automatically +generates a version history section in the cover letter, including links t= o the +previous versions on `Lore`_. + +.. _Lore: https://lore.kernel.org/ =20 .. _tips_and_tricks: =20 --=20 2.47.2 From nobody Sat Nov 15 07:41:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754328017; cv=none; d=zohomail.com; s=zohoarc; b=ixpXfZHR1P2evTUzmbBU1dboqf7wOt7D0zg2HXgu8TxUrx0g0+m9nSTT2esJ0SxM9oGirdXTzRPFpe7NYuV8coXk/viEIRwB8Ll3DwdpmbEHAZM+grCBFEa/XEYDUj8nBI3hZvRgbrmEZ5nX4l77wXO4Z2WlWO4BaFtSFgf87T4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754328017; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5I0P9zrEGMWC2opqsSuDg7PldX8TWbC7NgkKHaAdNlE=; b=kHaqMH8vmdGpbkcrIMuv4jpjEW/4aDXNMmUxYhmrKunFM8T3uVW0OydD45C9GTgyG3PIH8gYtoblDOIh07eFS4yoLuFSpEOSLlTCgjtXWFf4tEySc7ohPwCWnHJX6TDhFFEqbw6qnaCFzC6fD6UYUSXs8U0qsOTlereyOS5BEWc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175432801754485.73913400150138; Mon, 4 Aug 2025 10:20:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uiyqP-0004c7-J2; Mon, 04 Aug 2025 13:19:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uiwum-0000fm-Gh for qemu-devel@nongnu.org; Mon, 04 Aug 2025 11:15:55 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiwuj-0000Xo-Jf for qemu-devel@nongnu.org; Mon, 04 Aug 2025 11:15:51 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3b79bd3b1f7so2447037f8f.1 for ; Mon, 04 Aug 2025 08:15:49 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c46ee84sm15563644f8f.57.2025.08.04.08.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 08:15:46 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3C3BF5F88E; Mon, 04 Aug 2025 16:15:46 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754320548; x=1754925348; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5I0P9zrEGMWC2opqsSuDg7PldX8TWbC7NgkKHaAdNlE=; b=rDwruqS5sQjngdFaB62Sceq/O1ANDq+fE2gbsgKSRMqbXT50gPIdri/b1PJKUmVZj/ LD8a5R8Gkb8EsyY41OFLhbl1m73nCMhBciNZLGRcCKMCkYVrnO2laJPzUMDffq+aFy0h poln4jhkmM1NRke5l1ygA7E/20rIKso0aNTPmeMss1lsrymrsLBh8JsXHvBz1TFxe5Mt uKFqC31FI2dQAYq4txXtOGvdZr9ho6xsPM2lM00sN31PudZsga2Ud7O+tgJjSgsFWd12 48Rxlk07rhKtT79f36L7nYy+VLS3WomsGV70GC6N4ypeG3cNF+DGdqV/V8IVvqbFFfvj u1gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754320548; x=1754925348; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5I0P9zrEGMWC2opqsSuDg7PldX8TWbC7NgkKHaAdNlE=; b=sg8RF8/JglOLxsqnM5F8msz32s8b/sXUHrvnspI50lhSxyG/tJQHzZA3oJLxV5tbyi yywXf32l9PthKoV/jpTPEdTPBJvhzUSzrk2mv7/TeUkaf6B8gOtRInXhgHN0Gpy1lbKp e/eEjxqIaCHAreKzXcmR/k/fmNPJmbqyXlslt3vH89RqZfQpEAfnfJz3oodNG+ZHK2lf 67JvYsWlKXJK2Ho40Mz0+364e4PKqNBg+BfkjBffMuRIhqdNHnzG4S8eX6gJz23h17ro ajv3UIMWKLMy3HZ1+LmWsSE06nRmNWWigkWD+iodnfeHLZ/mqfK4tHUVpBluAMqkM4S2 HZiw== X-Gm-Message-State: AOJu0Yz9w41epcJ/s0fYDVnxsalEbCuRq24cyuHf8FbkpXEcd5qgj0Ix vXLL7ouTZMKeuUSHm+kXhcdcvHi+HZ5aJVcAAB2lmKgP/X1b4kEpSiWjNiDX205Am8zC9kkwm6O bZ7ND X-Gm-Gg: ASbGncsTxPANM/+tW2StKoU6J3Z5Jjr+lUbzh3zL5JCteMfybqTCqxU5lpXNKmGxpUZ hTrQMM9j008z/bVkD4+cnqLnJ4bp70Be9bBVcZwxXkD3l1MJ/tNQ0rV/+gbaFls1pdNQ4fccR3o baoJetYL6Md+4IhLK9K6Li471vroZpN+pEMGK9cJ/NGILsHRXNGMqvq0zPC8/iGdRuqMJkyvYxD oo3AANBBHo4G+y+Hpl4Sg2U5GwERE6PnR8vCFZsx9gcL98qp0h7bKDwPAE1Xi7ldNGZOKHMFIY2 B16YrTdjbVcWAvjsrzF0epPrEwhI5F2DU51EfehMI7wnW/OWXr7jCw4hvMOCmLPyjChd+sPzKtb ctn+OJOa8jhYCHbgzub5WXJE= X-Google-Smtp-Source: AGHT+IHCXhQoCfQ3l5aqmuaZZiAY+csWNpKBrRrCAlzwD0yPhjxrj1x/bwmITBJKAVWRwW117NR8cA== X-Received: by 2002:a05:6000:2408:b0:3a4:f663:acb9 with SMTP id ffacd0b85a97d-3b8d9468531mr7126767f8f.9.1754320547800; Mon, 04 Aug 2025 08:15:47 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-stable@nongnu.org, Michael Tokarev , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 2/3] scripts/make-release: Go back to cloning all the EDK2 submodules Date: Mon, 4 Aug 2025 16:15:44 +0100 Message-ID: <20250804151545.311042-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250804151545.311042-1-alex.bennee@linaro.org> References: <20250804151545.311042-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754328020024124100 From: Peter Maydell In commit bd0da3a3d4f we changed make-release so that instead of cloning every git submodule of EDK2 we only cloned a fixed list. The original motivation for this was that one of the submodules: * was from a non-github repo * that repo had a "SSL certificate expired" failure * wasn't actually needed for the set of EDK2 binaries we build and at the time we were trying to build the EDK2 binaries in one of our CI jobs. Unfortunately this change meant that we were exposed to bugs where EDK2 adds a new submodule and the sources we ship in the release tarball won't build any more. In particular, in EDK2 commit c6bb7d54beb05 the MipiSysTLib submodule was added, causing failure of the ROM build in our tarball starting from QEMU release 8.2.0: /tmp/qemu-10.0.0/roms/edk2/MdePkg/MdePkg.dec(32): error 000E: File/director= y not found in workspace Library/MipiSysTLib/mipisyst/library/include is not found in packag= es path: /tmp/qemu-10.0.0/roms/. /tmp/qemu-10.0.0/roms/edk2 (Building from a QEMU git checkout works fine.) In the intervening time EDK2 moved the submodule that had a problem to be one they mirrored themselves (and at time of writing all their submodules are hosted on github), and we stopped trying to build EDK2 binaries in our own CI jobs with commit 690ceb71936f9037f6. Go back to cloning every EDK2 submodule, so we don't have an untested explicit list of submodules which will break without our noticing it. This increases the size of the QEMU tarball .tar.xz file from 133M to 139M in my testing. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3041 Signed-off-by: Peter Maydell Reviewed-by: Michael Tokarev Message-ID: <20250721153341.2910800-1-peter.maydell@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/scripts/make-release b/scripts/make-release index 4509a9fabf5..87f563ef5f7 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -62,17 +62,15 @@ meson subprojects download $SUBPROJECTS (cd roms/skiboot && ./make_version.sh > .version) # Fetch edk2 submodule's submodules, since it won't have access to them via # the tarball later. -# -# A more uniform way to handle this sort of situation would be nice, but we -# don't necessarily have much control over how a submodule handles its -# submodule dependencies, so we continue to handle these on a case-by-case -# basis for now. -(cd roms/edk2 && \ - git submodule update --init --depth 1 -- \ - ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \ - BaseTools/Source/C/BrotliCompress/brotli \ - CryptoPkg/Library/OpensslLib/openssl \ - MdeModulePkg/Library/BrotliCustomDecompressLib/brotli) + +# As recommended by the EDK2 readme, we don't use --recursive here. +# EDK2 won't use any code or feature from a submodule of a submodule, +# so we don't need to add them to the tarball. +# Although we don't necessarily need all of the submodules that EDK2 +# has, we clone them all, to avoid running into problems where EDK2 +# adds a new submodule or changes its use of an existing one and +# the sources we ship in the tarball then fail to build. +(cd roms/edk2 && git submodule update --init --depth 1) popd =20 exclude=3D(--exclude=3D.git) --=20 2.47.2 From nobody Sat Nov 15 07:41:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754326790; cv=none; d=zohomail.com; s=zohoarc; b=klcBI6h5UgH8mmuxJlj1LoJLB93a1XwEE1GL3IY5229EYcbhHLghWBPZn8HnAPrDSwNIXmGaVrpHhMs6maOfL+M5V5n6/ZqilA6gdYSq+rxwHvCTxy76DtpoWQp7a/qruFTGnSTBSZhfz6nxKxp9QnYqI4eJbUireNzevl4547E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754326790; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=C6oEr5Vs3fmUjzOCI3T+a06J4NOhRz8MdlL63v2ufMw=; b=Za8CMrB7jEpijKCAzlJWm/bGy0KHugwH6ZujNCcgIjsRINFNpzw33TwA5Hs/xZylvYjxlPwP1zW+ObpUFmF3zAJ1ni9Y9jYIrki4G7SmNH+iCzLSbjSxmGde3daz94Fe6+Hr7xTbyy3oLFKjEnG74miCTBycyZkY9uHQtUlDmQ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754326790180627.9883821342382; Mon, 4 Aug 2025 09:59:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uiyX4-0001qa-ID; Mon, 04 Aug 2025 12:59:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uiwun-0000gK-P1 for qemu-devel@nongnu.org; Mon, 04 Aug 2025 11:15:55 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiwul-0000YQ-Gu for qemu-devel@nongnu.org; Mon, 04 Aug 2025 11:15:53 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3b7886bee77so3894981f8f.0 for ; Mon, 04 Aug 2025 08:15:49 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c3ad803sm15778951f8f.6.2025.08.04.08.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 08:15:47 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5369E5F892; Mon, 04 Aug 2025 16:15:46 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754320548; x=1754925348; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C6oEr5Vs3fmUjzOCI3T+a06J4NOhRz8MdlL63v2ufMw=; b=h+KIIX9r3v2go494ayWDJrCm0QKDC4oIadPbYR2hpU6c9XYcVwqW5XKuln1qWKkAVF Nq84VY2bxSRZrUn5bn4PCGEfBQN2oDdOSOU9pO/IvHOJ00R4PhXoD0tNctEXs3j8aZ6q hPIyvPAON6IaMYdU8SczAvCJayBTppZOFfrwYYWxrSV+wtyOPnFA74csDVUUOwRMDmtj cSnU3MgrtjC5Z4rV9rOsWRwFwXhlY6LF1bku2MOfTbnvX5pGL6nhtJJy+A3zOP3Bgyqz lIdNuUqhgf9NVEndLpqyFke1coHqUT152jCR5zjUX8l77ww0UY1e3WnG1q/nU08v7uLo E+7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754320548; x=1754925348; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C6oEr5Vs3fmUjzOCI3T+a06J4NOhRz8MdlL63v2ufMw=; b=fHlKRRTzAzcrfYSo8ZXypQelshCQK25WsSWXDQiXQMKlFh0ZLDWAEMZt990Fj9nXji FSpHE25m4/wVETeeKQjiKl+5g2cX+jfjj2PmHicXGE62SeGzAD2R2T487oqaD9l8e5Vk riXBB1hs8MxHIbQy97ghRbEYbozbpgS9ChIm/SxxjIiLgUzyHHo+6ElpSHojxIey4aCX lh+xzHnbFRXPB/BA5GdR9YGo3Lb9t7FORob3/ZZaY4C91YgCm9MTXdHw9Uud0HPdvyOG rfRLvAPoCMq1egFWdmN7Krpc3+1fz+d4QXDUOYPxVcyQYfstfbEP2GgcOlHMTlxBAU6M qVCw== X-Gm-Message-State: AOJu0Yxx8XMSWi8CgSqhxgGbD5wo4kNaxO3Tkz9cQcicIF+63i2o+5fs UduP8jGv0uv+W2MigmTbvrB3LKfUHJQNkUm0jbqw3DIk7nS/pYtkFbXxpdik67as7Jo= X-Gm-Gg: ASbGncvG26H9zzgmLDwEKi6m993+tpLd2ZFQvb4cs5ufzMSF8Zu4TY/cpXEqXEbkwRr abVWy0xAKR+nSgNa4g6+unp/KtvdK1y8wgYyLrVCbBIlzIaoB2IGvKXaEThq388OTTJEN7zplJa 8/1epcKfQPLH73K8K0qfj7DVparWQcZgZX5Q3PhWzd1sWbijXMwNB/cQj5RKhfG16/YjTMm52ac TKq2Xo/Lwj3JWV69/kY8qCCwLRAn6WDCSxn6dWzXMLkORlBNzUcGcDTX4QZfDBQ97v7d6c+mc1F ccDeR9k2BpNhm46YvMbTydXINoiiqXEBQ90tZUDxEmtiSN83iRGKGUr6rzmEwlSiZASD2roNDeJ /kUD886YWXckp1lsfhOf+bvs= X-Google-Smtp-Source: AGHT+IEJgDRoCLZ4bMDIIlTEtmkImQ41hv17qgJnXsxl68e/uIsLXxSUtOx5Zzz0yuhl9DHEKXIZ0Q== X-Received: by 2002:a05:6000:2409:b0:3b6:17c0:f094 with SMTP id ffacd0b85a97d-3b8d9471798mr8546424f8f.14.1754320548324; Mon, 04 Aug 2025 08:15:48 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Manos Pitsidianakis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 3/3] tests/docker: fix debian-all-test-cross Date: Mon, 4 Aug 2025 16:15:45 +0100 Message-ID: <20250804151545.311042-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250804151545.311042-1-alex.bennee@linaro.org> References: <20250804151545.311042-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754326815701124100 It turns out you can't easily expand an ENV var across multiple steps in a dockerfile. This meant we silently dropped the architectures we should have even on amd64 hosts. As the updated AVAILABLE_COMPILERS is only needed for the following apt install line just merge them. Fixes: 6da616bb170 (tests/docker: handle host-arch selection for all-test-c= ross) Reviewed-by: Manos Pitsidianakis Signed-off-by: Alex Benn=C3=A9e Message-ID: <20250804104308.250949-1-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/= docker/dockerfiles/debian-all-test-cross.docker index ef69bbc8a51..420a4e33e60 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -62,9 +62,7 @@ RUN if dpkg-architecture -e amd64; then \ export AVAILABLE_COMPILERS=3D"${AVAILABLE_COMPILERS} gcc-powerpc64-linux= -gnu libc6-dev-ppc64-cross"; \ export AVAILABLE_COMPILERS=3D"${AVAILABLE_COMPILERS} gcc-sparc64-linux-g= nu libc6-dev-sparc64-cross"; \ fi && \ - echo "compilers: ${AVAILABLE_COMPILERS}" - -RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ + DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt install -y --no-install-recommends \ ${AVAILABLE_COMPILERS} && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' = --show > /packages.txt --=20 2.47.2