From patchwork Mon Feb 6 12:20:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 2596 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 06 Feb 2023 13:21:34 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f187.google.com (mail-lj1-f187.google.com [209.85.208.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 316CLXAf005216 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 6 Feb 2023 13:21:33 +0100 Received: by mail-lj1-f187.google.com with SMTP id j13-20020a2ea90d000000b002904f23836bsf2633482ljq.17; Mon, 06 Feb 2023 04:21:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675686087; cv=pass; d=google.com; s=arc-20160816; b=MuKS5k7IQYMsPIFZ6F+KMBQvbRYOTgPpVeVlJpYK4ixac7726Mn3VahVtFPzl0IgyQ +2CMyfxtplXVH8KBccZpCU6p4JbUTnRm/2X34k38IyqzBz1Z4SCHolbozzQ5ghRv/2co qUs6LLIbq1nXj6hnUGSffULbKe2pQX1SOGXkW/cqeOdTRXBXDKPWVwyMpm/Cgf6zjhdk VQ23Wesk1xv0hK+yM6d1sXfw+7umAyK3hX4nI+GlNCKTUWBXhcrAol1IlEM1GI7Y2Ksu YN2eFuk1bewTxl0Bj++LbJKMkrr2lmj7PDm4o0oqz6YImNP/dUSgnrtfnpN8BWGEGYbY iZhg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=zb6rcTmXKXxYc0zaw48cIZBaRSIMuGVrXV0snOH/WfA=; b=e4XeQ2WfBof6RXB0ZA3o12U7ojWx4gZkHBW0wSA+s67g0bONrl/l+qskPt5s5hytVK jgfg5+8w2lKkZSbPQXWIOON5Liny53Ma4tMjdHaCEbrOEBbPsxQrqI7jHP31xw5r09wn aBY8gQsyf+mbc/1EWgK0xHxasb6aqTyTOBpdbhdIIFqEMPUZHyh9mNpgNMwVBuHKCf6P u3pxst4AdbOhN1qO4D5nxrKjpsQwrA2MnESZeTdsKtgrli266ozVtJQdLAZUfwPOku8f ldmUt1CD40vfx2Ntry2gyyTh/drfoW6g/x+PJyoBgddN6VizhUhCGU+zO+wflYOAYNZE N4bQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=WxxbsqEk; spf=pass (google.com: domain of fm-526363-2023020612212589661d2becebb2eabf-uuep7r@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2023020612212589661d2becebb2eabf-Uuep7R@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=zb6rcTmXKXxYc0zaw48cIZBaRSIMuGVrXV0snOH/WfA=; b=ezwHjbAlQUR3WuP2yggKMdgqO8a8Gh5IRb8ZSj0tM0py2zDF1O7sQGkbrJdVaNbH/N d1RjUzKo870CgE8yjF7n1e79tRw1BiXYBxZkl48i7f2M84+y74fBoHVNn61qf7i0Uecd dw7c1m84/37iHtF+oXJTaALXhscgpNERWjl4cqyHDWha8ESrQwEhmpjyhfngQDJBw5DC cjslzm6HOrmBs72/RyS/sqppRbUQ7TJ25hdMfIkc88x9XDyhijySzz0A3lf1Ri1EyMeS xUEN5Q0LDnwxTN5Ua4tbvZIgp8xY9k4vYPiOCovSofaFVh/2xPhDBInyWzTf7waLkH4a Wv/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=zb6rcTmXKXxYc0zaw48cIZBaRSIMuGVrXV0snOH/WfA=; b=Pk01Ru545ZgAOfrxAKsb520ClGs8I4XjqZjg08qZ4V0bnLK0yC31PkgzmT1fQwq+as WSNIvzE6HwCDd45lMrcRh3L9Du5nAMWaaWbgvQUP1hxQWuPm8S392ACKdXLQSLbP8+hv 9tZnR5tkdieDrCG3xhZGzXp3pVWnCci60mmL13HKLacYs4cvaUJX+AErmdNa0mCrVLX6 lq2gFLBocKtQHn52rK4RH3xQ9wP7igFgz8KTy2+N4ETrmhZ78W3MwdkGX/ewmcaor/OZ UmRXGTyfZX7Y7PyjDB0yOGs821DntPjkGcypo3P2nFRzSPiS5M0ncq7Z6ViWsuohOtH1 jHQg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKUixR+7Voh4WrAUgbns08zZh0BZNl8I941RyIrQ+bXSFXprwJJq PZxYHbFLk6Q80kCcHGwfr00= X-Google-Smtp-Source: AK7set/q3pcWRri2NtsbSDZCT2hMScgH6W0wh5vYxeo1HqsMyQlatMPuLIHyFy2y0wMij4Tfcap5YA== X-Received: by 2002:a2e:824c:0:b0:290:4f23:f72a with SMTP id j12-20020a2e824c000000b002904f23f72amr2702147ljh.197.1675686087513; Mon, 06 Feb 2023 04:21:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bc0a:0:b0:290:6183:37b4 with SMTP id b10-20020a2ebc0a000000b00290618337b4ls1523827ljf.0.-pod-prod-gmail; Mon, 06 Feb 2023 04:21:26 -0800 (PST) X-Received: by 2002:a2e:155c:0:b0:290:5661:21ed with SMTP id 28-20020a2e155c000000b00290566121edmr4293403ljv.26.1675686086005; Mon, 06 Feb 2023 04:21:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675686085; cv=none; d=google.com; s=arc-20160816; b=OAmkz7pgSIdo6ut60eXD5Zw+awVnN0U9WZGUhiAE64dAP9+UGEKiz9tfCkj28/h2WQ A4F4wVDNB7vjnq6phsztGlnVH+lm+TU9OwEBUTMx204yeRGh06ljf8OF3efvFeq2hIcp vRpUJ3S7HmS146AMa6A3y0pzwy/UcWmi37tYAn3c2UN7JLZ5o2gd9Ps8+QHcfnSGaBVb IBMFLovA88zWGiksqxC8CTKVaRt9cxmP++/SaidV8DjLHMnit1gzr6th153Cn/UaUSA1 C49JEZIR7IXnSKmDCE2ibtNRvS6MAieCOmzDExqb1gnJ0FufH/+m+1b2xcYfIJVPNp5s lk+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=dqgmsrYqfrSVukoKzvamPfldYMZlyR8PDr4v58/GszM=; b=kXvlWmX6M4CC2qQAyakBgXS0WP9ge/zBUK7Gh5dzxss4sEFIg7j0jkeDnbh0Q4uSUG Vkg3MGUcgdWQt95KVMrUh65l5hDbjVaDRhSR0ED1mqPJ3a7/Pqb0lQmF02edkp86OSXF wSNo0cVt8/5cTatklZIjkHTr9/LnelZDh7OsoFXA0P2n0gnOYa1PpDM91NvxbK1fH/2t ZFGvOLjyFB19tHBjcNSMUZPjdQVUiBvWbWgz4tU1ZUPsPNayWWeYXVhneomFgYdfYtsS 2LW3gVr5MaNE+gAzy/K+YE2oaA+cKamJ7f+1M+KQudtSdtz20ArHEbjy2SIrSH5IfzGC upBg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=WxxbsqEk; spf=pass (google.com: domain of fm-526363-2023020612212589661d2becebb2eabf-uuep7r@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2023020612212589661d2becebb2eabf-Uuep7R@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id k31-20020a0565123d9f00b004cb0f0982f3si473663lfv.4.2023.02.06.04.21.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Feb 2023 04:21:25 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-2023020612212589661d2becebb2eabf-uuep7r@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 2023020612212589661d2becebb2eabf for ; Mon, 06 Feb 2023 13:21:25 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, Adriaan Schmidt Subject: [PATCH 1/3] bitbake.conf: use PACKAGE_ARCH in overrides Date: Mon, 6 Feb 2023 13:20:48 +0100 Message-Id: <20230206122050.337270-2-adriaan.schmidt@siemens.com> In-Reply-To: <20230206122050.337270-1-adriaan.schmidt@siemens.com> References: <20230206122050.337270-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-526363:519-21489:flowmailer X-Original-Sender: adriaan.schmidt@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=WxxbsqEk; spf=pass (google.com: domain of fm-526363-2023020612212589661d2becebb2eabf-uuep7r@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2023020612212589661d2becebb2eabf-Uuep7R@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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?= This replaces `DISTRO_ARCH` with `PACKAGE_ARCH` in the `OVERRIDES` list. Note that `PACKAGE_ARCH` defaults to `DISTRO_ARCH`, so this only has an effect when `PACKAGE_ARCH` is explicitly set in a recipe. Signed-off-by: Adriaan Schmidt --- meta/conf/bitbake.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 522241aa..f1a9438e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -67,8 +67,8 @@ KERNEL_FILE:mipsel ?= "vmlinux" KERNEL_FILE:riscv64 ?= "vmlinux" KERNEL_FILE:arm64 ?= "vmlinux" -OVERRIDES = "${DISTRO_ARCH}:${COMPAT_OVERRIDE}:${MACHINE}:${DISTRO}:${BASE_DISTRO_CODENAME}:forcevariable" -FILESOVERRIDES = "${DISTRO_ARCH}:${MACHINE}" +OVERRIDES = "${PACKAGE_ARCH}:${COMPAT_OVERRIDE}:${MACHINE}:${DISTRO}:${BASE_DISTRO_CODENAME}:forcevariable" +FILESOVERRIDES = "${PACKAGE_ARCH}:${MACHINE}" COMPAT_OVERRIDE = "${@'compat-arch' if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1' else ''}" # Setting default QEMU_ARCH variables for different DISTRO_ARCH: From patchwork Mon Feb 6 12:20:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 2594 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 06 Feb 2023 13:21:34 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 316CLXKg005214 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 6 Feb 2023 13:21:33 +0100 Received: by mail-lf1-f61.google.com with SMTP id g27-20020a0565123b9b00b004d861df2daesf4802709lfv.13; Mon, 06 Feb 2023 04:21:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675686088; cv=pass; d=google.com; s=arc-20160816; b=tgolp0jxQTJxlDKUM0DF13KEaNkWoXNqYXyUwHpu6T3ofQDeIho9fp41o/QWJ/ZwLm ibgB0gMd3N1hCV+wD8k30g8of5GP/gKzqyWmVF38IXqJakglU+Cl6wRJWwsDRDLAVlHD cUjEl0TN4jzh45S0U7+/TdgD+AgF7JHgjEn4vR79l76WP9kr+giCqtNdOVToP7nUBIoa VYyBER08VAai8Bkzqn4f7I+1AYcoJVK2ztsOutr/fDU6icTWltlqDiNT4C8KOsMJB2aG t8VGqEpqUEeGjtTxBiJvS9sasSh+A3+dfovMxVyP44HNKmZTg9KE6JiuvRmewrYXTRiy TV/g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=Zzhsx/H0DasndWXNeNemghAQxNsAv9BwomY/vOEfX08=; b=02i1XfY4y9/lgpWTvaF3iM6+b1hnx1LTrtl5SDvFnDYV9Z3AQZVZA5ftNh7YskjjYi siyX9kkRdPMWzFm5F7ZD9qeq4zBQWgPTxI63LVNoLXs1K0H/A8+DS3S2318328qBuAE8 PwWwhhShhOrxOwjI2j334VjbWqIzbi+4PlzpGb00cSL5wl6lt/9QzPojxbwqi6mbTZay 0ln1q8o31jWeoO2tIZ4Xw5DoVto/euGm4F7BRYnX3Jw8W4o1UMmhsgjnuLBN8MVkGM/L 29lpnuw83bQ2o6ZHSNcxkC4mgVt9lLWVMUypHuDTKrldakdaSkVOu/sxY0nowIEX4HTH 5gDw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Ymlkbh0a; spf=pass (google.com: domain of fm-526363-202302061221256fb1d31fc0e44c5971-dlvtfx@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-202302061221256fb1d31fc0e44c5971-DlVTfx@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=Zzhsx/H0DasndWXNeNemghAQxNsAv9BwomY/vOEfX08=; b=HXt3mtD5dgBFBzw1ycIjD32SkdLydkoyfqB10uAtZiMi4pjfKYCx38rlRUJ7i/hFuw 7ox40ksOTvQXFlt7wOXk195RwZ+I/fH5NQ5InAySI16cm4N/1/tmU05svwhnu8Yxiymr GAwsANPMFzW0voeTHXjDvXKYnX3KFEmPDH0XKthwsgLmKFmbJzLsvcbp3olKTll2HhZY 2W5t0kJz72YTTF7VWbK2++NNae9xr+IPG45+3jkADz7XAtHzi2MH7j86/wXl9z3o+MaY J/Gw3YoQaZg04/CO8VkK8ka6u+DUI7wocG1NxAx4IzjKfKx++oYlCdbsHggAA6OVGeGY sBIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=Zzhsx/H0DasndWXNeNemghAQxNsAv9BwomY/vOEfX08=; b=eAArnI3np6lTGo9jf+7ZGb6sddMMc/ZDvp2JFCOkBJOIvJXL7BaYEDdks7aH7jLv2X Q5EYitfwfn/cocijxNAXu5XSkfKp3D6C8JYzQMkftIckidIFa+kej0a2o3iIVacjGar+ wrY60MIzbtr+Ii+E42Xsli798UQNPKgZ8RRsQVjpqmlXB5wunyPwvyuPNYy8CR4AMMAS OvxA+jMRBsOUo9R1QfQG1jwKaH2ShcPKfrCYY2SJlIUgZZw4ee3ot8qCgaihxcb5FXqL 0AmGz5eNAQELhJV7KkV2Fiww6ZYxSb3Zj+C3m4PVsUPROEQE+33/a3VzMAUk5j5eNv44 dlTg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKX6DS0dBkMPmmCpoFbcqvO1RyJ6sSsaTqiS5UybAcMtMenof9w+ ax/PocFnFVUhxNqbFWl7pMI= X-Google-Smtp-Source: AK7set/W7YtlH/HX6zDSitrSe/V+y7YQOh6C1wgiayhA68GZ0FLGp+asqYIqtUbg183UAXZl7QYoMQ== X-Received: by 2002:a2e:991a:0:b0:290:5823:cde1 with SMTP id v26-20020a2e991a000000b002905823cde1mr2689606lji.122.1675686087672; Mon, 06 Feb 2023 04:21:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a991:0:b0:292:8017:11d9 with SMTP id x17-20020a2ea991000000b00292801711d9ls1095272ljq.7.-pod-prod-gmail; Mon, 06 Feb 2023 04:21:26 -0800 (PST) X-Received: by 2002:a2e:b895:0:b0:290:5fbe:d0a1 with SMTP id r21-20020a2eb895000000b002905fbed0a1mr6131485ljp.2.1675686086245; Mon, 06 Feb 2023 04:21:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675686086; cv=none; d=google.com; s=arc-20160816; b=AqEzmJbOQECpBRW+w8SoqRCViyq6E5CsfWaeo6XFgvQJGdbpIUj4ezpT4dTbA4gCcY mp0KLYh7SzoOK79LRkIyaGK7BHMEXhDB728KQgBQ8DlUi/HjpUaWVdL2X8/hTsbQ4p2f siORjtC9w8z8U8xAN/b8XMP8nHVmlMYK7Rlnj+rhm8lMHcH22qyIUnoWzT7yicAaL21z xXpN2Ttlackipe5dZDZU7KYX0DxjMcdiNGhxOSvC4MOX3RSyXVT6VEZ6T+d7ERBt5lx2 ynj8N+W592L93o0q1oQylNNopq6/omeRiEZmOFrVRGr905b5lHXFneoCliCYtdj0mgxu P62A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=B8IHSJ0JY4BDFHJ/2JjV/8+GlnbfnFWNraIRqb9z0JI=; b=EiGILtd9PjzUyaGD3DUMRsvQJTfYPE4xuyIiUjyoJhapFmd0w7XJnqxGFQFmoXyka+ Vvyy2xHkR17kq49DGz/YgEatWRZ4ysV2hVv3naXq3934QrX7GiAcEqqTdSrCaE46P5wU Qkz0b/kl8KQUMwbMK/hP9NGd/NuIca1dDytRx+wzrx2/ybBWCjV/MkH1H5eiOVTRbfAR t4hh6iCB0n2Y5Yk6ZYW8fXXY1qYgIJ4uujHy47h0bgqzgZL2njAJbc+szUnqiBGt9d/L kNcUqBKyNyOfqPlNT6fg41s8YHbSgnDpBf8OrcekS5jqPDxao3bGLr2lb5E3Z3ntSDpi +d7A== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Ymlkbh0a; spf=pass (google.com: domain of fm-526363-202302061221256fb1d31fc0e44c5971-dlvtfx@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-202302061221256fb1d31fc0e44c5971-DlVTfx@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id n23-20020a2e86d7000000b00286e157db47si521748ljj.6.2023.02.06.04.21.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Feb 2023 04:21:26 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-202302061221256fb1d31fc0e44c5971-dlvtfx@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202302061221256fb1d31fc0e44c5971 for ; Mon, 06 Feb 2023 13:21:25 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, Adriaan Schmidt Subject: [PATCH 2/3] add multiarch support Date: Mon, 6 Feb 2023 13:20:49 +0100 Message-Id: <20230206122050.337270-3-adriaan.schmidt@siemens.com> In-Reply-To: <20230206122050.337270-1-adriaan.schmidt@siemens.com> References: <20230206122050.337270-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-526363:519-21489:flowmailer X-Original-Sender: adriaan.schmidt@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Ymlkbh0a; spf=pass (google.com: domain of fm-526363-202302061221256fb1d31fc0e44c5971-dlvtfx@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-202302061221256fb1d31fc0e44c5971-DlVTfx@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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?= This adds support for building packages for native and compat architectures to dpdk-base.bbclass. Thus, all package recipes automatically have a *-native and *-compat target, which can be used in DEPENDS/RDEPENDS definitions. Additionally *-compat targets can be used in IMAGE_INSTALL, where they are automatically converted to install package:${COMPAT_DISTRO_ARCH}. Note that the switch ISAR_ENABLE_COMPAT_ARCH still exist and controls addition of the compat architecture during bootstrapping. Signed-off-by: Adriaan Schmidt Signed-off-by: Adriaan Schmidt Signed-off-by: Adriaan Schmidt --- .../recipes-app/samefile/samefile_2.14.bb | 2 +- meta/classes/compat.bbclass | 49 +++++++++++++++++++ meta/classes/debianize.bbclass | 2 +- meta/classes/dpkg-base.bbclass | 1 + meta/classes/image.bbclass | 4 +- meta/classes/multiarch.bbclass | 44 +++++++++++++++++ meta/classes/native.bbclass | 10 ++++ meta/conf/bitbake.conf | 1 + 8 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 meta/classes/compat.bbclass create mode 100644 meta/classes/multiarch.bbclass create mode 100644 meta/classes/native.bbclass diff --git a/meta-isar/recipes-app/samefile/samefile_2.14.bb b/meta-isar/recipes-app/samefile/samefile_2.14.bb index 5e36a2ac..c53c9445 100644 --- a/meta-isar/recipes-app/samefile/samefile_2.14.bb +++ b/meta-isar/recipes-app/samefile/samefile_2.14.bb @@ -21,7 +21,7 @@ do_prepare_build() { # deb_debianize. Pre-exisiting files will not be recreated, changelog # will be prepended unless its latest entry is for CHANGELOG_V. cat << EOF > ${WORKDIR}/changelog -${PN} (0.1) unstable; urgency=low +${BPN} (0.1) unstable; urgency=low * a long long time ago there was an early version diff --git a/meta/classes/compat.bbclass b/meta/classes/compat.bbclass new file mode 100644 index 00000000..7142ec3a --- /dev/null +++ b/meta/classes/compat.bbclass @@ -0,0 +1,49 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 Siemens AG +# +# SPDX-License-Identifier: MIT + +# this class is "dual-use": it can be inherited (e.g., by bootstrap and image +# classes) to access variables and functions, and it's also addedd via BBCLASSEXTEND +# when inheriting multiconfig.bbclass. + +################################################################################ +# generic functions +################################################################################ + +# calcucate COMPAT_DISTRO_ARCH +# we can't use simple overrides, because in case we're building a package +# with a PACKAGE_ARCH != DISTRO_ARCH, overrides would find the wrong value. +python() { + distro_arch = d.getVar('DISTRO_ARCH') + compat_distro_arch = d.getVar('COMPAT_DISTRO_ARCH:' + distro_arch) + if compat_distro_arch is None and 'class-compat' in d.getVar('OVERRIDES').split(':'): + bb.fatal(f"{distro_arch} does not have a compat arch") + d.setVar('COMPAT_DISTRO_ARCH', compat_distro_arch) +} + +# function to convert bitbake targets to installable debian packages, +# e.g., "hello-compat" to "hello:i386". +def isar_compat_packages(var, d): + bb_targets = (d.getVar(var, True) or '').split() + packages = [] + compat_distro_arch = d.getVar('COMPAT_DISTRO_ARCH', True) + for t in bb_targets: + if t.endswith('-compat'): + packages.append(t[:-len('-compat')] + ':' + compat_distro_arch) + else: + packages.append(t) + return ' '.join(packages) + + +################################################################################ +# package recipe modifications when actually building *-compat: +################################################################################ + +# check that we can actually build compat (ISAR_ENABLE_COMPAT_ARCH is set) +python do_fetch:prepend:class-compat() { + if not d.getVar('ISAR_ENABLE_COMPAT_ARCH', True) == '1': + bb.fatal("compat package requested, but ISAR_ENABLE_COMPAT_ARCH is not set.") +} + +PACKAGE_ARCH:class-compat = "${COMPAT_DISTRO_ARCH}" diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index a6694a00..1b98c02d 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -31,7 +31,7 @@ deb_add_changelog() { date=$(LANG=C date -R -d @${timestamp}) cat < ${S}/debian/changelog -${PN} (${changelog_v}) UNRELEASED; urgency=low +${BPN} (${changelog_v}) UNRELEASED; urgency=low * generated by Isar diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index ad28f7b3..55cc6655 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -5,6 +5,7 @@ # SPDX-License-Identifier: MIT inherit sbuild +inherit multiarch inherit debianize inherit terminal inherit repository diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 539ec51d..8d0dda30 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -79,9 +79,11 @@ image_do_mounts() { buildchroot_do_mounts } +inherit compat + ROOTFSDIR = "${IMAGE_ROOTFS}" ROOTFS_FEATURES += "clean-package-cache clean-pycache generate-manifest export-dpkg-status clean-log-files clean-debconf-cache" -ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" +ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${@isar_compat_packages('IMAGE_INSTALL', d)}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_PACKAGE_SUFFIX ?= "${PN}-${DISTRO}-${MACHINE}" diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass new file mode 100644 index 00000000..5b280699 --- /dev/null +++ b/meta/classes/multiarch.bbclass @@ -0,0 +1,44 @@ +# This software is a part of ISAR. +# Copyright (C) 2021-2022 Siemens AG +# +# SPDX-License-Identifier: MIT + +BBCLASSEXTEND += "native compat" +BPN = "${PN}" + +python multiarch_virtclass_handler() { + def fixup_pn_in_vars(d): + vars = 'SRC_URI FILESPATH'.split() + for var in vars: + v = d.getVar(var, False) + if v is not None: + d.setVar(var, v.replace('${PN}', '${BPN}')) + + def fixup_depends(suffix, d): + vars = 'PROVIDES RPROVIDES DEPENDS RDEPENDS'.split() + for var in vars: + multiarch_var = [] + val = d.getVar(var, True) + if val is None: + continue + for v in val.split(): + if v.endswith('-compat') or v.endswith('-native'): + multiarch_var.append(v) + else: + multiarch_var.append(v + suffix) + d.setVar(var, ' '.join(multiarch_var)) + + pn = e.data.getVar('PN') + if pn.endswith('-compat'): + e.data.setVar('BPN', pn[:-len('-compat')]) + e.data.appendVar('OVERRIDES', ':class-compat') + fixup_pn_in_vars(e.data) + fixup_depends('-compat', e.data) + elif pn.endswith('-native'): + e.data.setVar('BPN', pn[:-len('-native')]) + e.data.appendVar('OVERRIDES', ':class-native') + fixup_pn_in_vars(e.data) + fixup_depends('-native', e.data) +} +addhandler multiarch_virtclass_handler +multiarch_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass new file mode 100644 index 00000000..ef20e8bc --- /dev/null +++ b/meta/classes/native.bbclass @@ -0,0 +1,10 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 Siemens AG +# +# SPDX-License-Identifier: MIT + +################################################################################ +# package recipe modifications when actually building *-native: +################################################################################ + +PACKAGE_ARCH:class-native = "${HOST_ARCH}" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f1a9438e..f38bb447 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -81,6 +81,7 @@ QEMU_ARCH:riscv64 = "riscv64" # Codename of the repository created by the caching class DEBDISTRONAME ?= "isar" +NATIVELSBSTRING ?= "isarnative" # Strings used in sstate signature files TARGET_VENDOR = "" From patchwork Mon Feb 6 12:20:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 2595 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 06 Feb 2023 13:21:34 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f58.google.com (mail-lf1-f58.google.com [209.85.167.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 316CLX8B005215 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 6 Feb 2023 13:21:33 +0100 Received: by mail-lf1-f58.google.com with SMTP id w2-20020ac24422000000b004b567ec0ec1sf4830066lfl.15; Mon, 06 Feb 2023 04:21:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675686088; cv=pass; d=google.com; s=arc-20160816; b=r8pMk1wE/+nS1dlcihB3OWS7RbKfErPZz9YYE1e/g96DxDA4NQ9XtnDyb0Hst0c8Da PNvkFKLe7xVFYlpO5mkBWjS0nyHinMsFRszqBQboZam/yZ108lYk0zotfb+L/+4fAu4j LCF/5laoS4/eMo+xqIX/trfd4OstIgCfWG7avwY/9DMAW5Cee7vOcKE7a4WuujTlI9rh PZT//zON66d0+Vx99P/BZgT46H4lzHTkdzm5xyjNc0dumdx2JRv4p0DGcLZNIX7dbsmM upjuYGswJc4G49v7mnMQBNKrNlYlTDIPFM7WSrdtH8tKh2BP9C0i2cItJaPUe1t8k4oZ diIA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=0YfukUHyAVome1wPCmGR2BkJO3ANg3aIKK6Ypw/o6Zw=; b=HHK4Mhpa4Us/KDD21PycZz/iuSzA0Nhu/+RgrBEQG2WY3Z1rprMtgBa3s701QqDfZw twSc9tr7NuOD5qxgR0Ab4ZQ2HYo1KkvZkchVn8ABYpaVBbRP+ou07PyDi+LUosyQ+NuK SwzGtDk5SgFcqdzXHDCM3MszPUVOBoinOdvq9ow3a7Op2gpRIDEr/s8MN5G1MSXTktmA qdz7P9d7Ac+2axzEdV7DhuC2Q379ZHLLxdXgmniEeieUksj4y7yF1vx32h/8VFkdlEQw KIjwdSTtckc8JRDMfOnh53m/WOFtmqavtOTFPJzqZdnpvfko8Yfc9+SfXnm29UFD+Lir 6vaw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=oyPqUYwN; spf=pass (google.com: domain of fm-526363-2023020612212502f3a8c67686280de8-rqvapf@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2023020612212502f3a8c67686280de8-rQvApF@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=0YfukUHyAVome1wPCmGR2BkJO3ANg3aIKK6Ypw/o6Zw=; b=QwKsbt2ptnQLTy97GIM5Ucydd3b6+vQeef8T1xRtYgb10JLEkqqPf9/rKmgR9fYH6N zbeeghBFYImzahBgkxfpw0o7r1LqtLGV0ldr/7bsBRtN5MMxkA62/GjCGQyXXhLvfiIb k2ldU7cCRyubyIPXjFd+RIjdiReJ3K94TA5YP+Rbwev8FR/KO81CYOBpn95LqFIRbpBU jYtVi1JYlElB+Ydtv9nBELY16TYbVnGjabHV9fESPdZvWHxNwzqGdNe1YkCGklX8zSNI XbCm2K+6eRWwti8I8jKKfUgjWzkRv2d9xRWHg7cDmghDaqbbtOigLM3vh8af/A5U2yJ2 IseA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=0YfukUHyAVome1wPCmGR2BkJO3ANg3aIKK6Ypw/o6Zw=; b=jsDR8Nmb1JsL57tmjInCI+t4h5OKGraXFrTGdzjEzjGbuXToHW4LTz44UZ0SVFlmc6 /KcdacAmvBiNS3hDAuz6AvQf/RZqt288+HEfTusHpU34gPIo+ahTo2nJoqCYUqjjI6Tf H5INyMKlpvq8Kyo1FSlomQyzb03fYOT6mmZvUZPjE/5NSL0zALlDWaKh/4wOZvIF/4SW /VwG6mw4unjgozCet7R52q5O7PShQmhGbTtr2rfb0Gi6tmkNkcwMvwSp4Cu7ddsvymSu pxCiiodKhXok8duCWV1xHHRnYE+SjiGN497Jvz1e1WFpQMuhx4ps3Ium5OcYO21H0tBN k9bg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKU+DNtik2Je3CUqdKyumAn1KeWHatrG2DLKhO6J55pSFh/XkvE7 q9j0FnVXPacilEeGc5bd8EM= X-Google-Smtp-Source: AK7set86lBAHSuWNzUj2VwMZXuhwcZ3rqGYITnWhfeOd5IRaxH9utf/T344U3dYajoWzMPDmsA5nOQ== X-Received: by 2002:ac2:44dc:0:b0:4ca:f3c2:2670 with SMTP id d28-20020ac244dc000000b004caf3c22670mr3063771lfm.166.1675686087594; Mon, 06 Feb 2023 04:21:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d1f:b0:4d1:8575:2d31 with SMTP id d31-20020a0565123d1f00b004d185752d31ls336771lfv.0.-pod-prod-gmail; Mon, 06 Feb 2023 04:21:26 -0800 (PST) X-Received: by 2002:a05:6512:141:b0:4cb:88c:c794 with SMTP id m1-20020a056512014100b004cb088cc794mr4819859lfo.35.1675686086161; Mon, 06 Feb 2023 04:21:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675686086; cv=none; d=google.com; s=arc-20160816; b=Q8LeIcFNBjH7hlPPi+bqHC3f6P1GnnExujj4XZ/NBVRtRwmBqvanyswvevKY8E0Gns EEDWtj60QvaxMk/zZUkjiF7oFhXEhH6SlgxWDzDuBsbDKNQHtvcGDmbkCA9CbxDs5lQe yHmJHU96TR8okVPZYg5vxGXTtvoKjHzOMwYy+5jUIvNsIZrO1grWQ7wyF0tHvIt7VCaE CIA5Le+fywpXeNIcZ8sqMUR0b0e2dbU++lBzTHZS5JgoOrtwHAsLPKqRN8Pqpr2qUugM ShU68seGS1qfFFl6HUa/pfW+/DggL5d6P/tDvdulsTrvGGV1VKeJ7BO87en6tE/i+jxI aMJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=K0hgveGFs+R/APHXdAJz0+yF5+yVh/GpQ5g8XBpoawU=; b=PDlTSNgnTRR1WpA07JJIHK7VdygnQP+B/TePxcv+zaAeA55BCOZzzrElkQbshwzylq Ru6xm4rlLNJ4C9YO7mDevk/eQe+2FJUSoLNgp02YkZnAZC9j6hii2hwpvdf04k7n+GHC wFOAj2IUZ3in39fwU+1++ICamFHrCg0ZMUF3ju6mOHdB23XynMCpdKv/QJc9NPbwWVxm zxiT9EzilRRt83xeZF2qKrYLknBHJ1eUDWf8/B9+DxKfROWKaDfuu7AljeJ0GsuNaIH0 vwY6izPTnfBmoWQqTRQWBQgsfM/9WprW8eLpI/CMZA1rnux3chfwhmR2fLg9klllkHDf cmtg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=oyPqUYwN; spf=pass (google.com: domain of fm-526363-2023020612212502f3a8c67686280de8-rqvapf@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2023020612212502f3a8c67686280de8-rQvApF@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id k31-20020a0565123d9f00b004cb0f0982f3si473663lfv.4.2023.02.06.04.21.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Feb 2023 04:21:26 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-2023020612212502f3a8c67686280de8-rqvapf@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 2023020612212502f3a8c67686280de8 for ; Mon, 06 Feb 2023 13:21:25 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, Adriaan Schmidt Subject: [PATCH 3/3] remove obsolete compat-arch override Date: Mon, 6 Feb 2023 13:20:50 +0100 Message-Id: <20230206122050.337270-4-adriaan.schmidt@siemens.com> In-Reply-To: <20230206122050.337270-1-adriaan.schmidt@siemens.com> References: <20230206122050.337270-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-526363:519-21489:flowmailer X-Original-Sender: adriaan.schmidt@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=oyPqUYwN; spf=pass (google.com: domain of fm-526363-2023020612212502f3a8c67686280de8-rqvapf@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2023020612212502f3a8c67686280de8-rQvApF@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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?= The compat-arch override is no longer needed, as PACKAGE_ARCH is controlled by DEPENDing on -compat. Also change the compat test: adding the compat package now happens via IMAGE_INSTALL in the config. Signed-off-by: Adriaan Schmidt --- meta-isar/recipes-app/hello-isar/hello-isar.bb | 3 --- meta-isar/recipes-app/libhello/libhello.bb | 3 --- meta/conf/bitbake.conf | 3 +-- .../recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 ++ .../sbuild-chroot/sbuild-chroot.inc | 14 ++++++++------ testsuite/cibuilder.py | 2 ++ 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb index 39ddecb9..7d9f8322 100644 --- a/meta-isar/recipes-app/hello-isar/hello-isar.bb +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb @@ -20,7 +20,4 @@ SRC_URI = " \ file://yet-another-change.txt;apply=yes;striplevel=0" SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d" -# NOTE: This is just to test 32-bit building on 64-bit archs. -PACKAGE_ARCH:compat-arch = "${COMPAT_DISTRO_ARCH}" - inherit dpkg diff --git a/meta-isar/recipes-app/libhello/libhello.bb b/meta-isar/recipes-app/libhello/libhello.bb index 3770fdb4..8b10842f 100644 --- a/meta-isar/recipes-app/libhello/libhello.bb +++ b/meta-isar/recipes-app/libhello/libhello.bb @@ -13,7 +13,4 @@ PV = "0.1-98f2e41" SRC_URI = "git://github.com/ilbers/libhello.git;protocol=https;branch=master;destsuffix=${P}" SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93" -# NOTE: This is just to test 32-bit building on 64-bit archs. -PACKAGE_ARCH:compat-arch = "${COMPAT_DISTRO_ARCH}" - inherit dpkg diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f38bb447..1f010f4b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -67,9 +67,8 @@ KERNEL_FILE:mipsel ?= "vmlinux" KERNEL_FILE:riscv64 ?= "vmlinux" KERNEL_FILE:arm64 ?= "vmlinux" -OVERRIDES = "${PACKAGE_ARCH}:${COMPAT_OVERRIDE}:${MACHINE}:${DISTRO}:${BASE_DISTRO_CODENAME}:forcevariable" +OVERRIDES = "${PACKAGE_ARCH}:${MACHINE}:${DISTRO}:${BASE_DISTRO_CODENAME}:forcevariable" FILESOVERRIDES = "${PACKAGE_ARCH}:${MACHINE}" -COMPAT_OVERRIDE = "${@'compat-arch' if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1' else ''}" # Setting default QEMU_ARCH variables for different DISTRO_ARCH: QEMU_ARCH:amd64 = "x86_64" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 99d75e21..21a2d92f 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -274,6 +274,8 @@ do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}" do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config" do_bootstrap[network] = "${TASK_USE_NETWORK_AND_SUDO}" +inherit compat + do_bootstrap() { if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then if [ -z "${COMPAT_DISTRO_ARCH}" ]; then diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index fb061dac..fd8bb648 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 PV = "1.0" inherit rootfs +inherit compat python() { distro_gcc = d.getVar('DISTRO_GCC') @@ -20,18 +21,19 @@ python() { d.appendVar('SBUILD_CHROOT_PREINSTALL_COMMON', ' libstdc++-{}-dev:{}'.format(distro_gcc, distro_arch)) - if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1': - compat_arch = d.getVar('COMPAT_DISTRO_ARCH') + if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1': + compat_arch = d.getVar('COMPAT_DISTRO_ARCH') + d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', + ' libc6-dev:{}'.format(compat_arch)) + d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', + ' crossbuild-essential-{}'.format(compat_arch)) + if d.getVar('DISTRO_GCC'): d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', ' libgcc-{}-dev:{}'.format(distro_gcc, compat_arch)) d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', ' libstdc++-{}-dev:{}'.format(distro_gcc, compat_arch)) } -SBUILD_CHROOT_COMPAT_PREINSTALL:compat-arch = " \ - libc6-dev:${COMPAT_DISTRO_ARCH} \ - crossbuild-essential-${COMPAT_DISTRO_ARCH}" - SBUILD_CHROOT_PREINSTALL_COMMON = " \ ${SBUILD_CHROOT_COMPAT_PREINSTALL} \ libc6-dev:${DISTRO_ARCH} \ diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 9d1b80f7..0b68e87d 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -92,7 +92,9 @@ class CIBuilder(Test): with open(self.build_dir + '/conf/ci_build.conf', 'w') as f: if compat_arch: f.write('ISAR_ENABLE_COMPAT_ARCH:amd64 = "1"\n') + f.write('IMAGE_INSTALL:append:amd64 = " hello-isar-compat"\n') f.write('ISAR_ENABLE_COMPAT_ARCH:arm64 = "1"\n') + f.write('IMAGE_INSTALL:append:arm64 = " hello-isar-compat"\n') f.write('IMAGE_INSTALL += "kselftest"\n') if cross: f.write('ISAR_CROSS_COMPILE = "1"\n')