From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7088670669347487744 X-Received: by 2002:a05:600c:4e01:b0:392:ab42:48 with SMTP id b1-20020a05600c4e0100b00392ab420048mr3246012wmq.169.1650459754495; Wed, 20 Apr 2022 06:02:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5109:b0:392:990b:add8 with SMTP id o9-20020a05600c510900b00392990badd8ls2969535wms.0.canary-gmail; Wed, 20 Apr 2022 06:02:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVwVokuZKzSxfm4BjfqkXIfYrv/GhzsfGXrcsXEaP5/KLKdnjXDQNwA2P2oCz/aB+ch04g X-Received: by 2002:a1c:a301:0:b0:392:9bc5:203c with SMTP id m1-20020a1ca301000000b003929bc5203cmr3633929wme.67.1650459753142; Wed, 20 Apr 2022 06:02:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650459753; cv=pass; d=google.com; s=arc-20160816; b=c9/sSEyysVIf45x4CaGXfqvxd00nrHST9oa48bSwDNbMeOPz7bUqUn6GLc6FOWKpMq rw5EIF97Mdy3p77Zcn+7e2Ny6EgkI79yYYgXUAbuQwnv3RpWZ5PShFaF5ks1kI4dcagl tWRrLI5rKBPMZOrRgfzxHkBXcG8YlcnRYUAm2AxsptzNM7VJ8KG0g6g6pISY1uRF58Gc tlMLa/Lu2X4mOv+dXacfYA1ZeDGD8KQ7gRFUEV9JBeNZJMOgHKdf9unwQspC8iNmY1ge 9TTG/Oqu/94sulYPll00HPw19MgaT97r84f/6WIABi8Im3eVQZoa6NOWsugyoWslaZXC lOXg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=sIFgBaSC5mKHzY9O64milVJFe2czObD+X/ve8lJ2yDs=; b=piCvg0l7bImCA0HHhIkznQEz0T1sLJjiK3lx0qg1xbofiuZxRsfqTOE8U2MQukAXcL gGNfMD2D0/ealHhKBMjnYru54dSLpCZBuRkMJAs3sEcxQ/MhPgtFqxyIUm5ZUNec+240 vMZykqaykJq+9boBPHWZfAZL+Rz9X+jBb/XERCkfAloryoYluCj5Mg1/0xMPD3CLpO5u YfCC4xhYONSmVvg/M2pp5XYBgCgeSohxAzNFQ2fsog7+/nB3K6gyLzW5ybQkuk8jqWoD qBYhxIZnLs8sUXzKMlSERdO22vq9AsRrc2Pjo35dSJvujjPFeiklHuqCuvSr90rz6Bkz 1bjA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=AkMNsva+; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe09::60e as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on060e.outbound.protection.outlook.com. [2a01:111:f400:fe09::60e]) by gmr-mx.google.com with ESMTPS id u1-20020a5d6da1000000b0020412d0d89fsi72940wrs.1.2022.04.20.06.02.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Apr 2022 06:02:33 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe09::60e as permitted sender) client-ip=2a01:111:f400:fe09::60e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=AkMNsva+; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe09::60e as permitted sender) smtp.mailfrom=henning.schild@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=dTbJJJoS1r3teQo/IqhW0gdDRyRcO+CvZ2OmJCYuHH2+VF3SBTZ78s2Grn+R7MgGQFbdr0B0tQK9qk2FYtRPx7/4pFhyXEDJV5Z8Uas3anR9DvrkEeyyFbk3C2yPfI+rDpQLnWC7reJc6xQUgJYSwmb3PHBB5VJgwmrA1ecvJeGQNmWWHnOVlSrrj6thjNfeoGqpewNwyzjG61MlLnmXpsHtHQJcVg2nE0ERw3FKT51VKxI5m+RHu27f7bsmIkwKgknq5w6wTDVUotciH3dxdbxfLOkYQTzzVCceVGQbdyv+APYL15JNoHWxwfzxqZnPQVO2qWguXbC/9zhtAuPcWQ== 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=sIFgBaSC5mKHzY9O64milVJFe2czObD+X/ve8lJ2yDs=; b=GclOqkcY9dNeZW/HcSyYTKnvjOrDa1rjNGxewZE/TndAJMxYovwRY/a21of7tqg+YUVHcMLrSOsMfoPMOmT+ViYUIQwKV7AcQ6bYZA57lua9bikVdGhTWt9Wjl9ZaudoH6vm819nTjDRqWw3CknbTYcTxyKszIxuQLqBqBrXi0S87VPuXS3+VMlSDE4ZnNK+w5ltDKPKf92PwjAZWYx8NyFYqkF1v5JJVLLDfNnOM/TQCbF5T3n9KVKhdUjYl4dpegL7YUy7x818zwCcUuZqjVdRUJi4fCSwYnz5szetBmkkVEt2Qj0NwFieqEpELwAs+vKi+0USQB6OQThFEdxedw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com 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=sIFgBaSC5mKHzY9O64milVJFe2czObD+X/ve8lJ2yDs=; b=AkMNsva+jjNUl/wVGqKKIpJLMzSJf51sPUcKO+eM5lU/CJu9NBT92qNdNkUvhWyO6lefriZqeFiWE5+iAC9CivZmgYh2gwj139T/EQx8MmiN+9GyLoAn+Zl54020th8j5Fr3hxSj5/H3YNfRJaLT29/IAhJ37awXXRwZ5p4f2N+G36LjxwOFfUdrjDciSGB+/JdaJuYRg1vPdQ3KFebmHkRsmCFAiz4wY2qdL7cSwoeYj0eewNrh5fMKmBT3E2PPOfymZUrlmzXWlBMGIEY0qLZA7FWHuXuGvjrHfKJcRgp2SiWs5K2BsF8gFDJTZS38yCJKYWTxsSeKdVBO///DQw== Received: from AS9PR06CA0479.eurprd06.prod.outlook.com (2603:10a6:20b:49a::28) by DB8PR10MB3402.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:e5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Wed, 20 Apr 2022 13:02:31 +0000 Received: from VE1EUR01FT049.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:49a:cafe::fa) by AS9PR06CA0479.outlook.office365.com (2603:10a6:20b:49a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13 via Frontend Transport; Wed, 20 Apr 2022 13:02:31 +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 VE1EUR01FT049.mail.protection.outlook.com (10.152.3.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5186.14 via Frontend Transport; Wed, 20 Apr 2022 13:02:31 +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; Wed, 20 Apr 2022 15:02:30 +0200 Received: from md1za8fc.ad001.siemens.net (139.25.69.161) 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.24; Wed, 20 Apr 2022 15:02:30 +0200 From: Henning Schild To: isar-users CC: Florian Bezdeka , Henning Schild Subject: [PATCH] wic-img: use python3.9 in bookworm Date: Wed, 20 Apr 2022 15:02:21 +0200 Message-ID: <20220420130221.23398-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [139.25.69.161] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f25982cc-0946-4077-7761-08da22ce0797 X-MS-TrafficTypeDiagnostic: DB8PR10MB3402: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: bCqGqe8SyFX+y8L5JYUauAIT70xjEKvoDq/bghd+baeKWT+pc3wjVbl10hmVI0zvGDMUHDiNYoflMjQlWkrobgVnXcxFYwWBPN+o3yoMBfiUVSIIKkzeXjxa/ZKUSFW6MlZQbgiiMUO7GQS1NiYVhPdsEvjwN1i9WEHIh/yF1CDquISh4d3B2c4v3u6GX5Mnlns9wBPP5YHX+uZsXwaih3wJOnJebMOaY3UwlIoheFXPpcsXufIA+7kHZmwefGaqHqLK7zVqtlfbFZ3ugGhYqCo0I7LRAl0eaMMram9petL+ZLxaG4trjzZwVuciCBWhr/g6zXo6q80r9IcCkU+ssHrFISz1QaDdXq4jCPToN86KWMOpQCBZ5JTMXXYdXwH8gdtlRiYTzQozsMELOcKVG/85PHf3JkJTDMBYTWvf2mF4J6oSCMCX3FmvT8EIfDO8vaew3yyRNBSJRhE29TB5nTdj6s9TiAHgD3aT5aUbVfKoZ8Geso90A17L0GgJ+QgKCoGYGp289o2wPJ0XQ5Q+irdziE7XMOBvdQffBwgQnQu9HRO+84UqT8kcOem6CWg6ynhOHcisdOlVn2lOEb/4z9SLnleaTNdXniaWGLvHFCJuU8mFKPTaFOZi2zRZM83vHjDwQY6DxDqSCLrVRfDkfGwlFxMySSnifj9p5IufGBnP/Cn9giw7HjXtnYgmZYIMbCMXO/1DgGHsWlpndEpzPxlUqULA1phOCiTPAyqMdZ1PsU3kaSbSnMwrIngvsuJN 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)(36840700001)(40470700004)(46966006)(70586007)(36756003)(47076005)(82310400005)(6916009)(70206006)(336012)(81166007)(316002)(36860700001)(356005)(4326008)(8676002)(54906003)(82960400001)(1076003)(8936002)(83380400001)(107886003)(26005)(508600001)(186003)(5660300002)(40460700003)(16526019)(86362001)(2616005)(956004)(44832011)(2906002)(6666004)(403724002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2022 13:02:31.1695 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f25982cc-0946-4077-7761-08da22ce0797 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: VE1EUR01FT049.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3402 X-TUID: lsn9lR2uW0VB The jump to python3.10 will mean "from collections import Mapping" has to switch to "from collections.abc import Mapping". Our bitbake still has the old version and will not work with python 3.10. We might some day need to fork parts of bitbake to make it work with any python3 version. But for now we can still fall back to python3.9 and do not need to fork bitbake. bookworm switched to python 3.10 about a month ago, since then one can not build bookworm wic images any longer. Signed-off-by: Henning Schild --- meta/classes/wic-img.bbclass | 7 ++++++- meta/conf/distro/debian-bookworm.conf | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index 7537a27b613e..5623945378eb 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -192,11 +192,16 @@ generate_wic_image() { mkdir -p /usr/bin/python3-native/ if [ $(head -1 $(which bmaptool) | grep python3) ];then ln -fs /usr/bin/python3 /usr/bin/python3-native/python3 + # python 3.10 is too new for our bitbake version + if [ "$( readlink /usr/bin/python3 )" = "python3.10" ]; then + ln -fs /usr/bin/python3.9 /usr/bin/python3-native/python3 + fi else ln -fs /usr/bin/python2 /usr/bin/python3-native/python3 fi export PATH="$BITBAKEDIR/bin:$PATH" - "$SCRIPTSDIR"/wic create "$WKS_FULL_PATH" \ + /usr/bin/python3-native/python3 \ + "$SCRIPTSDIR"/wic create "$WKS_FULL_PATH" \ --vars "$STAGING_DIR/$MACHINE/imgdata/" \ -o "/$WICTMP/${IMAGE_FULLNAME}.wic/" \ --bmap \ diff --git a/meta/conf/distro/debian-bookworm.conf b/meta/conf/distro/debian-bookworm.conf index 7e614bf2b5c3..c5b08e6aaa35 100644 --- a/meta/conf/distro/debian-bookworm.conf +++ b/meta/conf/distro/debian-bookworm.conf @@ -6,6 +6,8 @@ BASE_DISTRO_CODENAME = "bookworm" HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}" +WIC_IMAGER_INSTALL += "python3.9-distutils" + DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686-pae 686 alpha-generic alpha-smp \ amd64 arm64 armmp-lpae armmp cloud-amd64 cloud-arm64 itanium \ -- 2.35.1