From patchwork Mon Mar 21 07:59:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12786956 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2961C433EF for ; Mon, 21 Mar 2022 07:59:36 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (EUR03-VE1-obe.outbound.protection.outlook.com [40.107.5.58]) by mx.groups.io with SMTP id smtpd.web09.28038.1647849575067297233 for ; Mon, 21 Mar 2022 00:59:35 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=Nb7k2YuP; spf=pass (domain: siemens.com, ip: 40.107.5.58, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jfTzqCYH1KUEDFnCcy+5UT/0RT5Vc4x7DNThEBTWnkvK5kBHKWTxVlvSKC9Z9I0a0Xs1HgSTTOd/5gkxjXnit5r3+wyE3H+IO5cleLca7XRg3IKRxzKb+R7mnALetFZmhkWrGdsD2gvOvtBeTIdS9Y7Tq+i3MLGbNAvSOFYFyxKhWC1LHPiwyHOPcF947+kemDdM1PQQtNbirMTCN8FTTtEpb7F35kZwBo+wgRnUwEWqgCkirCXs/jgg176bIIWA6eAkLYcA2598cAhF+L0Zbfo/kNtEHxfSPbIp1VgeUdw2oP7povU29x7coG1UDTpxrcd3LFtOE1Lw3Syu8rfOkQ== 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=mrxTBDpP1gKCKZ8mag7hEp9qvnS1DYaoFozbk1a8UNg=; b=gLwzJ694wrnkQt30j4LinmjJTgblE0Thx9cBGVI4tLSSX63UtWSz2t/XkHDxxD0QMD4uMOsqUpm6ikyLBu3E6IxZQWBG2ZMKx5gDtg7BgydsJk0PxOQWdSI3qG8EDhGzyBtdFCpaBNeaw9oD8soOrnqcSBxZSG2xcqKuSvGuXwVeLVGMNcqURXqCbgbAlmI4ROZn3MqWL9NdNilRTfLq6DJeA089CpwnrIlVyYb2BP8bqpqjH5P1RyNmEL0ikets9dReEV6+fmJAHe6ydhAR94n+2HCyd/0U73hHUK+67HyE3uMDd959h8+4XHNB3MaweiGrj2WmCjnderWNOeqChg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); 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=mrxTBDpP1gKCKZ8mag7hEp9qvnS1DYaoFozbk1a8UNg=; b=Nb7k2YuPFwI9b0JihNe6nGw1HJSpXwV+KP8akFVodxN1Z9boarpB8JasoiC8WhCHqKFtMGM9dPLafjvpdmckYlvP+32VmAwaJSztOSDJycUINP5jFQY0VGS+rbdECeOnOyF43Ft7KsViCoyUU0z9VZA8iAnoIsWyeU0Ah7dwybmY/92vj9jBEV/RG9uPicPiGDJVxXiT8bE9//hhjiamNloD2mPTegAfnoP9o6VdFegeILbKjU7pLYmqc66IsBTKkTfLo09OS+VkzKF7dnxOMaSrlkh+b8qhP80wyMfmJKvyciznbtMHFHYjQTLrk92bXXENIhfCmvEYuyHI1qyf8A== Received: from SV0P279CA0039.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::8) by AM8PR10MB4130.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1ea::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.15; Mon, 21 Mar 2022 07:59:32 +0000 Received: from HE1EUR01FT057.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::19) by SV0P279CA0039.outlook.office365.com (2603:10a6:f10:13::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.19 via Frontend Transport; Mon, 21 Mar 2022 07:59:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by HE1EUR01FT057.mail.protection.outlook.com (10.152.0.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5081.15 via Frontend Transport; Mon, 21 Mar 2022 07:59:30 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 21 Mar 2022 08:59:30 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.32.40) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Mon, 21 Mar 2022 08:59:30 +0100 From: Jan Kiszka To: CC: Quirin Gylstorff Subject: [isar-cip-core][PATCH 1/4] shtab: Fix cross build Date: Mon, 21 Mar 2022 08:59:17 +0100 Message-ID: <14a5ec84e49fe4d3dfd22f9c6bb26d63075a497b.1647849560.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.32.40] X-ClientProxiedBy: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fe682df8-e83e-4022-c1a8-08da0b10baf8 X-MS-TrafficTypeDiagnostic: AM8PR10MB4130:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mcBfgUV2q2qhDBKR00LLog3bguiYZZmg1i2C2Lv+2W08TltlqrbVNpuvp9+4LDuStkQGmbLLTkcSJ0KLbO83E6mt6ctYAI2NBl25VAzfHwHFylibKpG25bsYkdAt54d0g0xwAQ7C7RM5/7km+F8Qatpwj9Z/MYRkfdr/+OW+URFeSP/XrWGpC0LNKsxvo+aQDJu/L0ImDHXlDCM6uvGXwjSPPiOWKZaugo6EcD3XJTrWu8cm5p7dqVI072Lbc7+fDAIT8/7Z8OFkFqrj560grNQRS9LXIsXpDa6TPuitRu937NbNbUGBn//n3K+JbNY0LyMLlovOH+iPXG2VrOvTsOhH7BoJ6gXSZQfF0JGo2CMr9DYO+yEeUxS63QOGaVHVPmhxcvGo09hbGEFbNjHmeZkWyp4h4JWzH2D76Kgu6LcKVwc0I2HrRT2g4heqS5aE2E/o3dflw1jTWucVUc10ev9z5sOhdWco+vfd6XGs2dKxlKrPMj6i2/woxC5NTL1j9tO4N6bhWiJyS5oqB5VDKWL9ZnWzuqy+EXZMC47pvGA9kM2hrZeDnyJbrNvAD8PLdzYWX1xSyIPtUccT+yOuck81Yc9AwiQhU8G5oN8rd5ZmE1WPPatpudgctLGrR3G8TlyAbDcp6VYRupGMnEO7jnVltj+y81sKKLrjCYotLTkocYep7uaNSVophSNW+6qI3saKvO5vLmnclTlZ60T4qg== X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(70586007)(6666004)(47076005)(86362001)(8936002)(70206006)(4326008)(498600001)(82310400004)(36860700001)(8676002)(40460700003)(36756003)(956004)(2616005)(6916009)(186003)(16526019)(44832011)(336012)(356005)(4744005)(26005)(83380400001)(82960400001)(107886003)(81166007)(5660300002)(2906002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2022 07:59:30.9812 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fe682df8-e83e-4022-c1a8-08da0b10baf8 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT057.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR10MB4130 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 21 Mar 2022 07:59:36 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7781 From: Jan Kiszka Not tested via isar-cip-core yet: When building python3-shtab cross, one dependency needs a ':native' suffix due to transient dependencies on a arch-specific package. Signed-off-by: Jan Kiszka --- recipes-python/shtab/python3-shtab_1.4.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-python/shtab/python3-shtab_1.4.2.bb b/recipes-python/shtab/python3-shtab_1.4.2.bb index eb5feda..ce83d6b 100644 --- a/recipes-python/shtab/python3-shtab_1.4.2.bb +++ b/recipes-python/shtab/python3-shtab_1.4.2.bb @@ -24,7 +24,7 @@ DEBIAN_BUILD_DEPENDS = " \ dh-python, \ python3-all, \ python3-setuptools, \ - python3-setuptools-scm, \ + python3-setuptools-scm:native, \ " DEB_BUILD_PROFILES = "nocheck" From patchwork Mon Mar 21 07:59:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12786957 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94092C433F5 for ; Mon, 21 Mar 2022 07:59:36 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.107.2.60]) by mx.groups.io with SMTP id smtpd.web10.27692.1647849575205898263 for ; Mon, 21 Mar 2022 00:59:36 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=EwGHI/nO; spf=pass (domain: siemens.com, ip: 40.107.2.60, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MJeyKh/wUCTY37Vlqn5IAXyaO0eS72VJ1HgtYs9GDfkQa8Adw2H6cn1g6v9kb4Cp4ME2JWSchE0Dh+VaJthlkJ96drz9WwUeKD5hhXYnZdUUyX2hwRwd0vNaJQDuS5ashWX45YRl+1eFhImEjVuMPQ9oMuXNvqgDsZPkXALXZEgsW4v74e7Sr62oh4ZfJPF93yCzQe+zguEG2x7piFu3RTZ36x0N9k9DOCBFjF47pJ0mR0wscMefl0JjQtskVfmaovmFLbYLgbEenO83zaZjxvSSjGKyqqjbFXN1Zx9i6txZ8mz4+lZTyhF3Qp82B5VPZUZdClQTIoIDWMFEtSTNOA== 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=fdEOK5u14V+axuIwNL7gU2y4kbynl23fslWgU+3nMdc=; b=bL964GdiPPKfifTdAQ3I2LORLyeq3ss7kbS9NkmcAKJAghOk2gQ70k8b1Y6xUXE7J7uPQV+gIb/KnrB+fy6tGdzUMOD1Z2C3LU9ma237L2P5Sk0W9y5sRd+gxfFPaHZv9K+uBSIm+TG//uNBtTYx0X7AntZXYmMjpFlF2mi4+pDZe7X/bKkWmeaPWBqw8UXcSbKsJKzBmQ9A3XRj9AZWSUSUVy98Jqf0qY9kJt1aVd0bfKbfB4xzdf6LeUqQ8mqhPAWPQg/jXlvTdLXYBykgW9clrN0p6TLFFJUg8HVRDHBXXQcqph+dhe6QmyPGGJ1d1IqWKFTzQkwFMmS0tHlXog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); 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=fdEOK5u14V+axuIwNL7gU2y4kbynl23fslWgU+3nMdc=; b=EwGHI/nOlI81V2pTK5X8UbGS+mMngmFW0aDeT74D7TrxoDevCewKPacWye/SytopVHRFFsFCYophvljfvh0sao2fL2VbZ5j2fG2tY4MhB6apC8sdv9f/1V6MgtiZUqafRzOgqbs35fq4+QcDo1LJNotQqi6rxdPNKAh+xsU/Dkg/baq4/Yfo7DCy+mhFk15P9u9YrdDmZ3zRvrARk4nESUIIcY1iOgb3LxBmpwhMGSG1XrFLx/brf/p10ay/mo3xsQWSoGrtBpv1k44ggst7TGGNaigBOae+i/yTGJ+msrmYwgJ2smIgbLy6Dz42Bt1ITlQxJiboYP/52JFfzpm4Lg== Received: from SV0P279CA0055.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:14::6) by DB7PR10MB2345.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:4e::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.14; Mon, 21 Mar 2022 07:59:32 +0000 Received: from HE1EUR01FT106.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:14:cafe::b5) by SV0P279CA0055.outlook.office365.com (2603:10a6:f10:14::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.22 via Frontend Transport; Mon, 21 Mar 2022 07:59:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by HE1EUR01FT106.mail.protection.outlook.com (10.152.0.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5081.10 via Frontend Transport; Mon, 21 Mar 2022 07:59:31 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 21 Mar 2022 08:59:30 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.32.40) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Mon, 21 Mar 2022 08:59:30 +0100 From: Jan Kiszka To: CC: Quirin Gylstorff Subject: [isar-cip-core][PATCH 2/4] shtab: Fix PYBUILD_NAME Date: Mon, 21 Mar 2022 08:59:18 +0100 Message-ID: <9cb3eac0524495aeb5249338964d9c75bde2c1f6.1647849560.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.32.40] X-ClientProxiedBy: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dac07ccb-c7e9-4fef-9088-08da0b10bb30 X-MS-TrafficTypeDiagnostic: DB7PR10MB2345:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H0tdts2GZA5LzM34z/bC2Ba0IumhG2yPC/xiZc0bSaePPzdkzydUdUSF1o8CVS+CbPN3DBAAAuhkLmEaf7RLorqZqge00ghm/LRleALpyoxx8QDrgLSdYVOBkzILscPOlos3fjfFcvo+HlW8D3d7+hX74fe++WA46Ou2CfL+nNhwUbvVHYZz6WLwk2FRWasxsArojKoPKUuTwvNcpJpfnh/ToySKRsb6TCJEDwOy1m+Y6lRmbZuk+aoqG9crxkcpWhcvcKnwywZ7rjcdfPGV+vTs6Va4zg7A1Ij6gLRSsgqf8NnhTi6GCi6+mjbSTumMrP2ySagSlqB7q6/QfsSsseAw96mQpaxP/gzL/Zok3gTp31Z/rIvj/E+IX71NHOAg4Eu1vgCdgGfrwPtg94Eip7l+HCRPt12McU4TVGY+jJcNUDVHiB05lCLZoT7/US0r2nKg6ugH1odsAp1tC3G9R6jcjnuwqjauNZZzkIK1aC7R2r+dHUk/III2nvKBiJ13SyTcka8II2kg8a5yo7wr3vb3uVEtJsdd1TPnXiI3qyEtJGssZoV5+OUpMq4tG+EWGkdf/Sp3uOi3V4R2dP/95/0RPRCZeDeVmRRqqOUY1HYD9goueHn3l+gGDbToWy5OgrgcVYC2o4ofR97Z9Ar5IpElklPldKrCFrHJy7EJyLCSWX9CH4OxRTiKa9qlpltOU+dl4mP+y65UlTShipoc6Q== X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(107886003)(82960400001)(356005)(26005)(2616005)(956004)(81166007)(186003)(16526019)(82310400004)(36860700001)(336012)(83380400001)(47076005)(5660300002)(36756003)(44832011)(4744005)(8936002)(40460700003)(86362001)(2906002)(498600001)(6666004)(4326008)(8676002)(70206006)(70586007)(6916009)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2022 07:59:31.3469 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dac07ccb-c7e9-4fef-9088-08da0b10bb30 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT106.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR10MB2345 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 21 Mar 2022 07:59:36 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7782 From: Jan Kiszka Copy&pasted from meta-coral. Seems to have had only cosmetic impact. Signed-off-by: Jan Kiszka --- recipes-python/shtab/files/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-python/shtab/files/rules b/recipes-python/shtab/files/rules index 43ba686..2dd07b2 100755 --- a/recipes-python/shtab/files/rules +++ b/recipes-python/shtab/files/rules @@ -11,7 +11,7 @@ export DH_VERBOSE=1 export PYBUILD_VERBOSE=1 -export PYBUILD_NAME=pasta +export PYBUILD_NAME=shtab ifneq ($(filter nocheck,$(DEB_BUILD_PROFILES)),) export PYBUILD_DISABLE=test From patchwork Mon Mar 21 07:59:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12786958 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71980C4332F for ; Mon, 21 Mar 2022 07:59:37 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (EUR03-VE1-obe.outbound.protection.outlook.com [40.107.5.51]) by mx.groups.io with SMTP id smtpd.web09.28039.1647849576462765585 for ; Mon, 21 Mar 2022 00:59:37 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=Jj2FRrNo; spf=pass (domain: siemens.com, ip: 40.107.5.51, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IyVc5NR+cwz7wgGlIMgpkuVucrMiz0X4gmfdtPA1HOIpHix0EAJYOXdhIWm9T3X4wn4FFshGHA/km3nFpu87RTNEHj1mMlyZhV9VK7fAi6bP71iZP3BhTna1WgqYOTYkwQWJpTQDZQAJqu7EomyOBDknizb3xfqSd9+w4NNSe3YKarrqojzb+px7gqSswCtkxfyeU507FON9M162ucHjURji93JWVxuMgkDsUDYzG8lfad9arvBr+u8GbdjClhhaA3OT8rG1CgqNo10SrlIroCpmrLKWygeQ452AlKV3HUDYmuAK/7gBzXBmYXX3LFuSusjP0uCBdji+kPTBEUjf/w== 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=gn9GIbgqttlQLVmmewmxj0+2ND7jxkFcY8T/bQVAS1s=; b=lb/SWCiPkYER4jWEAB+IsvdhMBTPfMSDmAYHgbRf0OyrBiLwwsVLJZz98lmGcXNEwF/sphKS0UANnL21y6Qxs7Yfz5WOGb3Winb3FVrJnr+YyoYsvPUqQnXBbgh9yRhwpm0S9kMkU/BXnao24Y6Dii4Iiy1GwBNNMHiMOa9DC+ygclUlAFS/yn5T2ZLoSO4iOP1/H41Pzu25XjTVzIpLlFF5nRg4tGAbkMR3scGIreyiY1WoI7qEosZMe4+R5c/15fm6ItX+n3Uogj+ADZ7nxdUe2M6b1M9H7nMvLj8Pp128OjhI+SWJ5PBZkh0KzPvQYkN01aT+DWZqNZa8ccN1hA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 194.138.21.70) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=temperror action=none header.from=siemens.com; dkim=none (message not signed); 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=gn9GIbgqttlQLVmmewmxj0+2ND7jxkFcY8T/bQVAS1s=; b=Jj2FRrNoh3UFsDC5nTH1SQisu70VPKwszwmPiE0Grp4Hx0Imb6Sxv0Y0EgpuSZCwILn03DloWdclE0WxJxeKRHUbAqbn8Dh5BafWCIOPWZz3qyneqO6zWCGRABHBWlzvvp2IbZwLK0iX24b0SpRETwY0eM3m5iXKE6/vrWugJZtCrSxH9rtDSpWqsbTGDA2di2ypZNk6pkGmJx8l2sYrLFlHUJSeywRr9Q2XUYshsqsgb+YrYTltO/25wR0qfsQ9SkNiQdh3nAdZy+pN03+LWBe2id59hbOUXvGXjFuPmpb7JvyeS+12qBkGrItaYp8GYWg9PRpCBEKlQ202u9Hybg== Received: from SV0P279CA0041.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::10) by DB8PR10MB3674.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:131::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.15; Mon, 21 Mar 2022 07:59:33 +0000 Received: from HE1EUR01FT076.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::11) by SV0P279CA0041.outlook.office365.com (2603:10a6:f10:13::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.22 via Frontend Transport; Mon, 21 Mar 2022 07:59:32 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 194.138.21.70) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=temperror action=none header.from=siemens.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of siemens.com: DNS Timeout) Received: from hybrid.siemens.com (194.138.21.70) by HE1EUR01FT076.mail.protection.outlook.com (10.152.0.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5081.10 via Frontend Transport; Mon, 21 Mar 2022 07:59:31 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 21 Mar 2022 08:59:31 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.32.40) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Mon, 21 Mar 2022 08:59:30 +0100 From: Jan Kiszka To: CC: Quirin Gylstorff Subject: [isar-cip-core][PATCH 3/4] efibootguard: Fix non-x86 builds Date: Mon, 21 Mar 2022 08:59:19 +0100 Message-ID: <0d3861a36a20b7934d71608a9de4fa210df1b392.1647849560.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.32.40] X-ClientProxiedBy: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c4b40780-3f29-4b08-96c5-08da0b10bb5b X-MS-TrafficTypeDiagnostic: DB8PR10MB3674:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cXMpwAbhFtUwZWrvMqbsBQY5iC1VIpDp+HLzJzDuF9Rotm+tT5QxCRrt4QfuXwyL0xy/IY4LOj4/AJJhLoDWZze/VTLQApmSn16uCFM0SG7li0kdz1x8g9lCLm42wFxu0vKKF76UBr44jfOU01Iu2B9bskdb2aIf0GmlMooNtb43Pa3elVH6+47v7FzSohIvoBFbiIp404gUdApMsbEqecrRlzr69DQQIor9oqzKhpSgLDyqNUWX8j3DKN2Kl5Q55PY2xdNDqYAjQ4tuOCh+hNdjDPyLv1u0BnQH+YG3WN8lwIe5FcGhiyw7Yz7CH3kiWdsmr53rK9h+Tuwkz7UjtCJwcy83X/2Z2Ramj27B/HmKxD5kahxqDwubNDXc6Q2/MNJipCXRJ9XjvNd6dyU1H9mQnBIXQ2ylsvZtJ6030ryZUaQ72OKrlmPMd+6nw7HnoI4PifZrkEdswVVbGxI2o6pM832LyBJkZbD/dGSq+m5dYKTsKjq7NSJ2H5XgyGEJWaCF8Q8h+0GDgxkc9tBoJyJtb+LIrzjOvMXDZDlldjXVY2nM4SSIUfpZmoP+/D+QDxDZPl/C+6hq+gUieS4WNDhceceMh7RSOgGxHg85LcUMU3xhOTUO71v2+x8PcZtguq1f14r+Py/Huc3KjwIcBUnmH/dLHugn5vbBIdR+oivvo99PYOP6TUhaVSxue9/s X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(336012)(82310400004)(956004)(2616005)(107886003)(86362001)(16526019)(6916009)(186003)(5660300002)(44832011)(36860700001)(26005)(8936002)(36756003)(63370400001)(63350400001)(40460700003)(47076005)(4326008)(83380400001)(8676002)(70586007)(70206006)(7636003)(356005)(82960400001)(7596003)(2906002)(6666004)(498600001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2022 07:59:31.6289 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c4b40780-3f29-4b08-96c5-08da0b10bb5b X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT076.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3674 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 21 Mar 2022 07:59:37 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7783 From: Jan Kiszka The libc6-dev-i386 package is obviously x86-only. Furthermore, the installation path must use DEB_HOST_MULTIARCH in order to drop libebgenv.a in the right folder. This might have been already broken for i386. As we still support buster, templating is needed to translate DEB_HOST_MULTIARCH. This would just work with bullseye and compat level 13 + dh-exec. Signed-off-by: Jan Kiszka --- recipes-bsp/efibootguard/efibootguard_0.10.bb | 16 +++++++++++++--- ...dev.install => efibootguard-dev.install.tmpl} | 3 +-- 2 files changed, 14 insertions(+), 5 deletions(-) rename recipes-bsp/efibootguard/files/debian/{efibootguard-dev.install => efibootguard-dev.install.tmpl} (50%) diff --git a/recipes-bsp/efibootguard/efibootguard_0.10.bb b/recipes-bsp/efibootguard/efibootguard_0.10.bb index 7d09c85..b0877d0 100644 --- a/recipes-bsp/efibootguard/efibootguard_0.10.bb +++ b/recipes-bsp/efibootguard/efibootguard_0.10.bb @@ -26,12 +26,22 @@ PROVIDES = "${PN}" PROVIDES += "${PN}-dev" DEPENDS = "python3-shtab" -BUILD_DEB_DEPENDS = "dh-exec,gnu-efi,libpci-dev,check,pkg-config,libc6-dev-i386,python3-shtab" +BUILD_DEB_DEPENDS = "dh-exec,gnu-efi,libpci-dev,check,pkg-config,python3-shtab" +BUILD_DEB_DEPENDS_append_amd64 = ",libc6-dev-i386" +BUILD_DEB_DEPENDS_append_i386 = ",libc6-dev-i386" inherit dpkg -TEMPLATE_FILES = "debian/control.tmpl" -TEMPLATE_VARS += "DESCRIPTION_DEV BUILD_DEB_DEPENDS" +# needed for buster, bullseye could use compat >= 13 +python() { + arch = d.getVar('DISTRO_ARCH') + cmd = 'dpkg-architecture -a {} -q DEB_HOST_MULTIARCH'.format(arch) + with os.popen(cmd) as proc: + d.setVar('DEB_HOST_MULTIARCH', proc.read()) +} + +TEMPLATE_FILES = "debian/control.tmpl debian/efibootguard-dev.install.tmpl" +TEMPLATE_VARS += "DESCRIPTION_DEV BUILD_DEB_DEPENDS DEB_HOST_MULTIARCH" do_prepare_build() { cp -R ${WORKDIR}/debian ${S} diff --git a/recipes-bsp/efibootguard/files/debian/efibootguard-dev.install b/recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl similarity index 50% rename from recipes-bsp/efibootguard/files/debian/efibootguard-dev.install rename to recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl index 7b45bd8..948019a 100644 --- a/recipes-bsp/efibootguard/files/debian/efibootguard-dev.install +++ b/recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl @@ -1,3 +1,2 @@ include/ebgenv.h usr/include/efibootguard -libebgenv.a usr/lib/x86_64-linux-gnu - +libebgenv.a usr/lib/${DEB_HOST_MULTIARCH} From patchwork Mon Mar 21 07:59:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12786960 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B57EC433EF for ; Mon, 21 Mar 2022 07:59:45 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.58]) by mx.groups.io with SMTP id smtpd.web10.27693.1647849584170185867 for ; Mon, 21 Mar 2022 00:59:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=T0Jzdvj8; spf=pass (domain: siemens.com, ip: 40.107.7.58, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f8k0WpqEed/SpHrSw0bO+3mrvKvhVmeqCqDZBRdH/bua2icxB8Cjn9//WgG2IbcnMdc3fLTIcvvk0KpaqHeaVJ/uTn9qEEj7Kqr5NTcehmpALWW9S75XLhyFUr5V8FgDx4AIbkzm447huTr3q/fTPTKktyfELzs9oswthA6OM1AdKd1weSB30EOSS9qcolJtCx7ElbbiIuAV3Kelx64p/9/X/JNwR2qQC9qv/mlH4dF25qxdQA3m67yHf2vfgMk+YQxUO1mQ2yn65JXSNJl0BugYTDP3x1tDg9dfH2F3MrfcqXwEVU3FxMVpMWM1DwC3o5SxCmnP/dcDxq7XwV/nNA== 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=BLjav6r4ejRScE+J322PSzEtTj7VnbhGg0svnMdkjCM=; b=CueSMIHF4EcwQBXdVJqH+7W3iyeb1kQyPvJzdlFtF04fJB8nO133eqsOqzP8Prv0e0RtFYbvQJ7uFHO1GqEXKCyovQrgRV+v01XfoH6GQTvlY8KDin1BkDv3mnk15lTKTYo9x0slCwLm5SZa4QIVvXLhwHn8+2uypP/RkbDAN/m9uwMYN/gyxecGOpfmDK/iGBAP4JpwcNaHIefQlYi8kdso31iKD+IvBT/dx8RqYF33B2DeUMmuT8Kacsla1KR8HgnlXTuu7eavxMAiKX6h6eYTGdrboTWhZKa+XlRIOfhg/fO/v4P/2WCqcKmg0PH65sK6AbN0qKRDi7gdyOQ9lg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); 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=BLjav6r4ejRScE+J322PSzEtTj7VnbhGg0svnMdkjCM=; b=T0Jzdvj8kwkAEfN71z1i/rlR6LOlcE7GK+UhC+b7E3c2dJDkWPuO4nq2AYYWq1xRGAZi510jiJQTbL1QFXdWPZ2OuEORo1+wGo7M/CXQN+SSPpT9AJMAcRmXIYBGdg9M3B3Y5/GFmFJGY16jbt2KQhccbtioXhtG3w6fut3neHtOr5zsJrO4J9ttweCtq8pcDkToNjqfwg7zincDPc9PN9H/FegpzQzBEfMoLOdjv6xgbuVJzsKJUrsrPZS0DLPFkZ2Y7ZkwG7Pp5p3wXW04g0Ndz+YB4J4js4iJeO2eHtKq1UbvQsM+v1zIrXW5Ae1Upf0YAzp7w5o6QqIpCMADiQ== Received: from AM6PR10CA0019.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::32) by VI1PR1001MB1070.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:69::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.17; Mon, 21 Mar 2022 07:59:41 +0000 Received: from VE1EUR01FT047.eop-EUR01.prod.protection.outlook.com (2603:10a6:209:89:cafe::d9) by AM6PR10CA0019.outlook.office365.com (2603:10a6:209:89::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.13 via Frontend Transport; Mon, 21 Mar 2022 07:59:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by VE1EUR01FT047.mail.protection.outlook.com (10.152.3.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5081.15 via Frontend Transport; Mon, 21 Mar 2022 07:59:40 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 21 Mar 2022 08:59:31 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.32.40) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Mon, 21 Mar 2022 08:59:31 +0100 From: Jan Kiszka To: CC: Quirin Gylstorff Subject: [isar-cip-core][PATCH 4/4] efibootguard: Fix plugins for aarch64 Date: Mon, 21 Mar 2022 08:59:20 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.32.40] X-ClientProxiedBy: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b031c816-9869-4f17-c9cc-08da0b10c0b8 X-MS-TrafficTypeDiagnostic: VI1PR1001MB1070:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AJZLLCBwImJad0nvjJt3mFoaKeMIsqeErLC74j2TpkcDTixcY4HQmiXGBjoEP0SZTF9c/b4/fKyx7JD+4FGrtLfLx1k9UHK44ut1ByX/FnBX47x8OIaOzrutdEZOQYG1vGBLkWPkak+dhQNS/NmEZ084HFQELC6XiZNdIIs4Tlqxu1qnf8smOTVI2NXbpsmLMDapqZsT8x7wF78kg0ezRA3fqDtJFvRqER8sYm32GEso/hMDrG1dJljVjTZwcRa02bFOvFcpcz3luvfq0BL1gzQ7O2P1iPLB+2S7IRCP5udunabk4GNGEGbslQsY1AabQ/SyH2MUUhqNJ/HVVNyT0ycBQb+H0gmbeUDAbnAVQC2Hq8BUXqFtjVXXTNklLqjf3HeRBdmXk7hO5c3g683+H5PYSpQvDARb4604mCubl7lw+iQOarWV9HImpk3JKJnMckF5HjCCkhFV1uO8HcUlMmDO9M5lbRcm+R3t0Iq7AXxW/3ibISiNaRnU4mt9KpczM0jzfiVX7Nshn5HTzR8hs1V1EKDKw5xaScdNZTcGSFhu8rNq2SUkEk+wFfuGjVnJhDghtm2YknSQ1WTu7YsWh1mzhZ75XnZSYZQ8E1Q6gPHXX+ijknrOlV4Vmftat/zDc3A1TGQzU1pZ6rJvCpSjlv5FtSb2JcgbU4NjR9oB8fEE6WPIBIFONQNDBPJeQMeijTNz6GbUoHHV05XdM14x+eA0B+7iOW8BKYv/eZLPGyne0gEiAdjfGJ1howdJPkAOiqizXfBmPc4JLrUlHcB63BMDljcBy9Qv+Is6zU1yKHs= X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(2906002)(82960400001)(82310400004)(83380400001)(36860700001)(336012)(36756003)(6666004)(956004)(186003)(8676002)(4326008)(26005)(47076005)(19627235002)(107886003)(70206006)(356005)(16526019)(81166007)(70586007)(2616005)(6916009)(8936002)(966005)(498600001)(44832011)(40460700003)(86362001)(5660300002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2022 07:59:40.6439 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b031c816-9869-4f17-c9cc-08da0b10c0b8 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT047.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR1001MB1070 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 21 Mar 2022 07:59:45 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7785 From: Jan Kiszka This requires to add a post-0.10 fix from upstream EBG and own changes so that the right arch string is used, for the loader as well as the stub. Signed-off-by: Jan Kiszka --- recipes-bsp/efibootguard/efibootguard_0.10.bb | 1 + .../0001-configure-Fix-aarch64-EFI-arch.patch | 28 +++++++++++++++++++ .../wic/plugins/source/efibootguard-boot.py | 11 ++++++-- .../wic/plugins/source/efibootguard-efi.py | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 recipes-bsp/efibootguard/files/0001-configure-Fix-aarch64-EFI-arch.patch diff --git a/recipes-bsp/efibootguard/efibootguard_0.10.bb b/recipes-bsp/efibootguard/efibootguard_0.10.bb index b0877d0..bfc0ede 100644 --- a/recipes-bsp/efibootguard/efibootguard_0.10.bb +++ b/recipes-bsp/efibootguard/efibootguard_0.10.bb @@ -19,6 +19,7 @@ MAINTAINER = "Jan Kiszka " SRC_URI = " \ https://github.com/siemens/efibootguard/archive/refs/tags/v${PV}.tar.gz;downloadfilename=efitbootguard-v${PV}.tar.gz \ file://debian \ + file://0001-configure-Fix-aarch64-EFI-arch.patch \ " SRC_URI[sha256sum] = "4d58574a0bb8f1e56056ab0bcc2487d37e49fa147dc991e719c2ec8e20f88dd3" diff --git a/recipes-bsp/efibootguard/files/0001-configure-Fix-aarch64-EFI-arch.patch b/recipes-bsp/efibootguard/files/0001-configure-Fix-aarch64-EFI-arch.patch new file mode 100644 index 0000000..ee05e94 --- /dev/null +++ b/recipes-bsp/efibootguard/files/0001-configure-Fix-aarch64-EFI-arch.patch @@ -0,0 +1,28 @@ +From 3f11612fbcbd1c17988d634ecdaecf1ec241f6e0 Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +Date: Mon, 21 Mar 2022 07:02:28 +0100 +Subject: [PATCH] configure: Fix aarch64 EFI arch + +It's aa64 here according to the UEFI spec. + +Signed-off-by: Jan Kiszka +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a1a83e9..09d06d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -102,7 +102,7 @@ AM_COND_IF(ARCH_X86_64, [ + MACHINE_TYPE_NAME=x64]) + + AM_COND_IF(ARCH_AARCH64, [ +- MACHINE_TYPE_NAME=aarch64]) ++ MACHINE_TYPE_NAME=aa64]) + + AC_SUBST([ARCH]) + AC_SUBST([MACHINE_TYPE_NAME]) +-- +2.34.1 + diff --git a/scripts/lib/wic/plugins/source/efibootguard-boot.py b/scripts/lib/wic/plugins/source/efibootguard-boot.py index 05cef4e..5061629 100644 --- a/scripts/lib/wic/plugins/source/efibootguard-boot.py +++ b/scripts/lib/wic/plugins/source/efibootguard-boot.py @@ -176,10 +176,17 @@ class EfibootguardBootPlugin(SourcePlugin): def _create_unified_kernel_image(cls, rootfs_dir, cr_workdir, cmdline, uefi_kernel, deploy_dir, kernel_image, initrd_image, source_params): + # we need to map the distro_arch to uefi values + distro_to_efi_arch = { + "amd64": "x64", + "arm64": "aa64", + "i386": "ia32" + } rootfs_path = rootfs_dir.get('ROOTFS_DIR') os_release_file = "{root}/etc/os-release".format(root=rootfs_path) - efistub = "{rootfs_path}/usr/lib/systemd/boot/efi/linuxx64.efi.stub"\ - .format(rootfs_path=rootfs_path) + efistub = "{rootfs_path}/usr/lib/systemd/boot/efi/linux{efiarch}.stub"\ + .format(rootfs_path=rootfs_path, + efiarch=distro_to_efi_arch[get_bitbake_var("DISTRO_ARCH")]) msger.debug("osrelease path: %s", os_release_file) kernel_cmdline_file = "{cr_workdir}/kernel-command-line-file.txt"\ .format(cr_workdir=cr_workdir) diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py b/scripts/lib/wic/plugins/source/efibootguard-efi.py index 9e6febe..e1411cb 100644 --- a/scripts/lib/wic/plugins/source/efibootguard-efi.py +++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py @@ -54,7 +54,7 @@ class EfibootguardEFIPlugin(SourcePlugin): # we need to map the distro_arch to uefi values distro_to_efi_arch = { "amd64": "x64", - "arm64": "aarch64", + "arm64": "aa64", "i386": "ia32" }