From patchwork Tue Nov 18 14:35:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 4610 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 18 Nov 2025 15:38:11 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f62.google.com (mail-ej1-f62.google.com [209.85.218.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5AIEcAHA031540 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 18 Nov 2025 15:38:10 +0100 Received: by mail-ej1-f62.google.com with SMTP id a640c23a62f3a-b70b2a89c22sf546148066b.0 for ; Tue, 18 Nov 2025 06:38:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1763476685; cv=pass; d=google.com; s=arc-20240605; b=lezJhBckuZ71v1JI7hyF/Cn6bxDkZQWewlnXEd8ueT/2j5rkut0s/e92Yy2QZc2fLi /lBDkppAOCHSOt5FIFSpcEOLngqUi3+IwaDlskuOAvpEiY7Vs2Rr6LyzrzHwBCqPqFHs Nhfj6PvWduvYX9tjJb/WAlgEe4AOn5RrwKuDIgOnuIzmJ3RX5E7X9hrYkHVu0iRiyEAn gyb7mIRrvTQz7w+HpHr39nldNkic50mk2ee0oQeODykpOjLGHve+GUKQXsPP5rHmoWp9 VjnrFi67vtuEEpZ1EPK2oeNO+1P6qar32+BzNSPJcA9uFnxn9HLQP9uo7y8UhIyZAHBf lIXw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=1UtW8A9JZVFdyJncup9VNpn0RBtqL9anOB5lh+o9cy0=; fh=vcdsMKEZIQEXIaAL1DWRTNwOLgry1c5Zebd1ieNoL5E=; b=J7w0wvvzJXHH4h0fxtFPRX3dd6Bx10uBStaJv/JsA1iKdD0ZBqFnQUZQ9RY1Pqeohj iFr6qVo6BcaDuQzdal5YQ5NMBIpu7hZKRK003aOvkaKXRcdzgjCcWKYAmLZPsAryGsfL 3h4NeWFuFlBxh8aVQfDQuPHPBwnWePYa81fqyhOl0RgOOXZfmyIDDH/ofyih3Ya60bwo hPgsZXA8tu53VclP+8uH8gxoB6gM+FJ/HG2numayM86zznrvAiXX939gVDv0EIMXcN4W orVkReUpAUbXHwr2NoP7SDqo4Nwxz7mp+2RtjdxCChDE14eMR5JYE5TIIHeJew+cTFFu 9wiA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@emlix.com header.s=20250930 header.b=iytOuPjK; dkim=pass header.i=@emlix.com header.s=20250930 header.b=iytOuPjK; spf=pass (google.com: domain of anaumann@emlix.com designates 178.63.209.131 as permitted sender) smtp.mailfrom=anaumann@emlix.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=emlix.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1763476685; x=1764081485; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=1UtW8A9JZVFdyJncup9VNpn0RBtqL9anOB5lh+o9cy0=; b=kZa7Qn6l/2oXCubBwpYExufnb+0zzKTV/XcjXCNQD5zcjny83hudGLIL0xXEj/ZF8l Vs2n3iDq5um6j1ka+X2peuza1FowZV6DpjGjhc6+0TFplyNrOK/9BPX/CsfoW32beubQ 4wpg4UMky8C12Lq7SeDATyL2Vv9T1At5e+T79WjJrY0nIIvwvaTA+Yi3e68TDQT02cJ2 zVXyhq9MnsgAYx3lT1bHRJpWD48Pr7GLSKgtnK77W0UqobAV675IiYreMHdNU68ZaaCq kzUhvEwEM6TYoPZIUwUaW9+ygZ2gucQRR9Y/DnQBx7dcnOvA7RfRRA9sRUMjdSiPWz1h i5fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763476685; x=1764081485; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1UtW8A9JZVFdyJncup9VNpn0RBtqL9anOB5lh+o9cy0=; b=CtXtb5xWMQo2dezzqd5bjJnofBDIT0GfcbRe3viyaP4gglU1O7IRDomZjLp5id/hHM qny24HM8T0O8TllmYAJyIZZWbSmJAjIWFsZI/FV/qZeYMRJ+GLJeKdZYEsLYd91ygZRL Px4FvAa3cAun4FOPQWe8yQZQ1F9alnHRsCMZSt/Fpff6/3j06EVF7udH9ImWeUGkaHAS pgx+k8jtVsdccA0Ra1eCCEBDwHmZ21XTvPM8yyMSCj+qZN5Rez7kRT8TETm83aO1X+2l MIbe/eEg9VUiNhtd/2ERtTBsOLom/J/6zDQlw1LYNOwIMz/TKTfzZWukztKFX7o53HkM RzIg== X-Forwarded-Encrypted: i=2; AJvYcCVOJtwDssXJ1BAl8qbmKGGV02mtfVp1wLBOG3UZyX0kW9ZlTUyHtOQX+y8VnFnIF8B8O5URo0g=@isar-build.org X-Gm-Message-State: AOJu0Yz8cMEmdBddbsl+vLUfq0DfxFX7BKzLxIlt+qId/ESPF8nNEsGh KXDR9djrKpDhyzl/53Vm+i8l8cZia4TQBNSN/eTWybwFHEfUcu403VF7 X-Google-Smtp-Source: AGHT+IHyQeJuukYfjTrj9F/dJ5/SSSOtDYhOmHvmqayszvxcon+G5iLWy589M4lF1CLWdsDYrzkv+A== X-Received: by 2002:a17:907:940d:b0:b72:5629:1789 with SMTP id a640c23a62f3a-b758bb787b0mr451523066b.13.1763476684632; Tue, 18 Nov 2025 06:38:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+aC6Eta3VXi1Qn7Mbbjty0JLWI2TlX86hAaDb3QmOQgWQ==" Received: by 2002:aa7:d3c7:0:b0:641:7726:ea9f with SMTP id 4fb4d7f45d1cf-6433511bcb9ls2616181a12.1.-pod-prod-00-eu; Tue, 18 Nov 2025 06:38:02 -0800 (PST) X-Received: by 2002:aa7:c459:0:b0:640:aae6:adc5 with SMTP id 4fb4d7f45d1cf-644fe76e376mr2426489a12.4.1763476682131; Tue, 18 Nov 2025 06:38:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1763476682; cv=none; d=google.com; s=arc-20240605; b=NFPirbi3D8lQ8KSu0zW0vOY+RUGNxw+N4pbrEBb9AW5pqh9eKmH/Dov3CkZ2uxECfO +uNgQ3aPYpbeZs1qufhiA56rwh/fg9sfjcGSOqoRz4L1ICJ86prXvGg9m1AJtgKhvceE FhiGivEFU/15eXuCVsuzJYSlC4pcSiz9uDZ2dnSqI2nuZfwySHjmrlvTbZBMtdgkerFn Q4/RBgZDtZJ2Wyu0Aopu6SuP4ACOS4+szlI9OeAyBTOUyn1QHQ28/dAc5nwYhOFPudC2 uj+GSulKCpOfYZtfFahYdv9EELq7yETbJixqGf8vWo1dlgXZldlhpTdnohRLzWjpGFnX I4zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:dkim-signature; bh=ZrpirNzCyJ41TJUkPBnFSy7iB5yP98mb9yv0x1rARQg=; fh=h/3u+BnesbohrVPBf25WVa1dvt5UrhWAO6IFZkZXrvU=; b=WF0AsSYLm1EmMC4++ZvND9P976y3Tyn9R7sDwkGEesiL2AD8Q77VVPeqnxuJ7pZF7f lEIfcHdtXdAONU3qfZ910mTtF+abErYbEI0jkryd/9m+BI8OWPNTWrCqRmlkTcDTaZSX BCOYkLJB+K3pJ1kgI7M96yG9v8uu9KEFekFPXU7CfchJRSknQ4sUHAn8i0O7iMnx8MF3 TBffGtTClKJ8IyE+v51izo8pI6RSsaZFIcS4zg7BSpYV0byz682QTLaymvrjZknXMEJ4 hjFANdo6DqUiqe2vQV7LBt04G/OE2KFNMFWCygzwIpt76eeoPOdPcd+yy5mRAMfmKogC LsCw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@emlix.com header.s=20250930 header.b=iytOuPjK; dkim=pass header.i=@emlix.com header.s=20250930 header.b=iytOuPjK; spf=pass (google.com: domain of anaumann@emlix.com designates 178.63.209.131 as permitted sender) smtp.mailfrom=anaumann@emlix.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=emlix.com Received: from mx1.emlix.com (mx1.emlix.com. [178.63.209.131]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-643a8871e4dsi71103a12.9.2025.11.18.06.38.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 06:38:02 -0800 (PST) Received-SPF: pass (google.com: domain of anaumann@emlix.com designates 178.63.209.131 as permitted sender) client-ip=178.63.209.131; Received: from mx1.emlix.com (localhost [127.0.0.1]) by mx1.emlix.com (Postfix) with ESMTP id 4842D5FC39 for ; Tue, 18 Nov 2025 15:37:45 +0100 (CET) Received: from mailer.emlix.com (p5098be52.dip0.t-ipconnect.de [80.152.190.82]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.emlix.com (Postfix) with ESMTPS id 4224C5FBDB for ; Tue, 18 Nov 2025 15:37:45 +0100 (CET) X-Patchwork-Original-From: "'Andreas Naumann' via isar-users" From: Andreas Naumann To: isar-users@googlegroups.com Cc: Andreas Naumann Subject: [PATCH v2 3/3] multiarch: Replace divertion of deploy task for "all" packages Date: Tue, 18 Nov 2025 15:35:23 +0100 Message-ID: <20251118143523.2326879-4-anaumann@emlix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251118143523.2326879-1-anaumann@emlix.com> References: <20251118143523.2326879-1-anaumann@emlix.com> MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP X-Original-Sender: anaumann@emlix.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@emlix.com header.s=20250930 header.b=iytOuPjK; dkim=pass header.i=@emlix.com header.s=20250930 header.b=iytOuPjK; spf=pass (google.com: domain of anaumann@emlix.com designates 178.63.209.131 as permitted sender) smtp.mailfrom=anaumann@emlix.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=emlix.com X-Original-From: Andreas Naumann Reply-To: Andreas Naumann Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Diverting the do_deploy_deb function of the base package to the native variant had the sideeffect that the dependencies of the native variant were added to the dependency chain even if the package was originally depended on in its non- native form. Fix this by not manipulating the dependencies at all, but just build the base package for the host architecture. That way sub-dependencies are preserved for all uses cases. Fixes: 5a7c2f7004 ("handle DPKG_ARCH=all case for transitive deps") Signed-off-by: Andreas Naumann --- meta/classes/multiarch.bbclass | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass index 74b8f5b8..851d1aa1 100644 --- a/meta/classes/multiarch.bbclass +++ b/meta/classes/multiarch.bbclass @@ -31,8 +31,6 @@ python() { # build native separately only when it differs from the target variant # We must not short-circuit for DPKG_ARCH=all packages, as they might # have transitive dependencies which need to be built for -native. - # This special handling for DPKG_ARCH=all packages is left to the - # multiarch_virtclass_handler if archDiffers: d.appendVar('BBCLASSEXTEND', ' native') else: @@ -103,17 +101,8 @@ python multiarch_virtclass_handler() { fixup_pn_in_vars(e.data) fixup_depends('-native', e.data) elif archIsAll and archDiffers: - # Arch=all packages might build depend on other arch=all packages, - # hence we need to correctly model the dependency chain. - # We implement this by dispatching the non-native variant to the -native - # variant by adding a dependency. We further empty the non-native - # do_deploy_dep task and clear the internal dependency chain, but keep - # other attached variables like RDEPENDS to preserve the dependency chain. - e.data.setVar('do_deploy_deb', '') - # clear internal dependencies (e.g. to do_dpkg_build) - e.data.setVarFlag('do_deploy_deb', 'deps', []) - # dispatch to native variant - e.data.setVarFlag('do_deploy_deb', 'depends', f'{pn}-native:do_deploy_deb') + # Speed up Arch=all package build + e.data.setVar('PACKAGE_ARCH', d.getVar('HOST_ARCH')) } addhandler multiarch_virtclass_handler multiarch_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"