From patchwork Wed Oct 1 10:59:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 4382 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 01 Oct 2025 12:59:59 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f61.google.com (mail-ed1-f61.google.com [209.85.208.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 591AxwqI000378 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 1 Oct 2025 12:59:58 +0200 Received: by mail-ed1-f61.google.com with SMTP id 4fb4d7f45d1cf-6232f49fc79sf8788913a12.2 for ; Wed, 01 Oct 2025 03:59:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1759316393; cv=pass; d=google.com; s=arc-20240605; b=ZtGTw1RJzUHf8iOBQHEn2agz9baFqpmDZOsf/VslOQSM8s3H9xBwHjxKYQ+YCEr5rM GTvFy1HhQ0VvzmspONbXoQ+vS7OgJ34YeAV6rjetqx48FHhM6CsyUTEmW0dOisGXH77K C+r3R1hn2y4h6o+9isVNaP1A4WxlyWPW/O61Ogt2OtusfU2583t53gmmeZJUR0U47fwt +ZgX4s2we+WOx0aprohvRujcsJBVSr0GGSrVvunxbfa4CkXU6lFSisJA9Q4lXST9A6og ggrFX9HeiBDsdAiv0IrX+tHSLXcVn3BBfAaC5JspMBrXWUxazdNsouDbeJJh0hxJ9Q4k 3C2Q== 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=9kRIRuFHIWmNihAS1hRHgv42xm+yOhW2WwK0HHvDCuc=; fh=gUECvHNWGS9ecWXWs+hSnTbdZ+fhVlHddtL0m8nPpQo=; b=YH1aLncc17aOWfPCvkhqE3kVnl4Yl4+pclUQjD9ob1swFw5kR6jUNMz9Rj1bAyKL8t hKG733TDU7Y6YtT0H7mfUrrvBIZ94f8CrU/p4TugAjcTK97F6XE99x/Fe4EvNrDZfRb0 rj1IX/gL/2+s5ptozmW+h7Jeg4xbLmH3wS3On7DKZ8m2yHlSqhwyFBMV8fV1dDmXwsI2 UetW4+wUYFsZk1P6kG0rwP2MjjJ+jzjLWuSCckmBi5afEg/99l6MzAbzA1m4o8106Otp tnMbg0UKOatckfxOGnb406Ec/KeicFTrkejA5Bot11TQVGzbWWrE1PaBbzMYS50f+Kug y1Zw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@emlix.com header.s=20250930 header.b=kg4fwpdZ; dkim=pass header.i=@emlix.com header.s=20250930 header.b=kg4fwpdZ; 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=1759316393; x=1759921193; 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=9kRIRuFHIWmNihAS1hRHgv42xm+yOhW2WwK0HHvDCuc=; b=IoVD2SfbvV8WMretRTmJAlPFtbCIChW7laZKa6YC0+3gG9D3KItAzXYDmhJbqWa4BC wU2yGQ2Ou/FBWCZitWxPTSxwcZq8skwG4v1qn7AZ03SozPD680rZmFvwQzaLG//925AN bKrmCVMTsCZ0JwNlSK9mrfK3CfBhxpvpbyYK+oJTerHaiBmJYQjHnLXnDYQkv4do4ZG8 GhMZIeaVVNmM50TqvwfX6ppRfFuaZosOrOjIAHxHIORDBAFp5llJbM34LLfHypXG7OMC mBcqNBBQIz63A4epNgcDS7mTtxC8PG+jg2rXrdjpeYYNtKyjUlRxr8Dlsx3c0AhFV7HE guvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759316393; x=1759921193; 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=9kRIRuFHIWmNihAS1hRHgv42xm+yOhW2WwK0HHvDCuc=; b=E0xMB71WjQ38lwT54caSIFc5WAkOt6KdED2CyfTKN6+jYAwsqLW6vPkzlkabJIQXdg 6F2hLFaKdFWd/C+HcXJtISnex7xRRsxFS4fb5Dtta1XguQMt/qLpJk36xqjWaiXe7Z6c EZXyh6F9XxRO7ZuyrkFzMK0sbX9F2vaGGKYufsaXgw+ea2nlW2r8y/xOdzWJmOx5CUAb W7WWNDGpy7pHxtFSoZDWwny7TjrrtSXF/FirG6d7eCM2UPQ1oZB0MHyRkyMmCejKvULz /SDn7NBmhxucQIKP29R2tJl88TiHBSLFmE3hEv6P2mnjQsMMNKezqSIwYSlensQ+iERB x/lA== X-Forwarded-Encrypted: i=2; AJvYcCXySPvHMz9JNShhh6CEGZDLmuGJYpzJzBvIalRfsp9CbQ/seueoPibkqsLNbIPKSl+oDG7ncA4=@isar-build.org X-Gm-Message-State: AOJu0YzQU8TJODQc3zlgNNjwJZ/CClf223ydpjGEBLEEBm8VEeIxyYL/ WVQQOMY/feWK/4GaaHKkH44wZrC6NY/auIFLhK1XJKvXnvc9mtNzbL8v X-Google-Smtp-Source: AGHT+IHesrlnGh+x5I5NVsi2namEIPaMMnXjHQKhFbpo5eLvsXB3rznuigLdc6Tv2/sTi1fMcsy5tQ== X-Received: by 2002:a05:6402:5256:b0:634:544b:a755 with SMTP id 4fb4d7f45d1cf-63678c4a534mr3594053a12.19.1759316392997; Wed, 01 Oct 2025 03:59:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ARHlJd4hDD2pX+2vrGdM+TILzeeh2NjbuvEusKLSh5Q2hMcNaw==" Received: by 2002:a05:6402:5041:b0:633:9367:590e with SMTP id 4fb4d7f45d1cf-6349f42dd0els9512843a12.0.-pod-prod-01-eu; Wed, 01 Oct 2025 03:59:50 -0700 (PDT) X-Received: by 2002:a05:6402:40d4:b0:62f:6e4d:7ae9 with SMTP id 4fb4d7f45d1cf-63678ba7145mr3857737a12.5.1759316390060; Wed, 01 Oct 2025 03:59:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1759316390; cv=none; d=google.com; s=arc-20240605; b=Te5jpUCS83+NHooG9ks75xxHE1vmr2vQ5FxlOlwyWyXs2JMTztVbhiXI/RKRfCxo6L 8N2ugZ+TtciQI6NC2wFHsHDixW6MNFGI8QbizYsMfTNCv71o3PMEFdrQywc8Nd5WJb1b 6M2V4iBISGWEeG3Z1pLDlYKpXOCcPUSRt1kzgc+suMcJr/R0P20UvPNkpnHm2tKvoAcJ ZRPLcBkrpUhWmFYA71fYecJOHtUJsp8I9IxsBQrARwNkTKSL2UD2rCqew0xLTlJPSr75 mtU96JdmpJwDluxXOQqO+L4/94I+dFhmnbgd1kBgCqHWCHPiohoFoCewEA3V3LjWzQuF hiMg== 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=wVt2OF+xxbjo2TBylazSHxwdkEEWSCfb0XyJYsh68Gk=; fh=h/3u+BnesbohrVPBf25WVa1dvt5UrhWAO6IFZkZXrvU=; b=DCJmsOPcwU0hUk1mk2UKce901Q/NnzvaWdCaOcUjpL4Ivhh/8FlWrPxGUSOpy5NzU1 DssRoUVD8pHdT80Z2RqcTnzrIXVl8QIFlRmszwwEpRBC6vFTkHGAEeFQSnhgROJygDBn AduM1FjD78negO0wlvW7JnyHXV8g0NRrwG0lvv9NOMD7P0ep9gtQzIewR1tn1oQVaS/I lAGOxciS9mdV2ENlXBxGL+h58uvSA7gY2ItLVM7mDVuYsR9xyVubLZusWpzTFWlJgF0y fMul7dfS7k7qKFidDzYjk5bh6BNI1dSy63GzLRAW/2kR+wlrbqMW+QbnMfGVpF8qUgzH OR6A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@emlix.com header.s=20250930 header.b=kg4fwpdZ; dkim=pass header.i=@emlix.com header.s=20250930 header.b=kg4fwpdZ; 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-634a36522f2si285745a12.2.2025.10.01.03.59.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Oct 2025 03:59:50 -0700 (PDT) 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 BB2205FECC for ; Wed, 1 Oct 2025 12:59:35 +0200 (CEST) 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 AA21D5F84A for ; Wed, 1 Oct 2025 12:59:35 +0200 (CEST) X-Patchwork-Original-From: "'Andreas Naumann' via isar-users" From: Andreas Naumann To: isar-users@googlegroups.com Cc: Andreas Naumann Subject: [PATCH 3/5] image: Do not inherit multiarch Date: Wed, 1 Oct 2025 12:59:27 +0200 Message-ID: <20251001105929.3731537-4-anaumann@emlix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251001105929.3731537-1-anaumann@emlix.com> References: <20251001105929.3731537-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=kg4fwpdZ; dkim=pass header.i=@emlix.com header.s=20250930 header.b=kg4fwpdZ; 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_H2,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?= Images don't need multiarch functionality. Remove the inheritance. In order to keep the bb2deb conversion function in scope for the image class, move it to rootfs, which it inherits from. Signed-off-by: Andreas Naumann --- meta/classes/image.bbclass | 1 - meta/classes/multiarch.bbclass | 16 ---------------- meta/classes/rootfs.bbclass | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 57e66632..354ec85e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -62,7 +62,6 @@ DEPENDS += "${IMAGE_INSTALL}" ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_core} describe --tags --dirty --match 'v[0-9].[0-9]*'" ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" -inherit multiarch inherit essential ROOTFSDIR = "${IMAGE_ROOTFS}" diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass index ae465aec..5b67d779 100644 --- a/meta/classes/multiarch.bbclass +++ b/meta/classes/multiarch.bbclass @@ -101,19 +101,3 @@ python multiarch_virtclass_handler() { } addhandler multiarch_virtclass_handler multiarch_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" - -# function to convert bitbake targets to installable debian packages, -# e.g., "hello-compat" to "hello:i386". -def isar_multiarch_packages(var, d): - bb_targets = (d.getVar(var) or '').split() - packages = [] - compat_distro_arch = d.getVar('COMPAT_DISTRO_ARCH') - host_arch = d.getVar('HOST_ARCH') - for t in bb_targets: - if t.endswith('-compat') and compat_distro_arch is not None: - packages.append(t[:-len('-compat')] + ':' + compat_distro_arch) - elif t.endswith('-native'): - packages.append(t[:-len('-native')] + ':' + host_arch) - else: - packages.append(t) - return ' '.join(packages) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 53e60a81..f60be99c 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -632,3 +632,19 @@ python do_rootfs_install_setscene() { sstate_setscene(d) } addtask do_rootfs_install_setscene + +# function to convert bitbake targets to installable debian packages, +# e.g., "hello-compat" to "hello:i386". +def isar_multiarch_packages(var, d): + bb_targets = (d.getVar(var) or '').split() + packages = [] + compat_distro_arch = d.getVar('COMPAT_DISTRO_ARCH') + host_arch = d.getVar('HOST_ARCH') + for t in bb_targets: + if t.endswith('-compat') and compat_distro_arch is not None: + packages.append(t[:-len('-compat')] + ':' + compat_distro_arch) + elif t.endswith('-native'): + packages.append(t[:-len('-native')] + ':' + host_arch) + else: + packages.append(t) + return ' '.join(packages)