From patchwork Thu Sep 26 03:39:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "cedric.hombourger@siemens.com" X-Patchwork-Id: 3832 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 26 Sep 2024 05:44:01 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f64.google.com (mail-qv1-f64.google.com [209.85.219.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 48Q3his8017088 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 26 Sep 2024 05:43:45 +0200 Received: by mail-qv1-f64.google.com with SMTP id 6a1803df08f44-6c3516a3f7bsf1558376d6.1 for ; Wed, 25 Sep 2024 20:43:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1727322218; cv=pass; d=google.com; s=arc-20240605; b=ly2HuGSdlzC4t3vqJRaavpZowczYG4GaphMNayoC1nryz12j+QS9R8QZPbA28a8tFq e/Ci73jspD0IceIsr6/ZkD628Sreg7mxXMJGTMizP2XqTC8vhKLoFFNbEpT0egY7kMKC wmqGfmS2nPntFnEiqHkbU/JcC+Ud8OO8C//wvko2Q3pso8ZJqxmLSc8nMySwx+z/W8Lf X5Q+FctBFemt1Qm5v75+oIP5G7VYaYJN/E/l4ZWYx3D70mATqvkuyT0pVoeHOyEoPN+t dAgXHygM7PmVBn0yWy4S18lKtYWFW+iqxDh5897nHSAnCpKLqY1tEuZJrV2OO8cuCorC lcbg== 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:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8AEFTbgcY2avGayLqrtyITacSf8O43cbGmaOpQC0y28=; fh=LLcYRIMIs/FDhjevUh80Xgt5tZxyDjL0eOlZnkOXK3M=; b=iUv331qDMUr6KCovD2BKPIvQ8gm/12tnyK381sEUov/QgAzt+0RJ0uzFKn/by5TjHj bHbbjEIeZXIjZnNr9bb22Eo2pr4bW/R5x9gAEFYTrg3Md2dznOPpkPBAbCuakJneutVI sCHWecp+DbaGGsQtYz5pT3QE4ZxQJFjeQOVCmw6cCZL3TycdGzT0TtxdkzFM77V8i/V5 7/7Y9olFZwa/nlRZxLV6KJHiKCL0a3rQsR3TZdSrDCQEdL+dobPH2TgIcE6Q5DQSZssO o6mZaSlFAoc9aYw/PJ77wxFHbLWZErV5KUlJqy627pba4wMfYUq29znydOzYC0/KWKp7 p8vw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=gtSljolD; spf=pass (google.com: domain of fm-1212295-20240926034335b113a45c28c327f135-atcn8h@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1212295-20240926034335b113a45c28c327f135-atcn8H@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1727322218; x=1727927018; 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:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=8AEFTbgcY2avGayLqrtyITacSf8O43cbGmaOpQC0y28=; b=MNF6bleojWgh29DzYL2R5bY3vZlkj73X05rzcmEtFpcJbYGbE1l3yXaf2A9Zw2shQy CzRhxoJ9fH1IxZD+39b0UGyw02jDh3v89gxzrjxsMrDGwSs1o0Q20YDlVIyNvMJzKp8+ vLNYuC5ypjHq/E3zgVflpLnz2PbeICk9iegSmjNN9tqBgI9fH7nU4u3UnR9vH1rupkd5 NSjKvbH1LImrAh5BMjBde+av1wn/866mZBjjHOC0Obi9UiVHCCESIgwo0xFoNKNjwijP FmlL7y9vHx5XYITqcG9QRfkMX27mBwUKIhgDiWp9M/IIOt/3O6qP/KEtYhE8o/0AzK0w yqrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727322218; x=1727927018; 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:feedback-id :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=8AEFTbgcY2avGayLqrtyITacSf8O43cbGmaOpQC0y28=; b=KYQyLdrFquS2WWzuW2wxjYUoE7MBOtSGoLMPxWO5Ck9I0Tc9NgFuJVeOgHFWgEpI2D 4b0NK/vzT6P3j4jcO2Y8SkbDHMObLrCakwXNYmcmnYuqVey0c5N7AEYTgLxjaGUmUwXR +coxFCmpmRl3ZZI4QCO9hKjkhDhzo17OyCEwJ+uZFtnQNrgLMLwNgGz8MIYnPxLhUZiK q6diIdzoqOHyHF6I+gciOEfMV4VYYNFjMsd1JxOP2ApRO32+GNNgFOgLnK+3OxRBwVw5 FnC0DUR3nLrWsMi2/MUPu6KyytblpSrfRhbEmUevHCiCDO1fVMqJ+NBMMku5ShqtbjLC 0+bw== X-Forwarded-Encrypted: i=2; AJvYcCWGrixFfC2Jeo/l+hmJBhho7s+ezMniyN+CbPktyJEemknJxFh76wkOqp4d7gtl/wa7D2kvsQc=@isar-build.org X-Gm-Message-State: AOJu0Yyu05hMxa7qzQ4MZ+485cOyeydALWb1OTICbyBkCbWKfvwiQ6QO uJZoH2c9t0oZXuu5Fbpqduq4aytDLJICK9/p2FNbsYgStfEijnOJ X-Google-Smtp-Source: AGHT+IEMLzWO10KWuHjCb6WtqvOHEojEoZa/alRzb6yWJrCvXeXLhhpw1/8j5kyKLRVIbN2iAY+hrg== X-Received: by 2002:a05:6214:40d:b0:6c3:5dbd:449c with SMTP id 6a1803df08f44-6cb1dd1bb22mr29576786d6.1.1727322217839; Wed, 25 Sep 2024 20:43:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:226a:b0:6c3:5462:e5d7 with SMTP id 6a1803df08f44-6cb2ed38302ls13777026d6.0.-pod-prod-00-us; Wed, 25 Sep 2024 20:43:37 -0700 (PDT) X-Received: by 2002:a05:6214:2aa9:b0:6bf:a3a6:e7ce with SMTP id 6a1803df08f44-6cb2f2e6ad8mr34726406d6.26.1727322217000; Wed, 25 Sep 2024 20:43:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727322216; cv=none; d=google.com; s=arc-20240605; b=JgpVzrPoZly+M6gGzvPlEInjS207ZdnLaUMfxqCjLOYAnOTYbkDKKhDSLxfC8i9kbL bNs8CIMIeAvCVAxue+Fy5d5a0Dag1jz0z6ukFD1RqMk3y74HA8xuSHhdI5TKmBX+vH23 Xgs0dzqTUt3cjad1IGGFPElrCuNrTB70hO7ASV/fcN7BQNvkI1scJMaI9e1o3e6KGLhN ado7v3trFUhRhXR8stxIFdag3WwX6ZibdXTg5zpfhEzaSmO/AIMyjkFBM8frunC8PQ8G PvXIpYo6JcFrmLtoCxV4VO+540DAZO30/YDnDAy/xlgRmNtw7CpmTTZBW8msMrDtJ4H1 2AZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=4Mskw7FQg3mbz+rYSvlvPDnlN50y41OqVxuj/siB9ac=; fh=1z37pEVhqwMLlkT4FDzOga7XBsM6Rzv6sXOq0pipxqo=; b=dc3Dkh7lUAaPBVVrDpXNULlQA3j7TYbY0v7Kod1lnvHcg2lTIWV7dp84Yzc5NU9fwB Esy0X02pJKBN/Rg58VNv7VXsnA84P02OyqfQT+hJegm6NdNBao2bw/j9wssUoqmqZWmZ XSaywO/KdFt4I+UItla1QzbJbi9ldaQELgTEkCGzPLY6V3yy6hp/ooH5Y3HPRdsBrRr2 CORYeViPgOi4Bzz/6+Vgv1t65jhVTS3oinX/qIAUzcHXdWm3/De2Tsp2PiL+oCslZziz Qa7Dy2QbRkqe4GNNLf2GmCm9C680x0O+UkA0pUNpwyFOwpUBMagORz1eHC/X888s5wSa Mvlw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=gtSljolD; spf=pass (google.com: domain of fm-1212295-20240926034335b113a45c28c327f135-atcn8h@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1212295-20240926034335b113a45c28c327f135-atcn8H@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 6a1803df08f44-6cb0f4be6b1si2143976d6.2.2024.09.25.20.43.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Sep 2024 20:43:36 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1212295-20240926034335b113a45c28c327f135-atcn8h@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240926034335b113a45c28c327f135 for ; Thu, 26 Sep 2024 05:43:35 +0200 X-Patchwork-Original-From: "'Cedric Hombourger' via isar-users" From: "cedric.hombourger@siemens.com" To: isar-users@googlegroups.com Cc: Cedric Hombourger Subject: [PATCH v3 2/3] multiarch: avoid separate builds when DPKG_ARCH is all Date: Thu, 26 Sep 2024 05:39:34 +0200 Message-Id: <20240926033935.2955085-3-cedric.hombourger@siemens.com> In-Reply-To: <20240926033935.2955085-1-cedric.hombourger@siemens.com> References: <20240926033935.2955085-1-cedric.hombourger@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1212295:519-21489:flowmailer X-Original-Sender: cedric.hombourger@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=gtSljolD; spf=pass (google.com: domain of fm-1212295-20240926034335b113a45c28c327f135-atcn8h@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1212295-20240926034335b113a45c28c327f135-atcn8H@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Cedric Hombourger Reply-To: Cedric Hombourger 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_MSPIKE_H2,RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE, T_SPF_TEMPERROR 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?= Binary-independent packages (DPKG_ARCH == all) do not require separate builds for our special -compat and -native targets: extend PROVIDES for these cases. It should be noted that DPKG_ARCH is always set for all dpkg variants and defaults to "any" (only recipes setting DPKG_ARCH to "all" explicitly will be impacted). Signed-off-by: Cedric Hombourger --- meta/classes/multiarch.bbclass | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass index 802686d5..9df8eefd 100644 --- a/meta/classes/multiarch.bbclass +++ b/meta/classes/multiarch.bbclass @@ -5,7 +5,9 @@ inherit compat python() { + pn = d.getVar('PN') archDiffers = d.getVar('HOST_ARCH') != d.getVar('DISTRO_ARCH') + archIsAll = d.getVar('DPKG_ARCH') == 'all' def pn_multiarch_target(pn): return pn.endswith('-native') or pn.endswith('-compat') @@ -20,15 +22,17 @@ python() { # provide compat only when we can build it if isar_can_build_compat(d): - d.appendVar('BBCLASSEXTEND', ' compat') + # but do not build separately if architecture-independent + if archIsAll: + extend_provides(pn, 'compat', d) + else: + d.appendVar('BBCLASSEXTEND', ' compat') # build native separately only when it differs from the target variant - if archDiffers is False: - pn = d.getVar('PN') - if pn_multiarch_target(pn) is False: - extend_provides(pn, 'native', d) - else: + if archIsAll is False and archDiffers: d.appendVar('BBCLASSEXTEND', ' native') + else: + extend_provides(pn, 'native', d) # drop own -native build dependencies at recipe level if building natively # and not for the builder architecture