From patchwork Fri Feb 24 14:24:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 2697 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 24 Feb 2023 15:24:42 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f64.google.com (mail-wm1-f64.google.com [209.85.128.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31OEOfuM025831 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Feb 2023 15:24:41 +0100 Received: by mail-wm1-f64.google.com with SMTP id u19-20020a05600c00d300b003eb24ce58cesf518535wmm.9; Fri, 24 Feb 2023 06:24:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1677248676; cv=pass; d=google.com; s=arc-20160816; b=Adz4SethgYe9Bz34isE+u0direts+HL1NmoB8psKOjEBgMJ13uWHQbrgr3YOF4UVud /1+6LAj3ghBaMk4KoqPuuUI2DDeRH78NiEEEosGKG8zvILi3xZxSf8rOjH0Xz6aCgalT CNF17FwL5Z0+bQzfA2xK8f/tsT220m1EEg46MU4bkeQRfKUCeSLusDvRbBgDSbKU+ZvR Fb19ZG6fOiIdjjTgsW3k/JXbblgppq7iKbiVSXQ93wgYgrwuqFYXhPdNCH4LPjVy9nTm 7kmhWl0jfoTBj1eLVIDMrOgvrcH29j4HouDdMP7GtT8aZXmoxqbuGZW813Xo/UcMTCyT p+Dw== 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=eTsH1XDm51i8OXDmkLOPK9HdGADRGhTtgQSUIWyRfBw=; b=Rtbq7yoDRTWnVElh2k90YHa1swUwabHnqu2bhRUd9ByYRTjOpUqPURZIleLD+YTc5c jG8eXFI5b1HwlXgQePObMOQTKUlCWx2JWrFyTHhcUN7DCR05m7/rgkNDyTfiF5d6synk Dbv5VUDT8ICsJAmys79sHSWCHogewaU9PPOqUbhSwmsKXa+snN4t9T6NASCTh8PTLnFY YCXFT2DxRfLbjV3Y+GDk+CVBgKZde9EmpniMwOUwUQc8LOynimG6iy+DEoiHRmo3PLzD dkkxBUkLWv1ZIJstAdf4i0NxzaJ3zZL5pBhHXUqbEZBStuGcHL05DyLT10b0jmVxmYPE 8duA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FrJvezAf; spf=pass (google.com: domain of fm-526363-20230224142434aef94e2f347799e025-5saw6d@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434aef94e2f347799e025-5SaW6D@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=eTsH1XDm51i8OXDmkLOPK9HdGADRGhTtgQSUIWyRfBw=; b=hIw2uDG+0cmmQBUjPGlGE1nXKwcndTmK5GVBMwGVCIsu0eTRKJ0myGESaCXVBP6/Af iCkbkGH3oLmGFfUaWYO8juR+WWu9knUIhkr6UZmKyHCPoD2GlyzKzYn3dwfGBa+04+LU PgxQoJM+SSY880WoL1cCfjf0UwuPaktruuenIJP+s9c/Aw/DihnsENr47l8QM9qvgvTt jZMqqOlaZIE30lAaw/s+hg4qTwlvmvh758Zh9Ol/aJI0ZKG0ErCK6/mjxZ50d3fxQAv0 5DfgIBd1fXpCT2NGXkRNhjHHA25e0hWTh2xWOXKXxIfaoSzXYeVm/GePeTQumM6X0crv aIXA== 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=eTsH1XDm51i8OXDmkLOPK9HdGADRGhTtgQSUIWyRfBw=; b=baL/+hSde+hV44tBaaS7jION+VtAFVgofi87XcLAvKkEddo+R1SxdfrRmu5MvE+b5Z 2qUI7h+3FINBfS9M2EnMzezveinrUHJiur6nhXmpXd7guivwQp8KCnZUDAEStg1QdEbi Cj1q8HSc1CEhhO1bg4YziLZi1wY9fuy9h3tFiaAh4vgnbJ1n++m54pi0mY2HCqO3jDiH iFRPEUX/jOojyY9e6Yh6LKhbsW8oHTI2TM4eUysJJ0t1ZApCxex5sCHdYXCxrDC4QPBQ dCOZRyCT2KjGmAeu4Xl2/U9sWY782RbiuHWQE0OXOQYDm1DTFucR59k8EMEOuAFHNP4G L6xQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKUbHAq80vuPrSuSfgnX1kfOsd3sEYGbV1YDUW8kcdyCOBzW/0rh AJfs1LLnnu4zbr3cQke9Shk= X-Google-Smtp-Source: AK7set87Bo0YV9r5FBXUbEXjieYlk23LyNhuwxc7jo4FJOuAlyIlmc0ZdE2V+abUVc/JIAsWqYmf9A== X-Received: by 2002:a05:600c:1e12:b0:3df:97ed:dde8 with SMTP id ay18-20020a05600c1e1200b003df97eddde8mr1365931wmb.5.1677248675926; Fri, 24 Feb 2023 06:24:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b04:b0:3cf:72dc:df8 with SMTP id m4-20020a05600c3b0400b003cf72dc0df8ls4141576wms.0.-pod-canary-gmail; Fri, 24 Feb 2023 06:24:34 -0800 (PST) X-Received: by 2002:a05:600c:998:b0:3dc:5b88:e6dd with SMTP id w24-20020a05600c099800b003dc5b88e6ddmr12692636wmp.10.1677248674607; Fri, 24 Feb 2023 06:24:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677248674; cv=none; d=google.com; s=arc-20160816; b=IQa6XwhrYGiC/i43hj0EykxF9JcOu+bx6vqE0qcOL18e0xUA3WpU0SEAfxcDKKQxkQ CQQ95txHU0HeniqbIoCrgk89V9vutXzntqOgyzzyYeOYpKF5u/WwvcrOyMMJhgUIcnV2 hMStEqbSjYC5nEXaleIXnt2DoZLsUg3MFeL8cvDmt+EsCEbfkVvxFVEmChTY3kK04I6e XawjDZc+WhtD92O6tCV4SWSMbaNFUeCbZSJEYc3C11hgEYGsFwfmtR5bDQTVa0AQhXvr zA077GIb/ZBpVv/k/9fN7XR1jhqb86HsNuSRVqHBRO4ov2N3M2VYI5Eh+CNXs+Sei1cA zDNg== 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=jOUJTrQuWUl5LKzKyd9ZYoRZYUy7S+QSorlAHR68PslowcZt67FJzpHV+QgmlCdGia QHuEqyD+wTfuECdqy9DyUKqAwNwgDLRv9AEeFhsAQffzOrphpSqfwDm3FfYFjuLuGGcx Kz/BQa3A/AZ6h4VVze/TfRySHwOcFe+9BFsWUjy3TlKFgKFWNupC1Lhpjeh4y7fZno69 AOJ02Mu/+C8x4jGvrVysC6G2Dhpbuwuyy2rxmyPqXK3GsffuYaYoSBgN6/48fo2un3NL ImsXJKo248DlaE7jCr/FuInoz3fJrqbjuICfK8Cu9QI4mCepJrs8tsQIICqSOh6LDMAp NQlw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FrJvezAf; spf=pass (google.com: domain of fm-526363-20230224142434aef94e2f347799e025-5saw6d@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434aef94e2f347799e025-5SaW6D@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 iw2-20020a05600c54c200b003e222d39e68si106201wmb.1.2023.02.24.06.24.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Feb 2023 06:24:34 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-20230224142434aef94e2f347799e025-5saw6d@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 20230224142434aef94e2f347799e025 for ; Fri, 24 Feb 2023 15:24:34 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v3 1/4] bitbake.conf: use PACKAGE_ARCH in overrides Date: Fri, 24 Feb 2023 15:24:29 +0100 Message-Id: <20230224142432.3767746-2-adriaan.schmidt@siemens.com> In-Reply-To: <20230224142432.3767746-1-adriaan.schmidt@siemens.com> References: <20230224142432.3767746-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=FrJvezAf; spf=pass (google.com: domain of fm-526363-20230224142434aef94e2f347799e025-5saw6d@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434aef94e2f347799e025-5SaW6D@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 Fri Feb 24 14:24:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 2700 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 24 Feb 2023 15:24:43 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f189.google.com (mail-lj1-f189.google.com [209.85.208.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31OEOg7e025835 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Feb 2023 15:24:42 +0100 Received: by mail-lj1-f189.google.com with SMTP id b30-20020a05651c0b1e00b002959c2fb94fsf2471905ljr.20; Fri, 24 Feb 2023 06:24:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1677248677; cv=pass; d=google.com; s=arc-20160816; b=umYgbtlArGVHzvZVG4ZHCvIviwhVt1mjuhXr53B92jiJb31bL/7ujjGU4nVaF2f//m BtwvF40DUEhBc7D8K4kbrxIWOB+3Dist/AJVWAfkRtmnWNa38zKP4H23phNzYwWsUB9s wH8XQWfHsZ083P4XxiejwIv0LrLQ6zHHvHymXG/XYDobDr3VmKSyAIuTBiIV8qk1ak0E Nn59kMfmlCoO6BHte8C2UgZmq/EN0KTG9LektMdf448hUE/jk4ETNpixsFLbzoGF+c5n TzdTy+PPVAvv6PHrBSuHybVI9idOhETT0e1Xx/qG5+49XcZ+6dffl8RvxypDG68pWFRr b68A== 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=PDy0oYBj9ZJoj8GOu4pmM7SzUqCXxcmimWjjno5MG5M=; b=EmTKFa6e+W1LA8uKaIGMnKIHIlORySxNWcPu30nUL8QmjGazWoWNia+6ujvzQRiRv5 ywjU7xs7lzV2rS3PQgTJgVNphG41A9V8CYo1B9bKrUhi3XQLU6QljlBlSF/XRQiQRh9/ Y7ORaSrhgT/5IAJK/fcQTcJGmLMrsADe0z+1RZehELXL+sqbOYZm9sXgBIRadqbkX08I mB4Yp6ABefnynAtzY0tAvHzuyTKFhOPpZWRMoOGG9vbRTGpQYqwUx54jVL/W76Squ7hV aRMNLIH0MPtECS3btaMQEOM2hT361fX+L1ceFnmHGvAHWNDs58E/jajsIOlXwESXTWNd WQdA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=LWnV9P7v; spf=pass (google.com: domain of fm-526363-20230224142434f49d0face41f4cc11d-wdmouh@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434f49d0face41f4cc11d-wdMoUH@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=PDy0oYBj9ZJoj8GOu4pmM7SzUqCXxcmimWjjno5MG5M=; b=F0iEBwOB+ZOXcnlAg8uVbuBLFo7yL2VetdcaeBcnIyBJIjDHtwDciX3N+KqQe6ilEh G67SFr2UlcY2dALAY1dDIixWm/Tnj9ZEy9wrwV9UXvvBMlodzAvpupIITeEN8eOz8/Yg xiD5tx0n/qb60deYIqCVpl7hmJrQbJKkCBQ0UjiFcerjltKpSUg2LP6qYYL9VUPMh6ck vqOMs8HWN2lWl2q5tTSq2NQrRLznlZj7Yv9joplvWGv6l81GSG2YYOV8cZRd2ZfictHw SDMgUAqJDBy1mvLSyoBwSvIneDficEYrZTNrDeolfTtQCpcF/FbYAyG08n9MyFcD3qWA Er/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=PDy0oYBj9ZJoj8GOu4pmM7SzUqCXxcmimWjjno5MG5M=; b=GlBQaAvGhSkG3U9dQbF3zBx5rsozV0ZGUWcBowR9SRFXjtFTCgTCSDxmPsaPN+z6e3 zPti2mW579DGdkc7kbSi5p6PMkxFXSwM0qvr14r+kbJpaLK1zxNYRMHgr1Vo86jNShi4 h34rWzSrJwhJRFWrnDGySoacStUh5yzV9b+AER0VURKghwgODO153pcUM5kZm7DSBnjs s7c3gYRM/OWoaKXK0f7V9DIf1DW6yUelCrz5QsbVh+ZbG+Tuh1AyCOD0FAVJDnWdfjh4 dabvhL3Hgxdeux7AQ9lDyfJeCXexlDvcUgDb2/R6E5OqFCA3F/eVlYi5J5nu9ucGwI+z FKlw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKVrMr85151TuSNclQSkCawub25P84I23bfEVG+x+KBcXifXPSfd OUhOQYOrIR5PxvO4XrRzFyE= X-Google-Smtp-Source: AK7set90l4rbI07O9PH+9wb04M0yTyC67isS8IDOB4dckP8c6+ldWJGSWlrNAkz4NeefxiLUobu1hA== X-Received: by 2002:ac2:4a6a:0:b0:4dc:807a:d14a with SMTP id q10-20020ac24a6a000000b004dc807ad14amr4926097lfp.9.1677248676775; Fri, 24 Feb 2023 06:24:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:211b:b0:295:a2a6:79c with SMTP id a27-20020a05651c211b00b00295a2a6079cls501122ljq.11.-pod-prod-gmail; Fri, 24 Feb 2023 06:24:35 -0800 (PST) X-Received: by 2002:a05:651c:b28:b0:295:a3a5:3b79 with SMTP id b40-20020a05651c0b2800b00295a3a53b79mr1352241ljr.13.1677248675272; Fri, 24 Feb 2023 06:24:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677248675; cv=none; d=google.com; s=arc-20160816; b=dTJgI4yEIfNEIOa1qrvHsCPdhB4qM+9yqqiCNXRT4R4mDId6Y1ueNXKvTKasg2yI8H NpXlSG0PFyILQ4OD8bOB3p08VIIomtCm32TddF85RBNvEGEygy4iqHK4aVQgchfBVxDL DQBw44WJOYOlRutduDCKi0Hz5en4inw1oD2Izg61iMHsFAq6NwmyTxrtZS4Ymagad9K6 GDFybTUr5f7EwPLgOEcMKmPWZB6Qk5C9COP3ovBXRaH55GrWS0pjpO5ROTRqLO+PLPhp T5PxGKonvOuAeU/R2HfxuzNO7GByh4mDJx+tWfY9C/HhQnZS4M04z3ChTXlevDj9Wolk Qsew== 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=5YzTe7YeTI4jO1O/L6pU9bm/IuPQDXsRgM6p+2Ct11o=; b=IIaTTa+h0k0ZaKn9d1WjeL001X/EdJOlqFcgv19cKy46DBTTelyDbD3lhFghTk7KUs gvWzCTQjIUJ+X1zxkWhqD1AQkX5wxOdI4rvJPLSsjYQPpUGrfYnNbOkIjLPqm0qGxrgT g6ZG0TsGR/T0u23pTYc8Yaj53kRPZTugVsrPJLZMZh2h9KVCkFFnECRwnrjx5DUQnwLi nugNe8RnFDSdpRTwxtiPcx1XpAT5Ofe9cC+jmN5rScsMUFPcCceBKrJa9kWkmtPpb57t 8UfuDbRsZVj+M141QcnclKT1Um0mSAfhMIv83FYWKW9sOhlJiPL2/xiAUQS8L0E4Dg+j F87w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=LWnV9P7v; spf=pass (google.com: domain of fm-526363-20230224142434f49d0face41f4cc11d-wdmouh@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434f49d0face41f4cc11d-wdMoUH@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 z12-20020a2e884c000000b0029599709f7bsi353260ljj.2.2023.02.24.06.24.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Feb 2023 06:24:35 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-20230224142434f49d0face41f4cc11d-wdmouh@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 20230224142434f49d0face41f4cc11d for ; Fri, 24 Feb 2023 15:24:34 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v3 2/4] add multiarch support Date: Fri, 24 Feb 2023 15:24:30 +0100 Message-Id: <20230224142432.3767746-3-adriaan.schmidt@siemens.com> In-Reply-To: <20230224142432.3767746-1-adriaan.schmidt@siemens.com> References: <20230224142432.3767746-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=LWnV9P7v; spf=pass (google.com: domain of fm-526363-20230224142434f49d0face41f4cc11d-wdmouh@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434f49d0face41f4cc11d-wdMoUH@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 | 40 +++++++++ meta/classes/debianize.bbclass | 2 +- meta/classes/dpkg-base.bbclass | 1 + meta/classes/image.bbclass | 4 +- meta/classes/multiarch.bbclass | 88 +++++++++++++++++++ meta/classes/native.bbclass | 10 +++ meta/classes/sdk.bbclass | 2 +- meta/conf/bitbake.conf | 1 + .../isar-bootstrap/isar-bootstrap.inc | 2 + .../sbuild-chroot/sbuild-chroot.inc | 14 +-- 11 files changed, 156 insertions(+), 10 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..1ca3e960 --- /dev/null +++ b/meta/classes/compat.bbclass @@ -0,0 +1,40 @@ +# 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 added 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) + + d.setVar('COMPAT_DISTRO_ARCH', compat_distro_arch) + d.setVar('ISAR_ENABLE_COMPAT_ARCH', isar_enable_compat_arch) +} + +def isar_can_build_compat(d): + return (d.getVar('COMPAT_DISTRO_ARCH', True) is not None and + d.getVar('ISAR_ENABLE_COMPAT_ARCH', True) == '1') + +################################################################################ +# package recipe modifications when building *-compat: +################################################################################ + +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..21a4f610 --- /dev/null +++ b/meta/classes/multiarch.bbclass @@ -0,0 +1,88 @@ +# This software is a part of ISAR. +# Copyright (C) 2021-2022 Siemens AG +# +# SPDX-License-Identifier: MIT + +BPN = "${PN}" + +inherit compat +python() { + # provide compat only when we can build it + if isar_can_build_compat(d): + d.appendVar('BBCLASSEXTEND', ' compat') + + # build native separately only when it differs from the target variant + if d.getVar('HOST_ARCH', True) == d.getVar('DISTRO_ARCH', True): + pn = d.getVar('PN', True) + if not pn.endswith('-native') and not pn.endswith('-compat'): + provides = (d.getVar('PROVIDES', True) or '').split() + for p in provides: + d.appendVar('PROVIDES', f' {p}-native') + d.appendVar('PROVIDES', f' {pn}-native') + else: + d.appendVar('BBCLASSEXTEND', ' native') +} + +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: + v = d.getVar(var, False) + 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: + 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') 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/native.bbclass b/meta/classes/native.bbclass new file mode 100644 index 00000000..d2581ac1 --- /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 building *-native: +################################################################################ + +PACKAGE_ARCH:class-native = "${HOST_ARCH}" diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass index 0a98ea04..bfd47d0e 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/sdk.bbclass @@ -58,7 +58,7 @@ python __anonymous() { # rootfs/image overrides for the SDK ROOTFS_ARCH:class-sdk = "${HOST_ARCH}" ROOTFS_DISTRO:class-sdk = "${HOST_DISTRO}" -ROOTFS_PACKAGES:class-sdk = "sdk-files ${TOOLCHAIN} ${SDK_PREINSTALL} ${SDK_INSTALL}" +ROOTFS_PACKAGES:class-sdk = "sdk-files ${TOOLCHAIN} ${SDK_PREINSTALL} ${@isar_multiarch_packages('SDK_INSTALL', d)}" ROOTFS_FEATURES:append:class-sdk = " clean-package-cache generate-manifest export-dpkg-status" ROOTFS_MANIFEST_DEPLOY_DIR:class-sdk = "${DEPLOY_DIR_SDKCHROOT}" ROOTFS_DPKGSTATUS_DEPLOY_DIR:class-sdk = "${DEPLOY_DIR_SDKCHROOT}" 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 = "" 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} \ From patchwork Fri Feb 24 14:24:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 2699 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 24 Feb 2023 15:24:42 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f62.google.com (mail-wm1-f62.google.com [209.85.128.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31OEOf0L025833 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Feb 2023 15:24:41 +0100 Received: by mail-wm1-f62.google.com with SMTP id e22-20020a05600c219600b003e000facbb1sf1275248wme.9; Fri, 24 Feb 2023 06:24:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1677248676; cv=pass; d=google.com; s=arc-20160816; b=LQIT/jTd0EcLYuIlfGJYEIWPTD9dgDYiP1J5qZG/E4aLVh3bR+1SlR9pq05pSlJdPR jGGZqoCro4Dhp0aw3qXwbetz7pBBQy67sspV8ByRElu8XTjdG4CZTfiW625nrRZQ+8K7 EqEam3SnCt0gBzUMvsQe+DZQMpEX15AVbMqkAASnbMo5c0RwZRlLlpcMSbn5MaBqRp7i Lmy/L2RKaI0wBY/G4exd/tpLVy0zkbutBjWvTprPaVZkKq820IIk+Ce9EYUYRMuS6Prh O8rPdycEWAd4N96dl36xoRgi2/mq+b0iqZ8xBBbGDlAZLVYwcBxRiDnZYT2zAzN2M/Zv 0M6A== 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=z12sUOAC0bjXrtD+/GYRLZhqKxj+GwN8JQhE070dUXw=; b=XsGRT50tVyfwMfNrWFkDaUTMoyapb4/RFoBBaFr+PxC3CLKVlZJnS1JkJgYBA+euQ/ 00dmdUjn6mcYnhW/kWF0yjZLP7ZM+LRUtK2I5COQLHX6UZZNXXLyPfbW92fjogL3SEV8 xweZr28/gG3GvCiPyKyMye7IN0pkqoBAJLZQrQwiXsXudC41E5buMUSWnwEoOkXDSKu9 LEj7+F/+D0lb0qVIQHyq07XbAWLapm1tGPmJroDaoOHPAS1cEDvtLI/4zagoP2mxJg9Z GAWFK3J2tsPshOHDNyeG+7G59qa0wxzYAjsCNmRMHG9Euhctk7HdHHn88rAM22cJQLeP tLiQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bxE5p6ON; spf=pass (google.com: domain of fm-526363-20230224142434bb5b3b397888bd2639-grydpz@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434bb5b3b397888bd2639-gRYDPZ@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=z12sUOAC0bjXrtD+/GYRLZhqKxj+GwN8JQhE070dUXw=; b=BH862j3jxdLtEIT1JAR66/oFMNwie4k53WfLhVq+HxKO6PpwIMst0uT1VUFCgB4zyg fEBmgu7Jq4yw/So18sEFmgzwKus5p4dWo1cuj8sSFqrynTa0uL2+hn/ZRAkc19JrpqyJ ATZ9/bAHChw/HCRAyUI6+75EpCUxz/PDLVFqHLyJwTQTQ9r9hxdu28Dpx9DmG8ZwZ1lb wfa422bA/INOLrzZzLggmsWsm/N1BRi3h2dhGWlChFSUGfsMNjS2+7MCYD5R/bDlc6cC RbAJ9u68w9rjAK82r9JLYIdSvnH6efaLXUrAqiI3YpoftZBk0h4+VkQ1Nxe9kAgpw+ES yLmA== 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=z12sUOAC0bjXrtD+/GYRLZhqKxj+GwN8JQhE070dUXw=; b=Ep5+lt4Wa0J4MVK0Ir8KbqHEae5dY0LB5d4RbTJ4u88kJ+rmYHIE4iwJQodDNUmbEa v0hrqZb1UHkeWhWf9Pg8J0rr8rb9Z3lc6I8yv6tvPK6WhuxnNZOwTZPKUAFusbG+NJt4 rHpbVA6SFUYaXXySgIrD4gsL+SGMzFtnA6whnJn0a4LqMzWTLSBnLYNKRmDx5vjk/aSg G4qngexcFZ79ltDTLdxCSfO6EPNmBLBENrTicuKSL+7NS0ol2Oeh8Eh1QyJmnvtH+lLn C2RCTk4a5ttR/AVEGzYsphvCsUyAHzoYOs0OzJlO1pNCkDcYo/Bls71KhcI4krK9ZLag VXnA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKXpQkFcuyy+BliO7ChSPJWORLv00IyaFk45w7KNq/TKHqsRKh6s iJ72UA09M/58TEYVWOwMvc4= X-Google-Smtp-Source: AK7set8TnGUj2lP6hEaU5CdJi1utVNc05t/tzr+VVfp4RkZqlv+RDpTF4OLoYoT0wBUgnZbn9aso+g== X-Received: by 2002:a05:600c:1c89:b0:3df:d8c9:caa7 with SMTP id k9-20020a05600c1c8900b003dfd8c9caa7mr1332972wms.4.1677248676111; Fri, 24 Feb 2023 06:24:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:696:b0:2c5:557d:88a3 with SMTP id bo22-20020a056000069600b002c5557d88a3ls755326wrb.3.-pod-prod-gmail; Fri, 24 Feb 2023 06:24:34 -0800 (PST) X-Received: by 2002:a5d:440c:0:b0:2c7:778:5da6 with SMTP id z12-20020a5d440c000000b002c707785da6mr10194865wrq.42.1677248674731; Fri, 24 Feb 2023 06:24:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677248674; cv=none; d=google.com; s=arc-20160816; b=y2pMWJTwqbWd1htvSSixpFHcxae4TUG6oXLp1rQnpnf9/ZWYl+Rle8Casj1KPy6U4m SbhYxwE0qujt0LKd2zaTQQ3cs3+Z4CjmxAOG8yHxqBoN3eMURpYwFGNR6bxCoOPDXxjI ipmvRNPFICRQXSUa3bqbvkMrnuSYGnZwuEFMS90usd1hmDl+hwTI8b+T7MovRrJatXl7 HO0qb8XNwAdm3c1ZOjJaAcEyKc1azVYFkhL4lUJ6LCbCSnY7Xj1/992FZIfewacv99Sf sUxFHfzcp12Z1NvPHn36mrRcwurKOqlgCfd//LKneAik18K7KHpa+BzPJjcYBeoF60u8 TIxA== 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=36Qn3lfVWtLGImPdyY9sq/eoqRcNZ/3FLq2TjYu8Y9A=; b=k8A68JGRj3t33030lKFP7qTI2wwVr1h9WmLlegDhqyEPq8f6IwrZ31+GGqUn67tIVm r++UhlKVoyEiq9THppDaZ59Bbf59yi71TeYW1Eikb2/08LDVgDYPi9x9twzp2KkVyw27 +ntHwfeqCldzWtVVUq/wzleMwNd1BzeLWQB4yvxOqjrYG9evGh6XYeVxpLHK6I/AMVuR PQtfRc4KVxVt5JcMmjmhjnXe43e7rE2p60g8F+LG85o+8ryibT5SpXHGdNZp2FpLZGco B2md971/Vq+C+jJMotMf6s5xy1Tce5YkW8htNrqHCy9pHGkoDmX2kY/o9/8gnGkhDpF2 PqQQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bxE5p6ON; spf=pass (google.com: domain of fm-526363-20230224142434bb5b3b397888bd2639-grydpz@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434bb5b3b397888bd2639-gRYDPZ@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 cc13-20020a5d5c0d000000b002c6eaaaac82si524674wrb.7.2023.02.24.06.24.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Feb 2023 06:24:34 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-20230224142434bb5b3b397888bd2639-grydpz@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 20230224142434bb5b3b397888bd2639 for ; Fri, 24 Feb 2023 15:24:34 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v3 3/4] remove obsolete compat-arch override Date: Fri, 24 Feb 2023 15:24:31 +0100 Message-Id: <20230224142432.3767746-4-adriaan.schmidt@siemens.com> In-Reply-To: <20230224142432.3767746-1-adriaan.schmidt@siemens.com> References: <20230224142432.3767746-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=bxE5p6ON; spf=pass (google.com: domain of fm-526363-20230224142434bb5b3b397888bd2639-grydpz@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434bb5b3b397888bd2639-gRYDPZ@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 +-- testsuite/cibuilder.py | 4 ++++ 4 files changed, 5 insertions(+), 8 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 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/testsuite/cibuilder.py b/testsuite/cibuilder.py index 72522f4d..89d01531 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -96,7 +96,11 @@ 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:remove:amd64 = "hello-isar"\n') + f.write('IMAGE_INSTALL:append:amd64 = " hello-isar-compat"\n') f.write('ISAR_ENABLE_COMPAT_ARCH:arm64 = "1"\n') + f.write('IMAGE_INSTALL:remove:arm64 = "hello-isar"\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 Fri Feb 24 14:24:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 2698 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 24 Feb 2023 15:24:42 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f60.google.com (mail-wm1-f60.google.com [209.85.128.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 31OEOfjK025830 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Feb 2023 15:24:41 +0100 Received: by mail-wm1-f60.google.com with SMTP id m28-20020a05600c3b1c00b003e7d4662b83sf1307061wms.0; Fri, 24 Feb 2023 06:24:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1677248676; cv=pass; d=google.com; s=arc-20160816; b=u6CPN/V0/urmNUfTKfKvxkKtIUuDSqggtT1vCcz02xrKGRG1P0/5FiY0akrIui3+wi CEPq49UPrT22oLeB7N5mxxzJkeetrXVDVkca/N/0PHCjMMj5RMfL3WqTREM/fTFuZZ8r 9E+1oQLgPhYAp3kaTVonvTV75vcYTLKDkLe/L9f3a3nzXVkOEgbJUHZbdkeVt7MpKJQM T6Ziei+OpwbQd06m9AU74aVOOxnVOepepW1/ksHgcpsBmf9IXG1lXj7BH7m0ioZJXk3t uMj9Dmtla74A6Z4EwfU1F0GGQJ8/GShubS5bT3ltZYgJGjMQitqPY0u43TKoexpJlzs6 WACQ== 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=/8qoR94E3iN8ESgpdVMW7NPBRWIM0iNALeaayMSfqz0=; b=skg2XKqcHuSFdTqzR73KDI5OvFCdFSeg272QxTr2OfSXABWmjwy0L65txiAsN8+9qM ZyxqshwZNkTBh+oXDrx/6R09rgqyyxg3aDK1oFpmRMBZJq2/XO//XKYi7BnOMbwvDFuu +Bva0oGtfkz7XjVOO1uk9LZuc/dgloqNkesPgMpGNluDM5mSvZBfGWPebBmQAEpLqm0Q bxdf2dylNVK2AE9tn8nRj6Kz9ePM5DMWLQeiI82aQC86aiOXipWjsQaUdZkSBlyDKPaN 8jEVKwg6PgS2ohXXrVKI7laOJ2rT4aSvSprGet4+k6JldZV+xN6mb+r4DmuBEnnS3kmN y6/g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="N1KROF/Q"; spf=pass (google.com: domain of fm-526363-20230224142434e6d691484eda22a315-sbnw4b@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434e6d691484eda22a315-SBNw4b@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=/8qoR94E3iN8ESgpdVMW7NPBRWIM0iNALeaayMSfqz0=; b=Egj6WIN21dEfUBnI6Cf/umLYIvjRYXIUrcKmPH2ELSB9f8QvOc+ZpAOSLP/S869cmG Tj+nw4Gv9R1ZWpDJUl4eUj0SzstNuQWgjXS8JXPRoIDEsThjudaN0Fu+BDyMHcX1cfSQ ETeSGmdI0N0nzUKHzuExKqXffRAhciSWXKDcqfqK2zl9oB/cHRsPZs1WynkvClIksCpk S7JuJi4NHyfYN4Xe72CPxiN6kDVUi1murH6igS/EHF6ocGGCgqOtDKJbqFtrvhRY+p+g 0laZvt0spMP8Ghe0anUMuZdtHa+my2sSS4aAvjDEiCt04rtw+FryFaaq4broZNjkilcp RrkQ== 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=/8qoR94E3iN8ESgpdVMW7NPBRWIM0iNALeaayMSfqz0=; b=0NP5PYwNAcjqzN/Q4IrTBvmUbqRLrcXQnF2cGwcS5MlWnVcSts2ualto2unXP2vx1r ZLUvI31KMRUFrdS7syjusw0PQGdgfbLms54xes6dnXqyP3R14cP5IaoLNEDyn63hqBRV BiVxsxnEOQOgEhwOWzLcL6ToojujwneEi0hGEgXHZWahdQX5JbDldh6Bbxfl0UvUXVay ox7VbO7c8mqi8HM/HzoiJ8GqgqlHY0NDF57Me3uH88DOo05F+ESA761BIh1bPsjVeAHH ER1DxKAnmwyjHWUGirX1/7CrHypQ3htM3LBI174W0240kSd9A8TmXnh1R2Rxg1Fag9bF /qiA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKWfiusnUPn6lKS0UE+8ao11kXkGIjc7iB3Rh+hkCAd4FRWhsCPJ BYMFOBVtJ6xxOxi7ibLxfRA= X-Google-Smtp-Source: AK7set9lwLiiO+Sj/oDIAp5KCUy+IaV7mh5/4YrtdNkx8uLdrgFLEOEkicYBfbCWNwxqIMwlGhYrRA== X-Received: by 2002:a05:600c:500a:b0:3df:97c0:1b5 with SMTP id n10-20020a05600c500a00b003df97c001b5mr1231723wmr.5.1677248676254; Fri, 24 Feb 2023 06:24:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1d09:b0:3e1:e754:51ac with SMTP id l9-20020a05600c1d0900b003e1e75451acls1473890wms.1.-pod-control-gmail; Fri, 24 Feb 2023 06:24:34 -0800 (PST) X-Received: by 2002:a05:600c:1e20:b0:3ea:f6c4:5f25 with SMTP id ay32-20020a05600c1e2000b003eaf6c45f25mr2518278wmb.36.1677248674913; Fri, 24 Feb 2023 06:24:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677248674; cv=none; d=google.com; s=arc-20160816; b=QH4e9drAdESlszQtkl3DTKc1y0B1U2aFTYMtCVj4NKkFiZM8FcciAvvvS/rs68fIty rYCQJA/Dhy+4FlMCjznfP+BMmCTjHN3HCpXjHDbpcwdaLis11dsi+YnOqWWR+6slC9Yb nbVbEBBN708PUtNFg5vyx8va8ug8Pn+J77qRdYsl9nh87rVJTOKEBz3FmgSmm/L/sskb S5DlEjydv5a+Fku4lkeYAOcURAKaMUGdG1LdpasgDkRz5IaIY+JVvytwJxVVATkC2RUP pYPIuDwSJiG5VukaYhIu7cKI0ZQAO9VmZlRypsRsr4lez7cBWtNka2c9xcfzGIcyaXWy NrzA== 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=U6ngCSFAPv+n0306B3XVcdsQZTkK3b5gpQG+isbqIobk4BJrmP7a8ufQytVgknO/0N 1KLW5leST30Cb/gEXuy0r12f9TZnr6teO07gelhfG12lCwtQpA6z4sN1PgTxe4E3eIBp fANXtTRKikHM5i/9AlfIwRxMAj6B8U6J4jgnzl1IpF4mXRCULAdD4/86mL5UbFkMaKNJ 3/dLrTXnf4cTPBmndYjbonIhPXb9CFxQ6rphbdHR5nxzB2rxAmppx393Dk8hY0lVViiY 79wIJarX13M8PKOP24IUxmqqeGpYrGkVJir/6g8v7uSVs7sNqfUHwZ+Kwo612ofeaKLF /ZiA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="N1KROF/Q"; spf=pass (google.com: domain of fm-526363-20230224142434e6d691484eda22a315-sbnw4b@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434e6d691484eda22a315-SBNw4b@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 cc13-20020a5d5c0d000000b002c6eaaaac82si524674wrb.7.2023.02.24.06.24.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Feb 2023 06:24:34 -0800 (PST) Received-SPF: pass (google.com: domain of fm-526363-20230224142434e6d691484eda22a315-sbnw4b@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 20230224142434e6d691484eda22a315 for ; Fri, 24 Feb 2023 15:24:34 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v3 4/4] doc: add compat/native targets to user manual Date: Fri, 24 Feb 2023 15:24:32 +0100 Message-Id: <20230224142432.3767746-5-adriaan.schmidt@siemens.com> In-Reply-To: <20230224142432.3767746-1-adriaan.schmidt@siemens.com> References: <20230224142432.3767746-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="N1KROF/Q"; spf=pass (google.com: domain of fm-526363-20230224142434e6d691484eda22a315-sbnw4b@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-20230224142434e6d691484eda22a315-SBNw4b@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