From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7197016923412889600 X-Received: by 2002:adf:ecc7:0:b0:2c3:ea68:9105 with SMTP id s7-20020adfecc7000000b002c3ea689105mr121402wro.24.1675688454641; Mon, 06 Feb 2023 05:00:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6f0a:0:b0:2bf:ccef:53a6 with SMTP id ay10-20020a5d6f0a000000b002bfccef53a6ls16431476wrb.0.-pod-prod-gmail; Mon, 06 Feb 2023 05:00:53 -0800 (PST) X-Google-Smtp-Source: AK7set9JblaM1KfoqFT04SAmu1S+QeuqgAe+Q/NCoF4gruxmyFw9nv5R4g5OGHF92eywdLndmM0O X-Received: by 2002:adf:f1cf:0:b0:2c3:eccf:a65d with SMTP id z15-20020adff1cf000000b002c3eccfa65dmr1876374wro.8.1675688453163; Mon, 06 Feb 2023 05:00:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675688453; cv=pass; d=google.com; s=arc-20160816; b=zItXDI851/BdPMkLiGfUzMwH8cvY5vNU+m4omEfCdpeN47YUPAwDn7GgOWJzYjwnT8 31dKEMZ/EW2J6Hzzwd9Vo8rCBJumJM81k2z24v6GkaPJRuSFjFFWApbZXFE+5AJmHs4S Qtg7MyOGjlPD8ql7SHAP2DrdGsgIdcN/BMtu0YUD2/nsr7TZ+1QZRIsbA6G48FjHAXmr cy6MWREaZ2MGPsqMD92VcES/hu2ku1K8m8vI1jS7s6EVkicn6VZsrBheiBEzRnZCqXZt wkMZ7t6rMx1t58O0HR59ailYDVdUgKKpD6o++ibYZAQG4YrDeT4RSIJ+dMBoJWsdcilv HqHQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:in-reply-to:from:references :to:content-language:subject:user-agent:date:message-id :dkim-signature; bh=6hp21iGOpAuCMdJzF96uAzUQYN+sENxUVP5sXyZpZrY=; b=iMVgrNQMsfWLDd5xWxjiBhLxcUSqSj1appxt0G7lh20ApnJ89NAHQ0P/RFOaSOqS8r rBotSTWXBlXRRePfjfirpc5dCH0Yar2uSe3kxqMEmFcoDofPgWcpv5O8pDDZQhMvL/Gy HR9aHy5GvuQsWBAnRCJt52XSnCF4q5Wq+5QYIQjhvuYn3WYFKP9yaBsmMetkxtndMi7p wazCuuf3XzeTx4fvi6jJ9aphLnYX+ugnyTqy50giBtK2xwRVtVY8CemHYo+9ParspUEd uXOs1cI50X0eu4KvOujMaQOtSGGGH9R207bBM0YLCnv/vLnbuqvkU9zcyjry0keTBPUX K5kQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=aCvfxheR; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe1a::623 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20623.outbound.protection.outlook.com. [2a01:111:f400:fe1a::623]) by gmr-mx.google.com with ESMTPS id ck1-20020a5d5e81000000b002c3e698d7a3si163216wrb.6.2023.02.06.05.00.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Feb 2023 05:00:53 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe1a::623 as permitted sender) client-ip=2a01:111:f400:fe1a::623; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=aCvfxheR; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe1a::623 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R0OB9tVBHOxgy8hIdVlacARa1Elcv/CLHRNa8RfEtw++qB1uveS7l2aWHc1UWCB25yMDJl7rmwGgwDlFuOF8N+vNIuaKTgdbrsPOsHvsnOlF5xoBKuYhI+V6GZGtrpCkBSQpN8CxE1bb+29nHVgxG5shikIGY/U9JE5ex0iXdL6862f3i8o/ZsNHsLKd4CRHqPgoTFuN6KZLePqiseih7p37vzy1DAVmOvfnSC/W9pkdvWNrWaE+TULgy+2M4IFtCJPmfoe08rUCES4DtXi3UA6/9rK9xPosuktEJA8t1/Yl2klt8V2+wMbrRtOikxd+FWcGPpw2Mx/QAzROXBO8xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6hp21iGOpAuCMdJzF96uAzUQYN+sENxUVP5sXyZpZrY=; b=V9nzNW0aloJOjYKnXOpdaRSp2gQyxymYVm5PJNsAX/TRuvNgnQ4wvJIBjlvRICwsDWMczskN31u/nuqq8h5lWLQwoeutc+eXpMfhYOACzjIa2btPBgSkhVLlI/aHM0d1b/nZ4bZPufqiu2oI5hV/2G9u9cyrJzKmU17L9t4zRAzRoITEMlnXLCvjIW8WTBGeDFidfaoZ+UAuew1Nll2x2I+/jBrISWGR/3ZRe3TGgkUiEHB0apd1a/PgCX5naap0P0pSxaAnNsFXYioX3BrI9yPcdzebmvFh/4pgmJLN7cXs7GPQKY0HX0iR5HyGCGlof9tbeKN6/9QCBm6fYH6obg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6hp21iGOpAuCMdJzF96uAzUQYN+sENxUVP5sXyZpZrY=; b=aCvfxheRgpG0lfB60hvaCv3tBCXYTlY2jaMs5UrybBHPsGyRX98To8Nb9qgMq9bEkdjW6aqyhyalhBFKctcDCWudLrfvT1tkKTZiXqln5x6HJRGXivIKMsuxKBkGA1IXzJ9+yW10ay5ORAvnivIbQo0U0gJCwoHtscVOrJDXxtMyjrQXtH63G+r6YiaLqJCnofMf1qtehmXYZoycdWZCN8IGNQqUl9rfdK8KWOg12QblRC9xlc+bG386xeroXUq1e1s4hkb19F64ZTGHlcnbRaamqTw8uF8bXHuJA7W9vg3DMwH7NmZaKE4zQIzxZmI9Eta2VhEzSam6wu2eUpWtnw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by PR3PR10MB3849.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:43::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Mon, 6 Feb 2023 13:00:51 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::784b:e95b:b855:dcc5]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::784b:e95b:b855:dcc5%8]) with mapi id 15.20.6064.032; Mon, 6 Feb 2023 13:00:51 +0000 Message-ID: Date: Mon, 6 Feb 2023 14:00:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: [PATCH 3/3] remove obsolete compat-arch override Content-Language: en-US To: Adriaan Schmidt , isar-users@googlegroups.com References: <20230206122050.337270-1-adriaan.schmidt@siemens.com> <20230206122050.337270-4-adriaan.schmidt@siemens.com> From: Jan Kiszka In-Reply-To: <20230206122050.337270-4-adriaan.schmidt@siemens.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0042.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::13) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|PR3PR10MB3849:EE_ X-MS-Office365-Filtering-Correlation-Id: a869daa1-4e18-4b8d-da1b-08db08422cdc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IzUri5ybPiIU/tfVW4m95y1rnPc1BcpQ4R+kwX9hItE/eVvS9E4uswYa9vVvEEIXVKsnH+Lckb4bsqQpD+sjN8zeU7JhmxM1vadx8QBEigqNQWAulOn+IK3Z+t0P8Z1uICbss2DMRkWaCLeGzkufmLUrJj09wWdq42zUSwkIwc9jZ6Riszxiuo/Srd7vZaH5z2wPxe/GNFuZDe80XqmybOGxzPseXN8hVDqNB/lbf0UANyJ51DhdkUYCiQkLngNTsBVqEg4gXkEJM188MjEqif3w4rPC1GNopBWeoWjJaRYKTshh3p2j9LvBuJi7CopLZoMn5IlRanEzVCmUnVSghy8v6z0EhoLEYKSVNiGvaPO/K5PqLs0tTZ61xWCH88Hc3X+ESWamDPSv3Jw+G0LXo7ZO7jpxJCvyM4TThwrO09Lsz75lmRh3YNHmS58qAEfp1+rmXpOKtnfyDxbW7jqNV2YR1uG26rPoLtE3AGQCWEKqCsHhTUIoUaxBUam0I89Hpz5I0IXgID0tsobXNBcb0NxH5rLtkAtQTw8xuu1/aMTtOf+/0EsIAqffMEsUZzVoRNcQR4F70iN4bSJ7MsAZ91a/3ircQ0xl7V2ag1/Y8pvTCvMg4Y5dzKbVTdrkNeJf6IjjjdwzckYMgaiDx5GMskFJUpMT/pUUKO5WDHB1sjjuvV1hzofWsYF6BBhDu8bh8MtYATtpbtSDEjLihKYT8QYVH0agmtvO518VUXMWoTw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230025)(4636009)(366004)(39860400002)(136003)(346002)(396003)(376002)(451199018)(478600001)(316002)(6506007)(53546011)(44832011)(2616005)(6512007)(186003)(26005)(6666004)(31686004)(31696002)(6486002)(36756003)(5660300002)(86362001)(38100700002)(82960400001)(83380400001)(66946007)(8676002)(2906002)(41300700001)(66556008)(66476007)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RVlvN3FCQ0swTTRaU2E2YjhnVnRLTFJvQm15SjBrUlFGbmJES3FoSDVnNUdo?= =?utf-8?B?bjhNbkFnTDIwbEplYXJBTndhNWZVbUpRemViUkJxUWtwTkhJVWZlSlZuT0Ry?= =?utf-8?B?VnJ0YzVHLzRmT1oraVk2NHM1eXFJcmdIMm5jc3BUaU5GTzhoNTFUTzltbWx2?= =?utf-8?B?UGNRUExxZTllV3RyMFBTTDZMTmNrTHptcmhmUjhIUWhNQlpXK1o4YmhhQ1k0?= =?utf-8?B?S1JFY0hVNEZUME1rVEtNREdNSGNHSnUxV00zUVljVDB3czRTK0Jsa1lvOU16?= =?utf-8?B?ckMwaDNabHlYQ0NvK0VFU3JuR0Y3N2V6TDQxZHdvOTR2akphUCtaUzZ6Mkpt?= =?utf-8?B?WDlOV3RuMzk1UDBxVWxiVGF1S1huSnJsTVplY2lVSkFMUVpIK0p4bGdSL1NO?= =?utf-8?B?c2taK2VhN0ZQcjZKcnByODZCRVBMd252cDdEZWlscEV5SGZWcEhPTThEM0du?= =?utf-8?B?SGtub2w2RDNHd0V2YUd3TmZOWjdmNzFMa05Jdzd0SmlNcUlOWVhGd2hDKzZT?= =?utf-8?B?amFsVXloUmxIRGlobDV0QzhrcGMzSkQyZ21zMytsTTFPcXRNMjJQSVo3RXFF?= =?utf-8?B?NytBYndYQTFhOVNvbmNFa0kwS3YrcWZmSU80SVpheEQvY0dhRW92L2hoWnhS?= =?utf-8?B?YTNjMWhZRVN5M1g3USt4ZitBdHg3dXR2VVZXR0J4dHd5L3krbTlJRzMwQlVZ?= =?utf-8?B?K1RmaU1ad1d4dTl4Vlc0YjdkUnRMZ1RpeVBiSFNPQUtzT09qbDN5OUtVYTVa?= =?utf-8?B?Y0FjMHNBcURRay9xUkt5akpxdEMrcWxmNXZRZ1VXTUJ6VXYyaGpvdjQ4Nm1P?= =?utf-8?B?Q0toaDlPN0w0ZGhTUGplUHBCRmRxZGQvQTBKd3QwT0FBTmVRcXpwTk8xRjhW?= =?utf-8?B?K2M3UU9VeGlIaXVRVWlOY3V1RTlhQnQvNkVwczdqM3JaU0VBZi80L01zRUN5?= =?utf-8?B?QUNRVExQNDJIYkR1dzFnZStjNlp4aDM0YmZ0U3lWUUJWM1paOUFVVlJJSE9N?= =?utf-8?B?OGt1ajVlcERQZHdkblg4MEc3MmFlSm43bElYR0R5REp4dnV5elU1YU9IY1lm?= =?utf-8?B?M01zMUxZUVJTd3cxSXFvd2Z0SVNtVjYvY1pVN0ZySHFjdFFSNysvVnQvbzVW?= =?utf-8?B?TTZibXVMSko3NUVTRjdJbmpISDlrUHRwZDhpQ2xZREpuTHJuNm9QZ2JyVi9W?= =?utf-8?B?RXNmdnJaK0RxNG1NTWdHNVNqVnR3aFJ5V0ExY3RxYmxTeXBoVTlaYmVjajFu?= =?utf-8?B?RHhQa3FGM0FhZTU5Q1U0Q1ZibVFDVjhpRlVVRmh0YThaVG5qMlFxR3VqcEUr?= =?utf-8?B?WXorKzVVSEJsaVpsaW02VFNXUkM4cW5ubkZ5dk9wWldvNWNZdTM5Rloxak5H?= =?utf-8?B?ZnNpOXRXN2czMy9vN2xDT0tGWFJPR2tJdjFDOEdPd0FIZ3pEUWxwZGJCRm1h?= =?utf-8?B?UDZQUTNPSlErTE5UMFpURWVhZ1ltaElzNmVaSGdnM3FxTTd0ek9CZngyUW54?= =?utf-8?B?UHM4MHBYS0Z1ck5iL1ZDQnQxVXBWRnFxYVlJYWczWUhnQzZMbC9lbFVjU25G?= =?utf-8?B?Y3FtS0taWnR6eTJBZHNzVmp2RmpNL3d1dHNZNmdZV2ozTldmQWVsRXBEZ2pk?= =?utf-8?B?aWxmVU9nVDlIU1RkTjNROGlNN0MvanJTWnRLSm96RFpXK2owS1huT29xNy9L?= =?utf-8?B?UVh0UjRlWXNTRm5MNmV3czBwNFV3aENjbTV4Umc1T2FsUE5GOTRxTWpNQkla?= =?utf-8?B?UGtwajhOSFpMN2tidjZYTGZkT1lsaWVMWGJXUHpHa1dHVWt5dEs0a3dWb1l1?= =?utf-8?B?bFRrUEFXMW96ZmNCZG9wZTVzY1d5TWRSZnFHRVk2bE1vRjNXcDgwWTJQUEc2?= =?utf-8?B?T0Y1OFVJenMxMFVaVGl3TTNvYUpnNDVIbGNRdCtlNHI5SFhtb0lDdU5EdHlx?= =?utf-8?B?Y0lFRVdkd043Yk1rQ29oQXA0aStFVkkwS3luMWRZdjdMdUpRSEttY1NvSVZ1?= =?utf-8?B?T2pFUU0xTjhJMjkyeHJuMHU2NnVsK0lWM1BrWWs5Qll6Y2lNT0xsZGozR0Vp?= =?utf-8?B?a0xOL25vVzBnN2hGZ1ZldWQxcVovcGdkaWY3VEZCVWk4RzR1V1BJMHE1YWcz?= =?utf-8?B?NjZEMDZjUG56MkpUNm0rNlQzQkNvSTBEYzNTendpK3JJcnJucEFuMkZVcUdE?= =?utf-8?B?Y3c9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: a869daa1-4e18-4b8d-da1b-08db08422cdc X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2023 13:00:51.7685 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BhhZZHBK68OC1+AZKIBLAl68V0dv4RaZhtWy1/vr20Jl0MQXxe02M0K9qaWxCQCBo5TyOLHeGTlLQ4BRZHYY2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR10MB3849 X-TUID: jvd6qDY3IpOK On 06.02.23 13:20, Adriaan Schmidt wrote: > The compat-arch override is no longer needed, as PACKAGE_ARCH is controlled > by DEPENDing on -compat. > > Also change the compat test: adding the compat package now happens via > IMAGE_INSTALL in the config. > > Signed-off-by: Adriaan Schmidt > --- > meta-isar/recipes-app/hello-isar/hello-isar.bb | 3 --- > meta-isar/recipes-app/libhello/libhello.bb | 3 --- > meta/conf/bitbake.conf | 3 +-- > .../recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 ++ > .../sbuild-chroot/sbuild-chroot.inc | 14 ++++++++------ > testsuite/cibuilder.py | 2 ++ > 6 files changed, 13 insertions(+), 14 deletions(-) > > diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb > index 39ddecb9..7d9f8322 100644 > --- a/meta-isar/recipes-app/hello-isar/hello-isar.bb > +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb > @@ -20,7 +20,4 @@ SRC_URI = " \ > file://yet-another-change.txt;apply=yes;striplevel=0" > SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d" > > -# NOTE: This is just to test 32-bit building on 64-bit archs. > -PACKAGE_ARCH:compat-arch = "${COMPAT_DISTRO_ARCH}" > - > inherit dpkg > diff --git a/meta-isar/recipes-app/libhello/libhello.bb b/meta-isar/recipes-app/libhello/libhello.bb > index 3770fdb4..8b10842f 100644 > --- a/meta-isar/recipes-app/libhello/libhello.bb > +++ b/meta-isar/recipes-app/libhello/libhello.bb > @@ -13,7 +13,4 @@ PV = "0.1-98f2e41" > SRC_URI = "git://github.com/ilbers/libhello.git;protocol=https;branch=master;destsuffix=${P}" > SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93" > > -# NOTE: This is just to test 32-bit building on 64-bit archs. > -PACKAGE_ARCH:compat-arch = "${COMPAT_DISTRO_ARCH}" > - > inherit dpkg > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index f38bb447..1f010f4b 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -67,9 +67,8 @@ KERNEL_FILE:mipsel ?= "vmlinux" > KERNEL_FILE:riscv64 ?= "vmlinux" > KERNEL_FILE:arm64 ?= "vmlinux" > > -OVERRIDES = "${PACKAGE_ARCH}:${COMPAT_OVERRIDE}:${MACHINE}:${DISTRO}:${BASE_DISTRO_CODENAME}:forcevariable" > +OVERRIDES = "${PACKAGE_ARCH}:${MACHINE}:${DISTRO}:${BASE_DISTRO_CODENAME}:forcevariable" > FILESOVERRIDES = "${PACKAGE_ARCH}:${MACHINE}" > -COMPAT_OVERRIDE = "${@'compat-arch' if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1' else ''}" > > # Setting default QEMU_ARCH variables for different DISTRO_ARCH: > QEMU_ARCH:amd64 = "x86_64" > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > index 99d75e21..21a2d92f 100644 > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > @@ -274,6 +274,8 @@ do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}" > do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config" > do_bootstrap[network] = "${TASK_USE_NETWORK_AND_SUDO}" > > +inherit compat > + > do_bootstrap() { > if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then > if [ -z "${COMPAT_DISTRO_ARCH}" ]; then > diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc > index fb061dac..fd8bb648 100644 > --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc > +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc > @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 > PV = "1.0" > > inherit rootfs > +inherit compat > > python() { > distro_gcc = d.getVar('DISTRO_GCC') > @@ -20,18 +21,19 @@ python() { > d.appendVar('SBUILD_CHROOT_PREINSTALL_COMMON', > ' libstdc++-{}-dev:{}'.format(distro_gcc, distro_arch)) > > - if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1': > - compat_arch = d.getVar('COMPAT_DISTRO_ARCH') > + if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1': > + compat_arch = d.getVar('COMPAT_DISTRO_ARCH') > + d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', > + ' libc6-dev:{}'.format(compat_arch)) > + d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', > + ' crossbuild-essential-{}'.format(compat_arch)) > + if d.getVar('DISTRO_GCC'): > d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', > ' libgcc-{}-dev:{}'.format(distro_gcc, compat_arch)) > d.appendVar('SBUILD_CHROOT_COMPAT_PREINSTALL', > ' libstdc++-{}-dev:{}'.format(distro_gcc, compat_arch)) > } > > -SBUILD_CHROOT_COMPAT_PREINSTALL:compat-arch = " \ > - libc6-dev:${COMPAT_DISTRO_ARCH} \ > - crossbuild-essential-${COMPAT_DISTRO_ARCH}" > - > SBUILD_CHROOT_PREINSTALL_COMMON = " \ > ${SBUILD_CHROOT_COMPAT_PREINSTALL} \ > libc6-dev:${DISTRO_ARCH} \ > diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py > index 9d1b80f7..0b68e87d 100755 > --- a/testsuite/cibuilder.py > +++ b/testsuite/cibuilder.py > @@ -92,7 +92,9 @@ class CIBuilder(Test): > with open(self.build_dir + '/conf/ci_build.conf', 'w') as f: > if compat_arch: > f.write('ISAR_ENABLE_COMPAT_ARCH:amd64 = "1"\n') > + f.write('IMAGE_INSTALL:append:amd64 = " hello-isar-compat"\n') > f.write('ISAR_ENABLE_COMPAT_ARCH:arm64 = "1"\n') > + f.write('IMAGE_INSTALL:append:arm64 = " hello-isar-compat"\n') > f.write('IMAGE_INSTALL += "kselftest"\n') > if cross: > f.write('ISAR_CROSS_COMPILE = "1"\n') This does not oull hello-isar-compat when doing a local build. We likely need something in meta-isar/conf/local.conf.sample now. Jan -- Siemens AG, Technology Competence Center Embedded Linux