From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7280073785777061888 X-Received: by 2002:a50:ee0b:0:b0:534:2e79:6b02 with SMTP id g11-20020a50ee0b000000b005342e796b02mr6802767eds.39.1696151377627; Sun, 01 Oct 2023 02:09:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:a4d:b0:536:182d:6f32 with SMTP id bt13-20020a0564020a4d00b00536182d6f32ls343826edb.0.-pod-prod-07-eu; Sun, 01 Oct 2023 02:09:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFf9XHhLDKmr09yxjWBTyLbcOLtGPu5pgEY6nr7KBPss67AVob79ZV2VxXmrq4S7gjLPrmx X-Received: by 2002:a17:907:75f5:b0:9ad:c132:b93b with SMTP id jz21-20020a17090775f500b009adc132b93bmr7189946ejc.5.1696151375444; Sun, 01 Oct 2023 02:09:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1696151375; cv=pass; d=google.com; s=arc-20160816; b=GcIP1+6gaHsWaaAMyE/6PwOoOcBvMElSgtDQTF23V0sZxlWPGijdxqzPgzJxSb/DQf bi4MyCu4R8EmnJ9Gi4qFD0u7zAoC8opbWtvaFaEYI3SCfUaixDw69940AYjoF1cWIPbU EJnMW0FmX1hDIkdGfQlxxj1XL5kHJxtj7w7wAo9yHOkmPlX0BQDh17rFiiSN6X1807H1 aztRmzOvYBZ0ZdGIPI+gmC/Y1Z3MzVnI24gkKsKcqkj0cI6xsOBjMLJvsdJ6k0FuoqOo rr4KIuVSxi0aQu5M5sMbwly4pE9MY7jzNZ/wFTSjzwPieH9NvXV9huO5Qtxx4rURasZa zCHA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:cc:to:content-language :subject:from:user-agent:date:message-id:dkim-signature; bh=FuC3GM1ewsZOt73zEuoflrdVQ7GqFNB/adOamHusGRY=; fh=vRfWXAT/lOaFASPGqEjmlzU54EfqB1WHVLkmvTqA46k=; b=Ck+X5n7xxIakgmmh8WOAPR0suRcI6WPmyD5n2mwl7lZWdpctBO80IrF3fL2WBcgp6X tXNDlcZn2cMiusGOtch2masFlUZPFsbw6i2rgIG03AK8Wjjz6xWxIimDoblig9/Fd0Fo iclN10N+nSbLNZvIAlwdH8WAPbgcv4kdg8+/auhWvF2+p06scaoC4+34U5bf6n9VtWpY oim2W1Epb9r5JMffy330a0AsbBEiEGx0mURH5JZM7ADgRkxqwuTn70S6SMN2B3/ziWVe xEfReDfvKKX8dWcbU5imdGQuxYx8E5OgerLIFiQVwX3OMVr2ULAwsg/rsDqI06NbZ2KS h9Bw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=PnVKc1II; 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:fe0c::631 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 EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0631.outbound.protection.outlook.com. [2a01:111:f400:fe0c::631]) by gmr-mx.google.com with ESMTPS id t6-20020a0560001a4600b003233224954esi838202wry.6.2023.10.01.02.09.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2023 02:09:35 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0c::631 as permitted sender) client-ip=2a01:111:f400:fe0c::631; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=PnVKc1II; 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:fe0c::631 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=m/xNRfD2M2bqkYj5/tSxmswEABDE8+5HDczJeF5mBD1GKwsGjpoYELLpRMsDEDQYEkmoit/MlVhQeNeRxSOVh8xzlaVgx7XCDSkr5R58mep/lrIFKDrIgn0iRzNo0JWNcr9PzkVpQWXOHezfFZ+1PWvzHS6i/SppQxJhepnbtI4fpSfGFF4gt62mnZ3Jguv/IVdtmjPxlnyPaODDKZADHtbvcEWgyUJPZl+rt7GMsR+Amk0SNPpaOUxX1xceM4IYn9o3E60vlf19pB8XlNfVYWTeQ6Y+fT2XzQEBo8GDt494Flhvm/SOmENpN7tT+WP3YfJ+0MlUXVrB3rhQrgsXSA== 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=FuC3GM1ewsZOt73zEuoflrdVQ7GqFNB/adOamHusGRY=; b=oAEt0eWxlAXBu5AX6pxUvCzvE6caQUgSZ5vffgDMnT7igTd2Osv6l09wbCrsOelSGgomyN1moGEZ00ciKGYFxL5jFHWznOWXjOr90fJDLhSvogonb4oWVrZc0Tpr1KPjd5hiyPXtGGB9SrVZCXyDo9Cso6J1FP+5TReRcFSUSPa2yu+fQhw0nnJwQs8aOmwNLgPX9mAWBVA/AtHigDzaUEz5ouyhx+DHp2qMxyZuRTJr3AW1ZVSndma5qCwNfSDDxtFhtztitYGc5ae0LpRqqwgxHlLHYarp3y7h734Vg2VDkv18gZgFd2vo2vJovvdSEwyZUsKtdPpWc2UeScTaVw== 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=FuC3GM1ewsZOt73zEuoflrdVQ7GqFNB/adOamHusGRY=; b=PnVKc1IIsndaWuDh9Jh+jsVTZgsheuQ1Y9tE0Jlx6XkXQXdz+oKw8EL5ooOHkOkKrjb+WruU6CGu6dtApgPyk4HmC3oiQeq8SjVhUsIo8pU4OOy9k/EtkyYrAtR1BJ0RE3+FLR8KDsj6pWCkR8DRx9JrAVO/dbLgGgpRGt+pKixVh4OAp9UX30B2HoYuGb3rY6+nxJGCrzbWmFa2kTqmw81QdDAhLkxfNEnz3p2Qt2FF85i2XmanT7Wm8liiRSALoaI75MAF+51IkctSf3FqTuJyYwWMhD4DEMYFnWTfCwag+gUAQozbqPOg/hFy5xtw+7VxnTzXgs5n9Xsvt3/UFw== 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 AS4PR10MB5343.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4bb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.26; Sun, 1 Oct 2023 09:09:33 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::7f20:d403:b43d:12e2]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::7f20:d403:b43d:12e2%3]) with mapi id 15.20.6838.016; Sun, 1 Oct 2023 09:09:33 +0000 Message-ID: <7e817969-de10-43fa-911d-639aa91e9499@siemens.com> Date: Sun, 1 Oct 2023 11:09:06 +0200 User-Agent: Mozilla Thunderbird From: Jan Kiszka Subject: [PATCH v3] base: Fix HOST_ARCH for native builds Content-Language: en-US To: isar-users Cc: Uladzimir Bely , "Moessbauer, Felix (T CED SES-DE)" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0221.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ac::17) 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_|AS4PR10MB5343:EE_ X-MS-Office365-Filtering-Correlation-Id: 84e94961-8030-409c-b91b-08dbc25e207d X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /T2/rnRBAJ+9qtjzjNcLbIP7wE9Z5iEUSHpwAxwbgJVg7zODnA3FR/z3nofmwGO6NCQJIYMj72KK2EBCd9ZSqaliqQIKWfxSUimrziYkgVs1S6V8RkZxuoGpyK/j6dm+gl7UNnicWx56YDUjE8VJ0LoDRd+QEtJ3jW0iD0zMBJAC82D1KdKMq9EDCuhqaqN0zzHqmc806hloAkMSQFyDtNwf6XPalaq2+/4dxYlR7Vod4Mz0XcFzq9oZP3Luxt1/GY+e7WFCGyX9x993DbXP0MXZEN3gdlAcAtCvej8wGJD1Udmbm1+n3Aw9LRpzwbCdApimoToJ/Talky1R3pE+xVS3x7ZkLsilqGdcRHqMKuLhqj/JoleXy9sEZicDe9NF6TYP2wUPDYbzZXT3mHsabv1NkiPH3EidtXmyZ6qu4V44TcXNLvlRjlk371UuxG3qkhSg+YtsG9KX+HgonyWccUSyx8QKmxB/LTleYEtauqRq1iJXPJKFWTAzH+mUa80RPnFvh2rOeRHTzqQtV1Rdd+tY1VsbNewrjH2te1YAfbUpLqq8EUAAmj4LSj6ig7OJAJAwJDIF8VGbrQe5H4bicDCupvlSTZtfgalA3oLqS2/e0DvF11+2XSRs7dLvHNeTnsqeEhFia96BCZxVGB9kag== 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)(366004)(39860400002)(376002)(136003)(396003)(346002)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(44832011)(83380400001)(38100700002)(31696002)(82960400001)(36756003)(86362001)(2906002)(66556008)(66476007)(54906003)(66946007)(6916009)(316002)(966005)(6506007)(6486002)(6512007)(41300700001)(478600001)(2616005)(6666004)(31686004)(26005)(8936002)(4326008)(8676002)(5660300002)(107886003)(403724002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bUZTbDUrUUIva3FPM1dsWnl5WmZTdkxVTndhV2tETEZxdmRxVUVRZ1lKSGxE?= =?utf-8?B?YzVVNWVwVkwrWjM2L2pNL1pXUU96YlZwVzNEY0h0WXdJdnY4NVovc3RaYmFW?= =?utf-8?B?ZFBhWE5kTG02MFdZVjNNakZKYmtPRmxDMHcxdjB1dFFKcmtLQVlPZk1BWXE3?= =?utf-8?B?OUpwcTNDVTAzWlZWTWdrSzlaNWVxZ2N5S2Q3RjJQUktNYXVZcnExQ0FhZ0R2?= =?utf-8?B?U21JR3pDMzJPYkplcU1peGFvaXd2a21iWlRNTGd6RUxHbmh6UmhkUnRTQmR2?= =?utf-8?B?cGhCRm9YVjJydjNlb1VzbHRWRmRXU1JRNEk2RWZxMW1PMTlCdXBkUUErUmx5?= =?utf-8?B?OWV6WGREZkZhckhOYk5FbzREaE4zckVpOW00eE8yVFRpVXN2Q29tc0ovaFJZ?= =?utf-8?B?WnBxZ1ZUYWRUQ0dTbEQrM3JDV2Z2NlhFZnhYTVRKVkN5elB0b3lKcmxKd1Nq?= =?utf-8?B?TFNpVE55MVRnZHB4ZjIwd3NKZ2ZRbUtWQmMwVDBiK1E3WXZPNGFaVjJLVzBW?= =?utf-8?B?RjdIcmJ1cCtRLzgwZ1Fpc1dnNmFKS3hvcDFTcndvRVN2bE9JaU0zWGFWc3Jq?= =?utf-8?B?SDQrN3lEenVNV0RuMVhhN3BkeTJjdDErQkxrdHNCeTVaa3pDdlIrS0RGc05o?= =?utf-8?B?V1Y2VG00OGlXem41ellMTEhUdmdUa1d3TlBwbE84YVZ2bkdtOTEzb2VvU3ow?= =?utf-8?B?dGJVaWh5Y2YrSXdSSnM0MGM5UllESnpXWXVsdkt4Tlh0bVRReVl1Wko3SVJv?= =?utf-8?B?SmpHL2ljVlNGNmlUek9MWEJtVFo3UDc1OVQ0MnR1aWk5bnJONWVsK2FxL3Nr?= =?utf-8?B?T3ZlRThEam10enVtS3c1azE1N1NRakpRcUdaU0hjSFdnOHNKbDR5alpCaS9z?= =?utf-8?B?S1VBUWVWSURaaEIxeUV5OHhxWTF1eVNLYTNtVGN3ZDgwQUQxRW1RK1J5OEhI?= =?utf-8?B?RjJtWmhGbWRhY1JzQmt3TmdiajlwZGxXL2VXNWlNb2pNMHRFRnlxdm95YlZn?= =?utf-8?B?KzlXbXl1dENPZ3pERXhFdWp4YjM0ZnBzVVB2bW9aNUlrWVVOQzAySk1OaFJ5?= =?utf-8?B?VkN2UzA1bnh1eUJweUdjdXUwM3YzdysvMkpNSXJHVmRHRGpRT1FDMHlvUUp3?= =?utf-8?B?cXJTS1NLQ0hvZVI2OVhCY0F0NU1NQmlKV2hJd0gzM3ZsaWVhWkIwVUQvU0Rj?= =?utf-8?B?Tmtkcll4SWpkTkVCV0syYXVUQXN2Z2pOeFp6R0lycVp6Q0NqNkxJRkVWOGJZ?= =?utf-8?B?VEgxRVU5NDdYSEFBTUk2Z0dPNlZBbnJ0OXg0WUNDZ3k5dGpTRDFLaDJ2YzBn?= =?utf-8?B?S0tUSEIyNkt5elRGTzkzUFZ6S1RKeGZXbGxCc0RHN0NiMWQvc0F5NSsyZ0lB?= =?utf-8?B?Q0NOeU5pVXBZVXZpWm9zb2FFRDh5ZmRQTVEya0wrRGN2T2FPL25YYlVNWjRS?= =?utf-8?B?Vlc2TEh6QWtWa01QZG1wNVk5L2tjejZBYkQ0RlB3cVpJdjJVZG1RNU5BM3dU?= =?utf-8?B?NnBGTlhVd3pIRmxFNm5VQitjWTlKQnZ4NE9MSCs2WGlSRDM5RUgwRUE4RVhB?= =?utf-8?B?Zk9IdlhpdkNYMVkrcGZCc0tscWpvb1QzOStuZ2hCU3BEV0VGVUFEZThiZjQx?= =?utf-8?B?eDQwZHg5UHREaUZqNXIyZTZDTm9DSlV3QlpWRGh3T3o3aXljeUhpeVhDY2NE?= =?utf-8?B?Ulp6elozZUFxd3RBSXZDRHMxcmNGM2RkTWRoNlBBMkthTGxUN0g0WkJsU3Fw?= =?utf-8?B?bGRQSFFiUWw2TXR2aWJIRUQ0OC9PeVlwSE94R3REU2daZEZxUnZZTUFibGhp?= =?utf-8?B?aWYxaDczdFFHTjVCV3I2QkZ4c3NJc3R5Q0NHTlVSZSs5T0JLRXdMa01rNUg0?= =?utf-8?B?dWtBR0ZhTGU2MVN4MGhib3hYVldpS2RlZTNyMkpjM0RBOEdPTXNoWnloa3ZW?= =?utf-8?B?VHVKWE42SUhPcExDWkRrMlBTam9WZkFDRHJsdVhxUmtMMTJaZGZCdEszYmxC?= =?utf-8?B?NGNxOG5BTVQ2cE9Mejl6OGdKS0tsRXU1R0dTNnUyOFM0RUNxN09wZmxLMWRp?= =?utf-8?B?dkp2RU5sZ1FzQXJKWVhodjhwcG1oSkZGalV2aGdNL0l2dGtZMUF4emhsQ1Vi?= =?utf-8?B?eDZoR0R1L29DMlhxK3IwVTFVUThpUUVvbW5jVzdUb0xwaThTdzhZbmROZVVu?= =?utf-8?B?ZFE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84e94961-8030-409c-b91b-08dbc25e207d X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2023 09:09:33.2175 (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: JykLlWK8qp0y8hXRrdgC14exN01CNgrYXPfBqnq7rcSXFFVMhQCi9vnWpjhGys4EGQ/QqjxCCgFBypYhAfOQVQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5343 X-TUID: oUeX5ecAr4b7 From: Jan Kiszka HOST_ARCH must be DISTRO_ARCH when we are not cross-building. Otherwise, recipes that set PACKAGE_ARCH to it will fail in native builds. To avoid recursions, we have to rework the ISAR_CROSS_COMPILE setting in imagetypes.bbclass to an anonymous python function. Signed-off-by: Jan Kiszka --- This looks better now. Maybe we can even kill BUILD_HOST_ARCH, now that HOST_ARCH is fixed. meta/classes/base.bbclass | 6 ++++-- meta/classes/imagetypes.bbclass | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 88004120..f315a9d5 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -49,13 +49,15 @@ def oe_import(d): # We need the oe module name space early (before INHERITs get added) OE_IMPORTED := "${@oe_import(d)}" -def get_deb_host_arch(): +def get_deb_host_arch(d): import subprocess + if d.getVar("ISAR_CROSS_COMPILE") != "1": + return d.getVar("DISTRO_ARCH") host_arch = subprocess.check_output( ["dpkg", "--print-architecture"] ).decode('utf-8').strip() return host_arch -HOST_ARCH ??= "${@get_deb_host_arch()}" +HOST_ARCH ??= "${@get_deb_host_arch(d)}" HOST_DISTRO ??= "${DISTRO}" die() { diff --git a/meta/classes/imagetypes.bbclass b/meta/classes/imagetypes.bbclass index a3be0a1d..205377b1 100644 --- a/meta/classes/imagetypes.bbclass +++ b/meta/classes/imagetypes.bbclass @@ -65,8 +65,10 @@ UBIFS_IMG ?= "${PP_DEPLOY}/${IMAGE_FULLNAME}.ubifs" # glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960 # should not use QEMU on armhf target with mkfs.ubifs < v2.1.3 -THIS_ISAR_CROSS_COMPILE := "${ISAR_CROSS_COMPILE}" -ISAR_CROSS_COMPILE:armhf = "${@bb.utils.contains('IMAGE_BASETYPES', 'ubifs', '1', '${THIS_ISAR_CROSS_COMPILE}', d)}" +python() { + if d.getVar('DISTRO_ARCH') == 'armhf' and bb.utils.contains('IMAGE_BASETYPES', 'ubifs', True, False, d): + d.setVar('ISAR_CROSS_COMPILE', '1') +} IMAGE_CMD:ubifs() { ${SUDO_CHROOT} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ -- 2.35.3