From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7346124504285839360 X-Received: by 2002:a17:902:e88e:b0:1dd:a44b:122 with SMTP id w14-20020a170902e88e00b001dda44b0122mr7186152plg.21.1710402896350; Thu, 14 Mar 2024 00:54:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:903:18a:b0:1dc:f919:63c7 with SMTP id z10-20020a170903018a00b001dcf91963c7ls607684plg.2.-pod-prod-00-us; Thu, 14 Mar 2024 00:54:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIdNiRDQKGCZK8kQhyOAZYSR2dCLpI3c1SlrlwJFS9SSsB99okLgxutizFpUgV3gvRDPcA X-Received: by 2002:a05:6a20:8f01:b0:1a3:1514:3e4 with SMTP id b1-20020a056a208f0100b001a3151403e4mr6630785pzk.20.1710402895073; Thu, 14 Mar 2024 00:54:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710402895; cv=pass; d=google.com; s=arc-20160816; b=kgUlzFf8FNbdNd7GZtZwzSpsC4ExYXap4fHFXnBciNC2opx7vH/jPBw8Od+rsQCnJ4 O5PbLwnshx6QINsx/jymzD8Kx3Bm1Wy2HZqp4OVU9Ueo7FLVA8oX9rcE8S7O8sAftnQp VtARTstu4UYlTm15Gxl6zaa3uyKENzUiSEuJE4bKLSFwU5HgoNBTXgFmxKV7473IqDyl FB1SHSI75c9fgp7yfvUc5zZxlUn86vDxoy4owaBZciFqoUicilwfCq0nZQ0lbnf0nLAT XSmRbt5jngLu1NAPtSfnEsL+FZhXg62w2FuZkqiMrKxiI6eDq9+d/kW3Xwu9fqc7uy4N cEPA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:cc:content-language:subject :to:from:user-agent:date:message-id:dkim-signature; bh=zwUD2MzpSCCdvToDeN6xBW/HKbdzyxc3LgXGmUWi9P4=; fh=ajXZJuFAM2e5f5dFSU45uOKg4z0Nf/GYkUJduKG4hKc=; b=FjSHt5xjewtY0JeQRSwOXbYrwTuIYDS0nHc7KgEJ8ypS32WDCpyTqR7FZvpRkP/tDm t4L33xPm6urrQDCUnTm4qgk46WV/PhW4FulZvn1RJs59Vlplpi+vaSAQiI3GyfaauC5n DJZJot0g9rrBsAUOEmGbJZkJBb8xQOOd6R2T5KmajSd1KMIg0wv9BVnUDcZHdTCcJQxG 0tHS9/tuJ66gDLdE0/MKAWnNeRTeSXKYBcGBbS/J83A2BdOfLuzPollaOkxMB8kTgncM 9cMthqYR+Wk09FtAXG/3Bv/fwnGajGZq9ZLw/4jhObYXpq4zE4VaiiA4WKi1GHNY69Nz WJvw==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=UNGflRVh; 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:fe1b::600 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on20600.outbound.protection.outlook.com. [2a01:111:f400:fe1b::600]) by gmr-mx.google.com with ESMTPS id bw8-20020a056a02048800b005e430f2514esi5745pgb.0.2024.03.14.00.54.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2024 00:54:54 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe1b::600 as permitted sender) client-ip=2a01:111:f400:fe1b::600; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=UNGflRVh; 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:fe1b::600 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cE3hCYqKuxc3kqg+iTOl4lGJvFFibIhW1M5qItNRf/cUTx3KaMqrPu+h2c011K0+n/ZhS8seDmzrCS9KoaipDSEPvM3kwpJypqQYJK/Hml4LPDJJL35MCJBfIK8v+y04T7IuuKZ/IUvgjlXrckUTrxDwANzWhgaEGOQImEvCCAV5AMqacZsT+L0S4g0qnvk/NhqsqBUCL3t5R8yct4wO9oCfl281MoBGnJbrbubH+ldipcFDaV5SP+ntBzceQcXT17xNr93o6Ja+XDwzfozs7VWIpn22UV76DE9cz545hYhyDioP18aSL1ZdT7LwFjOCluNp22ZZhiQw761gsGDuow== 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=zwUD2MzpSCCdvToDeN6xBW/HKbdzyxc3LgXGmUWi9P4=; b=Q25wQBY8DrhXiCxT9dYdho/eTeQeR/Rtf8h6GWh5tIPETZxbhnbR9eITd4Z2jkidqbd8KaPe3b1DGKWV0FDdZxvsJn9wJNihujy2mwEGi12xqAxaukubj1cJHhNrrYlSekqZioVUUhOdG9rI1I2pmMmyDUuEDwzblhJWUbwrARQNjSisZO6Ri+NAwwMFOozI1wUmcsNVnUpedU5EeUbShxDRLGgTht64ov2Yt1C5GxlshyNU1ny76SavugV0JQoM0A3gjqQThTIxMuOeXn9nAkGDzeRZJvwLNfbt6e8OYv8kcZKg/CC8PRIim4fcmPGzU+GP+DKB9v0CsRdceTGc3A== 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=zwUD2MzpSCCdvToDeN6xBW/HKbdzyxc3LgXGmUWi9P4=; b=UNGflRVhRPY2+hXTVD0opx8p51x7nWy+r7xgcsnGnff38Dj5w5Ve5wuqf+2ZELAcjrtqbFmQkza9a/AsRTginZ90iEVRNgyty7CNVsUGNi5GvTLWQdROj4KNJNuquj25Y4uXfsF5zcGvJ6Mvs530JRP6SxpyM9D7Uh5vgEPAjnSUv7Q9oSa5d7Gm54U2PIFGKAMnY0CRZDvre/+tVlwT4tDdUXKj1CF2wTwClQYNW/V8YKEjkkcfbTuUkTdNj+EF+Ph8LZPgl1VVY/gooQsUAHfaWHolR4x9m2DgS9Hm+7hq2zPhfoc3XCHzPDOGvY5ISVvmTQsfvqC6a4TX+y5idw== 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 DB9PR10MB5308.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:336::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 07:54:51 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::4e33:3630:e08:77b9]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::4e33:3630:e08:77b9%4]) with mapi id 15.20.7386.020; Thu, 14 Mar 2024 07:54:51 +0000 Message-ID: <363ef9b2-335b-44ed-b2e9-6df662bc0452@siemens.com> Date: Thu, 14 Mar 2024 08:54:49 +0100 User-Agent: Mozilla Thunderbird From: Jan Kiszka To: isar-users Subject: [PATCH] sdk: Fix build with custom DISTRO when host==target Content-Language: en-US Cc: Fabian Scheler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0017.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::22) 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_|DB9PR10MB5308:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c650018-b65f-4d4c-e523-08dc43fc0780 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CZYxYjTFPm8plDNUYeENVI6qmmWmBqy3YNjaMkADR4k6dKibuChjAKS3fTzp2I6ympg6HFuwkt+2Mga1quWCaWOhQ/FJXkxCiif7xmksyqdkMi8rRizD2POvJH1+Dv3c+U2EFsUQYbBoAJcKXVZKO6J3uRQ+G4TzTEraefaWfRfhCMD/CujqMK1zDylyTfd0tsJjg8eMHYgWAn//KutbnSrvEHCYPqn2Clfv4r/9bR8NiO+A3OB085mC2aZiIwmmhGQH2i3ZMtRkGidxCxh+Wrquf0SdjlNer/Xd0UcOOhP8gaIMtIRwkBMUrk9q5TTUpbjuKpEYNW9AuIqaBD7744Bnxi8vSLHVgL6BDgY8lIwpOMzQt/MI34d40n2s0zqdqLBPVdtTsh+F3baPm9tTVWMNuV2N9zRzuIqxOn2xhrMMUZMclJ3dYk/5t/nXjiiftvLBa6aYQMIZ1P6aNbv80G1PlrHnrpsZJBzOa+r5wqlzh0jLWHu2Dh736l7YUJ3XNcb7lyeiQVt4h0y5T9PInRCqvt+g/a1bVw9hkxfUIc32FeWZ4n8chQMMAEaZdUpkYLgA5F3qvx/aIXaawnXGbU7PhK+YsiVqIkX9evWEL7aYVlAQFvQiop9mjI7u5OuTrRX33JSz0N00sKVnMtlwFrTzrancUw6aNh8oK+uBJmk= 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:(13230031)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dEVpUVFMeDFZd2lRS3VZVEIrWUozU1Y2QUZQa1RXRUt0MVh6dW9WNDlvTVls?= =?utf-8?B?aTJJaXBFSFRFNWgrb0tpMWR3WllwTUhIdGFmeTY3WGVCNGxMR0V3T043cUZR?= =?utf-8?B?cFlEazZtNWtRVzBjVlRzNlFhb256UXZBVGN3QVNpRDZDcUNZRUpFcnZkMFQ1?= =?utf-8?B?emwrTDk0RjRxVVB6bCtJamhTK2h1cVdMY002U2QwUnowMDd0R25PYytONlBI?= =?utf-8?B?UEJJeC9VdGsvdm5HamxzaHNXMFBHeWNnNDh6c1NoUFBpV0s5V0FkSXFrbkJr?= =?utf-8?B?UGpUQmE0U0xLaVJta0ZBNndrOG5nTndWTlpmSDI2aWlHcklBRXhzU2FvQURi?= =?utf-8?B?OE5sRkhwSDZkQ0t3bEVwYVJ2dk9yU2VDY0hwZWR6Y2RQc01UMHM5QUZZeXBE?= =?utf-8?B?OUFkUFJxcmRGSkZWaFY3V04xWWVLdWlCY20yWmhITURuTVp3K3RmOVJSN2w0?= =?utf-8?B?TVJTNjI2cnNGQ2RDbzZqNTRqYnhTNHZJbGRLOTloQnBkZDhUanpaVVRTa2wz?= =?utf-8?B?K1N6akhNZit5MDN4cFdTK01CRXdRakxHZVRjeXpzekthS3J6Mk41dWUvN1NG?= =?utf-8?B?ZzNrbEo0c3lRRjZuZS9XcjJrVzJYNWl6dXVVOGEvd0JEQTlqRXU4T2Jyd2ZE?= =?utf-8?B?UDE2STBnK2RUUlREMWZhMEhyTEVaU1crNUJYZEY2bWpyMnllb0ZPVkJldzI1?= =?utf-8?B?QlM2YWpuZk55M1A5L3Rrb3M5T3E0ckJ2NGdXMUFGZHFyM2JFeEtzWkhrMDBj?= =?utf-8?B?NUU5Vm1ERVZBbk55a01ZNDYyWlI0Q0dueUhzeTd3MU5uYjFsdGxHdS9URWNU?= =?utf-8?B?djBkeTZsL0c3NFlHUjQ0dXVnY281cHllNWF0M2oxQ2tpSEJBL21iSWUveUtH?= =?utf-8?B?cWlWaFJFWXVmRzRUQlFRVnJiK1ZKUU8wNStMbDFFZWhZbmtDVCtHczZBd2xG?= =?utf-8?B?WkE2UWFSaEF2UW1rMkZNM0pWN0p2OTdOaVYrU05SZXhIRFhLUU50SkkyTE1C?= =?utf-8?B?dzJlQWpLSEwwQ2t6Y0tWaTJ3NG9hc3MwNXRqRElJRzFxQmdJdUVxN3ZjUkFQ?= =?utf-8?B?WldUOUtEYVZGcEdxQzArYWFLcmxZUWdld2d6cEZCTHVndW13aTlFZUI3QXlt?= =?utf-8?B?Ny9JaVA5RUJTalBIZkJqcXdRdFVvSXM5cXdmK1g1cGx3UFVHdEdna09EYm1Y?= =?utf-8?B?c2Zaa2dGVm5TZjRlbmEzRkdGeWVGODJzd0xMNWRUdVlpZW9FSjZWNGpQSW9l?= =?utf-8?B?NlFHVVpXeXJXNkZkZUJTUkpqVG8xYlNzdGhkK2llOE11NnRYN3Jvdzh6dE5S?= =?utf-8?B?bnRqZkF4Z01xMTRUNkhSREZpMmJIeDNqSXBsakNsTzlhOXhsWXRSNGRpTFpJ?= =?utf-8?B?Vk1nSGhxNTB3OFJqR3NKWDU2Tm95WC8vSG5rVjJGSW42VHNyY3padlBPS3Uv?= =?utf-8?B?TTZaOXFvdXVqNzF6dkNnTDR2dXNHd1V0cEhNTGZJYXBVMVBXd25zMjB5QXdy?= =?utf-8?B?ZXRoRG8yNzN1SGxkUW1sTS9Ec0xyc0ZvUWU0bXJUaG01eFhQeFFaWWxqUGtE?= =?utf-8?B?Wlp0SFRlQTFNdFR5bUVxb29DTlVBRTNFT291QmF3bTBROXR5Q1ZuU2d5eTdv?= =?utf-8?B?MGlhbjVUb2NzbVpZMkVWMDdLVDc5ZFljcjB2TlI4RzYzdW5HTG9lbUQrdTRM?= =?utf-8?B?aTNFWjZwS0h0YmxwM2JRdnZFcGRDWDJQdHd2SjRBQm11UXN5M3ZmZzlPVVVW?= =?utf-8?B?QTY0WE1XRHI5RG56TmVUSnJkZ0JsTGtuVVg3T1dYNjBJNkI0RnRxUUtacHVu?= =?utf-8?B?SytTZHhGMnBWQTBFdzE3YnZ2RDNRTTc1TFpKWTdmclZPdjRJcjFjS3JNKzRB?= =?utf-8?B?UnM0cEl3UThKS055aFlwL1V1blQyWVJNR2FieC9vMVptWSttU2xVeEVIbkRn?= =?utf-8?B?K2F3VHB0U1VuTk84TU9lejRCbkRFUEhQdlNJOGhUbmZQVnJ0bTdSK0ZaK3E1?= =?utf-8?B?SVlzSGdkQVA1UnZKaUxyU3RXZWpzUlR6L25ZSVRLTTdyUTE3S3Z6SlJ2aFda?= =?utf-8?B?L1V6S2FKNktkL2lDZDViWkx1NHNSUmRBMFNnclVvMWpwNERIOU9xZCs4T21Z?= =?utf-8?Q?U6MrOnRRyTG2Kor5MOkmPL+pd?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c650018-b65f-4d4c-e523-08dc43fc0780 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 07:54:51.7443 (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: ydmi6AcTdmNxxI1g/z+9GXtmSRDVBPGzU7hGmndfIN3iCrUP7jfdZ5SKMCxpAyBm8L2tR2icgzCEJtQRJ9lLwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB5308 X-TUID: GlO+o7OXm1b1 From: Jan Kiszka HOST_DISTRO is not always the right choice for building an SDK. If the host arch is identical to the target and DISTRO was customized, there is no HOST_DISTRO to get the bootstrap from. Account for that. This issue could have been reproduced e.g by xenomai-images when selecting an x86 target and requesting to build the SDK for it. Reported-by: Fabian Scheler Signed-off-by: Jan Kiszka --- meta/classes/sdk.bbclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass index 74c0acb9..71db6f3a 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/sdk.bbclass @@ -44,9 +44,17 @@ SDK_PREINSTALL += " \ devscripts \ equivs" +def get_rootfs_distro(d): + host_arch = d.getVar('HOST_ARCH') + distro_arch = d.getVar('DISTRO_ARCH') + if host_arch == distro_arch: + return d.getVar('DISTRO') + else: + return d.getVar('HOST_DISTRO') + # rootfs/image overrides for the SDK ROOTFS_ARCH:class-sdk = "${HOST_ARCH}" -ROOTFS_DISTRO:class-sdk = "${HOST_DISTRO}" +ROOTFS_DISTRO:class-sdk = "${@get_rootfs_distro(d)}" ROOTFS_PACKAGES:class-sdk = "sdk-files ${SDK_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}" -- 2.35.3