From patchwork Mon Feb 20 09:05:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 2665 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 20 Feb 2023 10:05:27 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f61.google.com (mail-wr1-f61.google.com [209.85.221.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31K95QJT001952 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Feb 2023 10:05:26 +0100 Received: by mail-wr1-f61.google.com with SMTP id l11-20020adfa38b000000b002c3d80ab568sf224055wrb.18; Mon, 20 Feb 2023 01:05:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676883921; cv=pass; d=google.com; s=arc-20160816; b=m4JU1ugOaxeRpqzmfC5hIELjMqBPPu1M6s70Zs+IyJrc4wqO92gpRmcS88yeopF3Lj nbOo9f2/Hmj2fH9+VUGVUvRCuZgnPhJYSrYWONaCPAGYaBxEeRlMy8N8osdnoJCFUXOd mxiP3cLP/X9PO+Ps5j7NOWxERRwnTKehYZwwtS3Kq0FFl2ZaM8t30HDdR/sAYaH2tVPr QefA66YL1CZCdeBrfP6SoqZBffrU/8d5JmJMtbbjACmD3MO5l52/lPmTQvJHDn8+XZyx Jb7GMoTaEUHhDn+xhD/y0eFL1shNYO2cvBPJzjSR5XfosbXpNiTsloTeYiHpJTEA7VWl W3mw== 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=EhHi5yBqmTnin30eoVhfuCIuapn2xpjN5gKnehuD0tw=; b=Rz9qWOJn9q0fgK8BvlOV9gCClSrO38mWMzhI6Up0J9LoYdLi29DwgIBxYXBvJ78xjG fOkVlyY1sBIzvGOi/N2DKgwq2SLWEEkxqVm6lHwl9wYGP49ICnukxvS4gFZcp0M9TPzv z1FTIeJul/QAL57wcPNydAfDYMPQc3YqUI/Av3E0zSBBJwF9St/A/Ogywr9znDGzvPLL 1GVOETpMNkcXMJQ8WG/FMad+kNuyOH3610MUKUR5pVfCNz24Fnt1pBoMgO5h+oGnwiQE yAKtbk3PHGkEEcnV1UI/i3YWYcZ6/XtTsE/zfofbb7tjQefb51mOlN6l3iJDyR1LMi+V VxjQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=b5y6J43r; spf=pass (google.com: domain of fm-526363-202302200905188514fa823a84a5f18f-vriaf3@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-202302200905188514fa823a84a5f18f-VRiAf3@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=EhHi5yBqmTnin30eoVhfuCIuapn2xpjN5gKnehuD0tw=; b=md10MD/nBOy8hNdw/sLxTnEAmdxyvBM+icfDNI+xYohn1ZsjOvIi+fDd0V1W98SUsv yftFMKevSFKkRaYJR+3afFPo9xTFx4kYcYyhxIvbFnAqrZi+G/6Xk3ov9mi7NcjSByan yeujfvdFOqVOkc5jwL4B7qr5qrgbJEuNt1E0ZDQihCIudL6FtweOOTmHCP34gC7Ugl8n ky/SxBMpYD7Ag+NpiYP0X8hLwGMeCZrN0lm/oGOUYYHh7Z47cX06v/xd7PhLdXbsx1L0 QTG6QV3AG9SKcKRQu2+0dztkAFde2VboJB9A0x1pNZR+tCp0pVpvstEQv2THLIR627bU JNbg== 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=EhHi5yBqmTnin30eoVhfuCIuapn2xpjN5gKnehuD0tw=; b=BOVwKq/TLqo2DG/qptZX66Zu5Za3TpBlzSCMT2sQbrZPzkPD1V5ESpjD+/3WNhIS3T reFP+QxCHqEqu0Q0MYxXmKiM4DPNmJ2lyM22npolRf4E7GbfbI7LziCK1mIOzezSdoVS wlRXJwGp8RAUUILgX86yySx6x1q/UvZup2OD7yPQwbToia2/oPq6mSB2qqjJRN6T8dkp 3dH7AeWLuKSjKJz03eDw+8zHXWIsFuxr7NmkjbYAfthqr0m3ZLaH3uhgQFI/FxROs5Hq 5O/ofmZaIdzX/zz96CoIso14uOdcADR5VOS35tGt5yg1ea8evzAR4A4CeFVAZyq6E/+V J4lQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKXlT0M82QHBkmUEdnTJmtqXblLI1B2HL15CfpjCYbH7tYxy1NNx KtqbppAXbLgQKNHkivQj2HI= X-Google-Smtp-Source: AK7set9yBNbjxzG331zkBRa/cQZPna+6MvnjHBrjD0Etc7Sir7AE8JmTY8G7fy+/TNE7aDWoLg4iEQ== X-Received: by 2002:a05:600c:458b:b0:3dd:e1f9:2506 with SMTP id r11-20020a05600c458b00b003dde1f92506mr988134wmo.19.1676883921006; Mon, 20 Feb 2023 01:05:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:24b:b0:2c5:557d:88a3 with SMTP id m11-20020a056000024b00b002c5557d88a3ls192668wrz.3.-pod-prod-gmail; Mon, 20 Feb 2023 01:05:19 -0800 (PST) X-Received: by 2002:a05:6000:1b08:b0:2c6:e682:e55c with SMTP id f8-20020a0560001b0800b002c6e682e55cmr463021wrz.63.1676883919640; Mon, 20 Feb 2023 01:05:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676883919; cv=none; d=google.com; s=arc-20160816; b=eEWlsxfpewxWfD0ugzC5psDJZI/j40ScVLM5zFIvsEBsLYPiLifxn9EmdJNOz6pC2K 7FX4up7K6PejzETgukLL6OP1fxPo2Ryim5KWaueMsmjRqwOsrB7+sAfMax4/+YaVnYa0 UtVxK2OivovaxsuqScLVdl7oZRGOrhHTCw8UYD/aC1xG36cdzJ+t5Ussm2uOh0WO4Kdb QGWFd7EbS5E5UUY6TfZmZYPR9lku3ESkd+WefzzgFZchz84wNyeoOroK/gKG50PxGPfP 1wvbgne2RhEJWkLuMypWGf7BfK23QasPhAHjtbRj0N95XfWydYZ+XRXoXhZI+aLKQQ3f A/kA== 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=7yJVSAsyhvIiKabZDkdkki1ZZCPNPVU0GjkwcPW3WCk=; b=W0amQNnOC+7hUGbYtvqkOt5ebBaThXUjD8EMM2ksdHCJXnByQSc4nH31Rmg6Fe0drC KRPN+Usj4yFDk3nW93LBIkFDFV/clS5DgHKZgIA4W95CkTHmLUgb1lgh+qEdkL4PIBpA oP5yc2fmNfkIl5guF9xvEXl0phEljZG2zOkyQ7SSFnap8eqhLiiL/tF1QU9zbiRw9i09 J7ficf/pQCz7w+QuKTuv4O4LpbqUzjebH8q/tcMF9OCp5lkO2jzpeXXfhIE2ARRd/rDm nCDn39A0WLhDV1ERY7TgOrJWE6Kofy/G0TjXh2lENustizZs/V5GRQVCCJbZX2jEAn1z 42dQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=b5y6J43r; spf=pass (google.com: domain of fm-526363-202302200905188514fa823a84a5f18f-vriaf3@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-202302200905188514fa823a84a5f18f-VRiAf3@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 bu26-20020a056000079a00b002c56aba93edsi14071wrb.4.2023.02.20.01.05.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2023 01:05:19 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-202302200905188514fa823a84a5f18f-vriaf3@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 202302200905188514fa823a84a5f18f for ; Mon, 20 Feb 2023 10:05:19 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v2 1/4] bitbake.conf: use PACKAGE_ARCH in overrides Date: Mon, 20 Feb 2023 10:05:08 +0100 Message-Id: <20230220090511.2524881-2-adriaan.schmidt@siemens.com> In-Reply-To: <20230220090511.2524881-1-adriaan.schmidt@siemens.com> References: <20230220090511.2524881-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=b5y6J43r; spf=pass (google.com: domain of fm-526363-202302200905188514fa823a84a5f18f-vriaf3@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-202302200905188514fa823a84a5f18f-VRiAf3@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 c9f52a86..05ccb7b8 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 20 09:05:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 2664 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 20 Feb 2023 10:05:27 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f58.google.com (mail-wm1-f58.google.com [209.85.128.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31K95QtB001946 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Feb 2023 10:05:26 +0100 Received: by mail-wm1-f58.google.com with SMTP id j6-20020a05600c1c0600b003e1f2de4b2bsf330045wms.6; Mon, 20 Feb 2023 01:05:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676883921; cv=pass; d=google.com; s=arc-20160816; b=Mghk3fgRVUi+16+l2niB1t2I6RjMQn3DjC+7oEJPNZOwook1Ygdj+G80sroahK9PXy hpPmF/8gaGS4VR2zKsNt/mg1UFvS8e+LBNBxZnh04gzeBAbSs87ZdGULZr8D4QJKOb5D eFrwpvCBXqYFQKHWkMbBcSMmyBRqhIxZei+mN2rG60hpD74nxA1PDHAwnJC5atSj4E/c HvLqQS0i0JNePls+SUML7ZZm3axMAGi0l6kyAJbhSlcxjWDFx2MtiFyoK9pzGdQsscBR rAoQik3juH44+sjWWcUtw62YZBlRICUw/c8vTQmfvoTxMr7xWJ8O455AsuprazYoOIuU hOHA== 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=PJ/k9WV9W34+JJS74EAQkxXYc78xV/reOG1fs8QCx/Q=; b=HBH6jAZt3QHtHii5CxhTusFsnqqOyRYZuhMMjC1WHVTSxwtwcQUqs3z+0ZXfu0A3ee /0LHzVDYIgLQ6Beo4AkvzXjakFnqAhuSKrK6rLUTVJDApQmQlY8S574vLB5jPq8TpY0D 9Bvibw0Lhxrw/YHmYjp5PKQPTQDCbRCxR+mAXZUPGs85/VO0mWu9HopOsjUro1rgGFRm pJwufWNE8MKGT4q5zNBc7M1RK3owVJWvOo5N7oTIMoDqHhoIsfbEkOIdtWCP5OqbQOW/ 60afC/aXRo6vBYb7qTD5eDOS9IFRPPpr7cV7vNYrydQ48U9te+aNpzN+AofHHlUNvjhf +PnQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fANG+0ac; spf=pass (google.com: domain of fm-526363-202302200905194114eb3961370fa1fb-gdacql@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-526363-202302200905194114eb3961370fa1fb-GDacQL@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=PJ/k9WV9W34+JJS74EAQkxXYc78xV/reOG1fs8QCx/Q=; b=Odf7PLDy48vYZ0Ld5813118C+wyIdHqtK32Gw82ol7ixBMvAIDJQWE8tDHEzgjt4yB RjWN3slup2cTZC1jBXY4oL5QoIchVkVwZh11lMHWmTwb8Vut9vRvYftMIj/YF3SIA0eV 7t16z/VXkHTfibVyHv+XXjeSzuaZ7GDAp0uD1var6e6uRw4JD8oxrrk6x9Agna07oIpy 4Wr3TtDNEgmATQdPeDMK0yCbUlwYt1+E1hBsMhFshEr3wpxOhLG/YfnW7vDRp84dsGzS jibts0mIy6KwouXLrQHBz78WUb1WVcsQQbsUxh9ZoUUlRly0mx2ZRDlbQW4+EskuqbfN +Z8w== 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=PJ/k9WV9W34+JJS74EAQkxXYc78xV/reOG1fs8QCx/Q=; b=BkYKVdcR5KJP09XiWwjp/2TQlEb18zn8EnDRNVXj1QtQ5xn9JEVzkLMishgGM2YVFq dE/JrZrVTFJjdsORu6aLmAoOyxwLr6qGBRmVPdStr37lXFVImZ5vl3ORfXxU/9Npuv8Z N0BQIXWyAq2pF9Eo9KY2j1HIBDpPYa3CM9Qsr5TYzVU8waB++JenQ/sEev1s++AMimNQ E+rjF+8DHdLe3o6YRW6LStuiwAc/ir+Ac7UDR9qdlamtUESWi+yyFJ7Az1+mZ+iROA+M RdOeuTxl13/+7J1OnzITrWjohEaRpW7fTKS9fJDj4DW9PciR6pulR2SCITPd+rqhGQG6 Jglg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKUze9zwy31t/+IeCoDi75cC3ey0pJkh6cuAeDjbfvkMPcnZc1AF jElhceNXd7pqNnK4lyjpqPw= X-Google-Smtp-Source: AK7set+JMgbIkXYDaJDktlMUYfeDZX9/dcNxk7iZVOqInR44CFLozlTQ9qCZyvRNvA2NNJrCuHn1Cg== X-Received: by 2002:a05:6000:10e:b0:2c5:58a8:1a89 with SMTP id o14-20020a056000010e00b002c558a81a89mr134050wrx.431.1676883921007; Mon, 20 Feb 2023 01:05:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:319b:b0:3dc:5674:6707 with SMTP id s27-20020a05600c319b00b003dc56746707ls272478wmp.2.-pod-canary-gmail; Mon, 20 Feb 2023 01:05:19 -0800 (PST) X-Received: by 2002:a05:600c:43d5:b0:3e2:1d1e:78d0 with SMTP id f21-20020a05600c43d500b003e21d1e78d0mr9061389wmn.22.1676883919551; Mon, 20 Feb 2023 01:05:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676883919; cv=none; d=google.com; s=arc-20160816; b=AWEYLsm7clbNB7SiMiIntdMkwfY9c60JoMBaKxJ017I0TP0LVoO3T7SbykXrUEH3u7 mSuKoAF+yI7EvsOMv2U5OV/FFpFtfaQv3WuHeT2Bk+of6c0ZeadYdvPD/QzIn4KQeMT3 JtQGTkVhTykqE5tzjsCIoLwm9TBg5N62aM+IkwQczhNuVBExBpve2lqQ7JaUiGwmUKEG Y9jaPIoegBqRjAFTZpKvHp09o0LhvKM2B0RcnBwEYgfcNgwOXomft5apAekCxSA4IDn9 PJD3nUWueYsGvPW1IIvOsBgYfJhN/uiGBwJhTfZOx64VcARanXpx4oe8TNmU2EsTj25M +HEw== 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=31bRiUtkKXRvB8K7qbY7rGTzs1HXPvrc+swbiqjGD4s=; b=pWenF+/gVEWEz+ZnfglUuBr5dkI66Bq2WTM0J+QxtN62RqArb1iS6pt0qCoBCCCL0I J5aU/BPo1QjfU884RCAros7trn0IZmbGDI8YQuM8JQ75ausjyMNb4Wu0UVLGgpTFG5Za hnA5zEDJjsUZ0E0oQd8whWhiNoQX7ldje8JOovW8PSKBOgAlba2PxXt6TEdD/NTqVB5A aC4qIuLPYk99cA41oqs9Uwe51YauzcGAtBVa6xyznisk6i+z2BqVkdMHbptWLVzyoj2X ELXS30ySGGQUEol9Y0cTvq/rz8ywN701CTuXjOuHdGy0ZY1exWMeCbrxtZmbdbZG2Utr pUEw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fANG+0ac; spf=pass (google.com: domain of fm-526363-202302200905194114eb3961370fa1fb-gdacql@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-526363-202302200905194114eb3961370fa1fb-GDacQL@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id o5-20020a05600c510500b003e215309bfcsi5823wms.4.2023.02.20.01.05.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2023 01:05:19 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-202302200905194114eb3961370fa1fb-gdacql@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202302200905194114eb3961370fa1fb for ; Mon, 20 Feb 2023 10:05:19 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v2 2/4] add multiarch support Date: Mon, 20 Feb 2023 10:05:09 +0100 Message-Id: <20230220090511.2524881-3-adriaan.schmidt@siemens.com> In-Reply-To: <20230220090511.2524881-1-adriaan.schmidt@siemens.com> References: <20230220090511.2524881-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=fANG+0ac; spf=pass (google.com: domain of fm-526363-202302200905194114eb3961370fa1fb-gdacql@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-526363-202302200905194114eb3961370fa1fb-GDacQL@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 those targets can be used in IMAGE_INSTALL, where they are automatically converted to install the correct debian package: foo-compat -> foo:${COMPAT_DISTRO_ARCH} foo-native -> foo:${HOST_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 --- .../recipes-app/samefile/samefile_2.14.bb | 2 +- meta/classes/compat.bbclass | 46 ++++++++++++++ meta/classes/debianize.bbclass | 2 +- meta/classes/dpkg-base.bbclass | 1 + meta/classes/image.bbclass | 4 +- meta/classes/multiarch.bbclass | 60 +++++++++++++++++++ meta/classes/native.bbclass | 10 ++++ meta/conf/bitbake.conf | 1 + 8 files changed, 123 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..2221bbf7 --- /dev/null +++ b/meta/classes/compat.bbclass @@ -0,0 +1,46 @@ +# 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 +################################################################################ + +# calculate COMPAT_DISTRO_ARCH and ISAR_ENABLE_COMPAT_ARCH +# this must always use the DISTRO_ARCH override (not PACKAGE_ARCH), so needs +# to happen in a modified environment +python() { + distro_arch = d.getVar('DISTRO_ARCH', True) + package_arch = d.getVar('PACKAGE_ARCH', True) + overrides = d.getVar('OVERRIDES', True).split(':') + + localdata = bb.data.createCopy(d) + new_overrides = [distro_arch] + [o for o in overrides if not o == package_arch] + localdata.setVar('OVERRIDES', ':'.join(new_overrides)) + isar_enable_compat_arch = localdata.getVar('ISAR_ENABLE_COMPAT_ARCH', True) + compat_distro_arch = localdata.getVar('COMPAT_DISTRO_ARCH', True) + + 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) + d.setVar('ISAR_ENABLE_COMPAT_ARCH', isar_enable_compat_arch) +} + + +################################################################################ +# 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 ef7d5a2a..ce7c549c 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -79,9 +79,11 @@ image_do_mounts() { buildchroot_do_mounts } +inherit multiarch + 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_multiarch_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..09aaff52 --- /dev/null +++ b/meta/classes/multiarch.bbclass @@ -0,0 +1,60 @@ +# 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" + +# 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, True) or '').split() + packages = [] + compat_distro_arch = d.getVar('COMPAT_DISTRO_ARCH', True) + host_arch = d.getVar('HOST_ARCH', True) + for t in bb_targets: + if t.endswith('-compat'): + 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/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 05ccb7b8..dd21319a 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 20 09:05:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 2666 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 20 Feb 2023 10:05:27 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f64.google.com (mail-wr1-f64.google.com [209.85.221.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31K95QL7001953 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Feb 2023 10:05:26 +0100 Received: by mail-wr1-f64.google.com with SMTP id bu8-20020a056000078800b002c5699ff08asf225216wrb.9; Mon, 20 Feb 2023 01:05:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676883921; cv=pass; d=google.com; s=arc-20160816; b=yVIoxZIBrwvx4Wi2DYNjIGHX5IZfOZkDh8HL7LcvWBfF+f7SrSuGqNZ4+DtVoGB3PV rI61R1/qid7GVD6Sf7lN5sJM6w2lX5IH5eGh8IvVL4f0x1kLeh9BI3Xo1FPPqE8MK61M ZyhZShMD34JTosV6PN9X54U/m83vEO15Yjnf8/rchUbSLeLW4ikL+SzX6hNRGhBlonF7 SwDXNxhRdoQQF5gVeD49ZwXVoJw5hbLq6dEbX2KrYelUBjhDayZRA2la2YpDrP95ozDj v2DGQ3prx/C3eqYCmsmYLBv1mLG90tnph8p0Ob7a0j0cHVwgHW95DwqOApd/hgHs5Vrm OixQ== 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=EjhGV/CAoBzhOydkxZHgwxoW1BCXrJ+9zrpbWDXClyU=; b=T9whXE/ou4fBNm0jpLCNaO0zk6U2nWJQKY2AHUI3qu3SLz40ZSZHClz5HR8D48+6L2 xukhsjXfyQRsNLRjasxqSlR6z+yVZaLP7WoF/WukPTb8Li0OwJR8nE3/QSiQs+a1r0An K1xU2f8djqYgxEoOSipTJTCFRkbD6is2xOZ34k//wxwaAb6AQM18XTEfk8dumWcxStfM UMsCBQTGzNiR20QmACU4BaWEHRdh6UAMc0x3QUZn4bbCbPR2Z6zYl9iVcYgmefWuA6e4 7I4ocAFhYkXbO7m0kUKSRJAB+6w6k/mGcQSFDy13WeMO1Lc2609lSvTzkZTz2No7bZXF WoDA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=O5i6kVHV; spf=pass (google.com: domain of fm-526363-2023022009051950342896cd3236b62b-eamtnh@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-2023022009051950342896cd3236b62b-eAMTNh@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=EjhGV/CAoBzhOydkxZHgwxoW1BCXrJ+9zrpbWDXClyU=; b=UnkC6k5mDsFekRSg0dZIkO7+lLHLSuOe6i9/WrrO8svNswuWsTsRoV2tEUFT3GD5vp y7acg5jIv32EkWW5xAs6nLlX3YSqhZdKVdS6nhNNYovP+1A552S4xnhozFG6gQB70HsP IgMNmsMxXRVLl5Tko3sJYjmexspGV9NmCJogyaRnxuP0SrSC9d1Dbcb90pEJal128tF1 P4DI1QTSmc9ddwMFvc2Ndbk7Bgv07t2/uLeT4ogmlS5mqRAY1IKSFP8hjpfO6c1I6sKT qbLVoe4hhKZzYfi7JSJxHwSWHAHWpx9EwCXRjHX5wK0yLzw4pimYgEJRhh0hPLX84CQv lw7w== 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=EjhGV/CAoBzhOydkxZHgwxoW1BCXrJ+9zrpbWDXClyU=; b=urasZ+6K/MjeXH8/0FyaLXDrjJyox/50/dzINIx7x7oNQivqajREagIBjuA/isTEmg /nx/vrCU228x8r4tQtDd5OhChFBAfQp6a0XPVWtVK0Tnqsz4LTok6RoVwwifSQctOcxn /y7346MZBkC7mUndPCAY30Js+/gLJQyphgGok291s8k2TJvKiP7D/5nUGBK4YBV2bera Go4dzZD68gop1O7SvXpktWvMYJoEmRGIaogtMFaX5sJmzYJYVBj9x1vYZ3ieq8YYejIG SaYq0TC4k3VSeadYuj3WdVanpJPZgBfWI5waGWHUwXGsNxlqQEUftexAfnCfRtP0Y/xj ancQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKWCJaEnAp5fgSvog2GEdQdHBKGn1IuCIJLNMArf17hbkX6vZLiI g5vDyISCcgDesYNF310fWkU= X-Google-Smtp-Source: AK7set+z3HkxJXqDilvl5MANQ/L3CDeP2QpUsFudqsXD+7vjUUeE/t5rzodtppZymP0VF4udLvwSfg== X-Received: by 2002:a5d:4591:0:b0:2c5:5dcf:c0be with SMTP id p17-20020a5d4591000000b002c55dcfc0bemr96561wrq.503.1676883921281; Mon, 20 Feb 2023 01:05:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:1786:b0:2c5:55ca:3a3b with SMTP id e6-20020a056000178600b002c555ca3a3bls43489wrg.1.-pod-prod-gmail; Mon, 20 Feb 2023 01:05:19 -0800 (PST) X-Received: by 2002:adf:f3ce:0:b0:2c6:8dfd:d2bd with SMTP id g14-20020adff3ce000000b002c68dfdd2bdmr1478494wrp.15.1676883919824; Mon, 20 Feb 2023 01:05:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676883919; cv=none; d=google.com; s=arc-20160816; b=CpQJpv8UqIU7VXp1Nhl/RHNhTNhtpHKwov1f4epKP5cyMIF8si7l3Kixh2z6kfr1+5 J22nvf3EYVAAFlXB59LgAlP87UytRJW2ASLHjNKKT43epQOUlveqHd8KFKEpPAhq8yJg CnrYMuASPEkZNF3wF8FXMvf7fc89tKTmTtFmlO0lNqk6riF+t1R9ZSXVpET6Wuklhjfy +siGMDhwVnoetN+Omm9rGtn3S4iZ+TYzySFqrP8AWvZm3K3enoFdD+mDSdzCvIx6NiHc +8EZssh65JtbYG3u4nYfyN/QLdbKBSMSkOM3l+M8PrQLCV8hBFsbjV9y0Yt3Asty0YDt gjuw== 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=RrISQiMduWPr7jRzTH1o0MF0c3YYBd/vYe/WIxNsfcw=; b=Lf0wlEOPvFHhVC5pAaPci6cr9wwTXyKl95WlY60pQSHJC39/5eFrB0+rZBXMdKn622 mGh0fNfmFTwr2I0+RSGiqx4fYXup9Pi+W33FpeswnIWUjoeN4xsktrtcJgxDcpFz0afJ w3e4jvl0J95/e+tQK+HGzX1FyRLzcy1JVRqerf3/5BbAQPXca/aDOnamFvPu3vZ/UwuK MtacxR/INpBPbE8H5vsbKp85DVpQ06ZSje5D9z48784P70UA1DPMJQN8W6Jlqnfonu4j ejnLtp+t09o59KzXK1m6kJQlECkVPdZdsaMZp2oZCOI6vcUTZ6D++HUenGEdmgPv1Gbu Sq1w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=O5i6kVHV; spf=pass (google.com: domain of fm-526363-2023022009051950342896cd3236b62b-eamtnh@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-2023022009051950342896cd3236b62b-eAMTNh@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 bu26-20020a056000079a00b002c56aba93edsi14071wrb.4.2023.02.20.01.05.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2023 01:05:19 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-2023022009051950342896cd3236b62b-eamtnh@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 2023022009051950342896cd3236b62b for ; Mon, 20 Feb 2023 10:05:19 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v2 3/4] remove obsolete compat-arch override Date: Mon, 20 Feb 2023 10:05:10 +0100 Message-Id: <20230220090511.2524881-4-adriaan.schmidt@siemens.com> In-Reply-To: <20230220090511.2524881-1-adriaan.schmidt@siemens.com> References: <20230220090511.2524881-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=O5i6kVHV; spf=pass (google.com: domain of fm-526363-2023022009051950342896cd3236b62b-eamtnh@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-2023022009051950342896cd3236b62b-eAMTNh@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,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/classes/multiarch.bbclass | 11 +++++++++++ meta/conf/bitbake.conf | 3 +-- .../recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 ++ .../sbuild-chroot/sbuild-chroot.inc | 14 ++++++++------ testsuite/cibuilder.py | 2 ++ 7 files changed, 24 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/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass index 09aaff52..791f8e0d 100644 --- a/meta/classes/multiarch.bbclass +++ b/meta/classes/multiarch.bbclass @@ -7,6 +7,15 @@ BBCLASSEXTEND += "native compat" BPN = "${PN}" python multiarch_virtclass_handler() { + # In compat/native builds, ${PN} includes the -compat/-native suffix, + # so recipe-writers need to be careful when using it. Most of the time, + # they probably want to use ${BPN}, and in general, it's their responsibility + # to do so. If they don't, then it's ok for the build of the compat/native + # variant to fail. However, some variables are evaluated at parse time, + # and this will break the recipe even when compat/native is not requested. + # e.g., SRC_URI="file://${PN}" will try to checksum the local file at + # parse time, and parsing always happens for all build variants. So in those + # few variables, we automatically replace ${PN} with ${BPN}. def fixup_pn_in_vars(d): vars = 'SRC_URI FILESPATH'.split() for var in vars: @@ -14,6 +23,8 @@ python multiarch_virtclass_handler() { if v is not None: d.setVar(var, v.replace('${PN}', '${BPN}')) + # When building compat/native, the corresponding suffix needs to be + # propagated to all bitbake dependency definitions. def fixup_depends(suffix, d): vars = 'PROVIDES RPROVIDES DEPENDS RDEPENDS'.split() for var in vars: diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index dd21319a..0c79a5b6 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 72522f4d..f0ea2702 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -96,7 +96,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') From patchwork Mon Feb 20 09:05:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 2667 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 20 Feb 2023 10:05:27 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f56.google.com (mail-wr1-f56.google.com [209.85.221.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31K95QZX001958 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Feb 2023 10:05:27 +0100 Received: by mail-wr1-f56.google.com with SMTP id c2-20020a056000184200b002c54a27803csf235665wri.22; Mon, 20 Feb 2023 01:05:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1676883921; cv=pass; d=google.com; s=arc-20160816; b=LiymY4wdhrgvZ+Sd12vro2YfQeKVSjH4lGLhX7JWP4W1ujUOXf8AIdb77qiAnqSQMy 4SrgqeAUxyz1QCDFjH7M3uk/YVflVfSrxPqU84eWYoSIORMfPPSISYKC+MHxOSZ58Xoz IME6tFpzQ4wJ8q3qFhb9q2S8+dIRed5lDkwLLTV2EAITi2ukiEWpdtMhcuVt4ZREW5gf MBrcuuqJoSq/6x6qfdAI1754il/ED40qVhf31U9re+JOl5mkgACjge8sAU4vpbWW18YX JZqEzLh0PjoBF3OkIhu4WI4hqjUNWxFrynp3QHuUahNJ85oJPZ3otZxwjmcvBbCLiGnc gN9Q== 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=d2w0jStXUi29l2zpwrm3xxtYSzPShUlrPG02S/7uH9w=; b=Y7o79EDGksKDMNrfCzmGvXRjLNQYYoadNhiKlRedkEIWaxdAqDJVtoeZjokKa+TuQa rfm3qO48+3cMN0GeTQAqAqWfoxbTmDUOhilbnmkm/luRTeoaWQANRxIL5n+F758R1NA7 wqZSwT9qgJimoGGL3sogkcjQkcvtiTNfcSpTmwyou5YCQJrBiGE+9GUBOw0JllEXvASk z0xMGvFzbHSdfgbM+YWIyzRaq8eyw8TRseTRfsVPWjWOxWNeRJ1SEVt5LHGLIm4mFQ+t AjnrXWx+u3Fu4Brt6ohU7qqOP+RRw39mtV8/vfpcXNFo3MHTHQA1bZRPA/crKLMYXn5Y 6azA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Pix58nFf; spf=pass (google.com: domain of fm-526363-202302200905199b0142f4ff80a515f3-tsry7h@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-202302200905199b0142f4ff80a515f3-tsrY7h@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=d2w0jStXUi29l2zpwrm3xxtYSzPShUlrPG02S/7uH9w=; b=A4ChUe+mfrl2X3uz2DzlRuM6IcPRUe+q+0LitvamPABFgDto146EPxN04yQDA1ubbb psh6KyLUpRVDYfv6LZEpgrFsBTm2NFzYWtC6QgyJ2ADYjr1WD2xicOQdFp8FXXdT+shv 982uWjMYLc3vlHTO//2n/pOMDSweTHVA+e1zEZr3yGQG+dpvjQO31L2zUZuYJ46X4gSN TlRkKOFt3txvtB3ZCK9fBujopSeSeQcmBP7CYhxd7jdKvWVJczd4OXH+5cZqTMfDelOr ZxsZsvXtPIo2G/71mE0UC4DKPgDSVRmXiXakHr98Z3rXr0nUE2W9Phcj9VYzprXsuI3o hDgQ== 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=d2w0jStXUi29l2zpwrm3xxtYSzPShUlrPG02S/7uH9w=; b=s2fytjzdtonB//OKeO/K4eisLpusTlT5jpSoPFn1t3LUSD8XuvTFrDMkwvURanK02D q79ibuFHxxoJ9PyBHlMvkZCvzCmNyud9Nl5tIOfY29Ohi698ycH0LMG+CCWI7i3OmJD5 wb+ADi8eOpYkk28IzJz8lTg4UUlFajUK5wh8pcQr6VfcKOZrtHK7noycd7OXiK3/IJo6 kBKsI1FPgOhiKMeciR/ZH2U2ZfLtwcP5PuvNNWxYcmfh+74FglajMqJj1LSgfjjhofhT T3u+/s9c5Xs46bb6cC1hbp1spTPT4NIMv+LPqCxcwjNvkOJcgzKptlq7T9MPpvfGTyS0 K1mw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKVKPVJ0oXxH9qVRxasYcBfRhUIek2PoAoOB+JZs9tAqC4rbDuBD Dtevsc9cPzALnESq3axFh+w= X-Google-Smtp-Source: AK7set90/9oH85wkTrt7xV76vM80NCBtrdJIUqBouIF8xLyLJRtVV3Kpijcji2HIBkve2AWEdVGT8w== X-Received: by 2002:a05:600c:1da8:b0:3e2:559:69ea with SMTP id p40-20020a05600c1da800b003e2055969eamr476386wms.134.1676883921552; Mon, 20 Feb 2023 01:05:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:aa9b:0:b0:2c5:5262:2e24 with SMTP id h27-20020adfaa9b000000b002c552622e24ls3063893wrc.2.-pod-prod-gmail; Mon, 20 Feb 2023 01:05:20 -0800 (PST) X-Received: by 2002:a5d:5607:0:b0:2c3:dc42:525d with SMTP id l7-20020a5d5607000000b002c3dc42525dmr1815862wrv.36.1676883919969; Mon, 20 Feb 2023 01:05:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676883919; cv=none; d=google.com; s=arc-20160816; b=x8Os6HdCZwp/q5+vGwlBhPjNpgQ5K76hz4njWHiGfMzVtshLdkhtFrHAiD8R0lfSX2 5wIGQlm+U7STNky3PgnueU+5H53uck6UCpZluX7CWgQxJWuEgfzlVkaGp4DyEfeSutEU 3s5ZOTEv7G3xcaZZiLxj+XSjxv5IcqBqfXGzTkDkOsKNBLrgSVxQm6E488rFFLzn3Z7e PbvTcu0eO7DgDupr7Ol9ej9xR8cUO19gzyycLKoLO8gN5ugiPXHRoyHDTT70dPE3F9zz kq+FaEM+cWQyf5RvA8+pCiZSQwGG1DzlkmiezYkkrf8ZKBPwSjmm3eU8gAnT1VhyfIMo CXGg== 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=YwI19RncXg9xWkO8V+F5VWDLl4yTQYRFJawKvbdt+HU=; b=oYYdbnDet7cEDTbcHJFHOtTyhbofQRbebPlVgrtl9e7KgT9U3GCrufqRUQ0Kt/0Q2N CYpgfWAP3WDghIFiijqcRmwGmKnCQz+jm2l06PzBgp5M7/1jh6zsfTdC4MkKADPbeBT3 7+tmmt/G9OP2k5CMbvlg7IpiG9e8KPWWObxo3lJG1ckVyE9ER5BnN3atyAmQK5NRZR0u 7EmSUJMmFu8ZDViE2fLSbegZKc5vutABoc/TMbNfdECBf7OLSqfGS4W1tcZDGiIj/DuW LpXyC0TmsBTR+C8451B0qAJvJbr7UsIT8ypREK+Ky3UI6P9IvkEAT9bsugiMH2Scnmi9 RkZw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Pix58nFf; spf=pass (google.com: domain of fm-526363-202302200905199b0142f4ff80a515f3-tsry7h@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-202302200905199b0142f4ff80a515f3-tsrY7h@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 bu26-20020a056000079a00b002c56aba93edsi14071wrb.4.2023.02.20.01.05.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2023 01:05:19 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-202302200905199b0142f4ff80a515f3-tsry7h@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 202302200905199b0142f4ff80a515f3 for ; Mon, 20 Feb 2023 10:05:19 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v2 4/4] doc: add compat/native targets to user manual Date: Mon, 20 Feb 2023 10:05:11 +0100 Message-Id: <20230220090511.2524881-5-adriaan.schmidt@siemens.com> In-Reply-To: <20230220090511.2524881-1-adriaan.schmidt@siemens.com> References: <20230220090511.2524881-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=Pix58nFf; spf=pass (google.com: domain of fm-526363-202302200905199b0142f4ff80a515f3-tsry7h@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-202302200905199b0142f4ff80a515f3-tsrY7h@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?= Signed-off-by: Adriaan Schmidt --- doc/user_manual.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index b9a0bb64..3db5eb26 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -963,18 +963,24 @@ Debian cross-compilation works out of the box. Currently the following build con Experimental support for riscv64 is available as well. -### Cross-building for a compat architecture +### Building for a compat and/or native architecture Some architectures, under Isar amd64 and arm64 so far, support running 32-bit legacy applications on 64-bit kernels. Debian supports this via the multiarch concept. Isar can build 32-bit packages as part of a 64-bit image build and also enable -the image with the necessary packages. To activate the compat mode of a build, -set `ISAR_ENABLE_COMPAT_ARCH = "1"` in `local.conf`. Packages that shall be -built for the compat arch need to be tagged individually by setting -`PACKAGE_ARCH = "${COMPAT_DISTRO_ARCH}"` in the package recipe. Non-tagged -packages will continue to be built for the primary target architecture. +the image with the necessary packages. To activate compat support, +set `ISAR_ENABLE_COMPAT_ARCH = "1"` in `local.conf`. This will install neccessary +build dependencies in the buildchroot. + +For all dpkg package recipes, Isar automatically provides a `-compat` +target that builds the package for the `COMPAT_DISTRO_ARCH`. This can be +referenced using the `DEPENDS` and `IMAGE_INSTALL` variables. + +To explicitly build a package for the build host architecture (in cross build +scenarios, or when generating an SDK), Isar automatically provides a +`-native` target for all dpkg package recipes. ### Cross Support for Imagers @@ -987,7 +993,6 @@ In case your setup does not support cross-imaging, you can disable this just for the particular image by adding `ISAR_CROSS_COMPILE = "0"` to your image recipe. - ## Examining and debugging package generation inside their buildchroot Just like OpenEmbedded, Isar supports a devshell target for all dpkg package