From patchwork Fri Apr 22 01:05:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1708 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 22 Apr 2022 11:06:23 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f55.google.com (mail-wm1-f55.google.com [209.85.128.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23M96MHE011651 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 22 Apr 2022 11:06:23 +0200 Received: by mail-wm1-f55.google.com with SMTP id bh11-20020a05600c3d0b00b003928fe7ba07sf3521444wmb.6 for ; Fri, 22 Apr 2022 02:06:23 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1650618377; cv=pass; d=google.com; s=arc-20160816; b=UDvYYVxKNKbkfUB03uiUPTccCBDK00IOcoCaFCthxzQzyRjTlhH9vNq9ob8aPetz8j 31+V+NOK8YThfU2cH4DssdNuYj9mJ3IssqFOd0geuh9QrhAz50FiBdtfvzw7p0v8vQ6/ w2C+bgiEaWYzzu3a5Pl1vTaF/mgs9jEwHuOqxEyzpEsvFjuk0v7oUbubL8MLQbVkDifP ea83tS4NthBrT8kHzP17TLDuPT5QjKsXhCfOLLi34zueFzj8cmBn/COpHld8PFR2STzy CK4axeb/OymxuUrW7ayeigcnys1jkd7vVaBfxRCw+KC/Dm8eiEl6D9/3HPagl7lWbCR+ 7ltg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=Kxl9jv961ED45sp/PmeXqyKlCgRx+cuvUu/Iy1o2/UM=; b=JqTkw7YtqxvkRfIWVWj7woNF/fhbAAMocevF0+u64fA9nAUaTnB9YWYcjhGHJzxNEv YJb0GI8bKtYgiu+GSbCShomItZ34Gn2KuNLHDfdwxwwfMRQ8pr4bmlmxpX9vvAEZX8BX mmzDADYATW8ENeLH/fIkEOCNKTHOK8XC303aZKmI4iSxIGMLoidUndEFOJRreDU97nue bBj2GFSqKUl8XWOzACUW8KLWINU6hzuM3S5BdruizPG/g34S/zYvYC2RurfHJPIu2LvX uZF37ZsFPBErrYyeG/dpaW8DXBlJ6umMW5kWlSmWggGHr2pQz4wzQSUUjE1JKhmqiHVN YJsQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=o7r4zpzX; 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:fe08::620 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Kxl9jv961ED45sp/PmeXqyKlCgRx+cuvUu/Iy1o2/UM=; b=GOFo0ruhE2iYRyij+qbLU6hPHhk4tq8+sLYGcSZgNy0qkUh67IxJNt6tm7hjYTZhuf uaegoceBLkU38wZqPHSXvbE1Y++xU1mg0Dw5EeP+boH6c6gAK16Xfp2VI9eVKJMbfHEy OW6GRP2BeLHa+dhlyjcD8M82GYzVNXZBMl5QEFeBptT7TOCw8eZbknD8h0BDszxuMUTV +PcVQeHscDdX4sib/QDO5NAPOl39em706a0mDv0tCbEejjHQZHi2vOdvabvqv3eWguu0 nYDHrLXjEPn0aTmRUbJMCvmy7whX7tEAFDr28+MC0yBu866ywaxtysuNNnSIIP37I8/e NtkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=Kxl9jv961ED45sp/PmeXqyKlCgRx+cuvUu/Iy1o2/UM=; b=26QC+5yCZI7pfVg52RjjlkE6s24UCRBuW/Djuxh1zE5avUUXgJ3e55QJXzparWlHfz ZM4KQkCVPwJiRXwO3FTxfktRcmQKfTgcJQPoMlwghIlXmzHNvnNM/Et/aWJaKpfmT0cq SD7BRiSVcv2wYO5YsxDo4iMWma1fV4pzXRmh2DBq6Dy0c+buibxw5IXZjCVFzYeVl8Ml MjlziP0kEJypGB3+W1Ykaj2SIP7uBcR2HXeNybAwylADe31F/+NlWiZelicDa5jEJXwj SqjkH0REtxWqgH2PF1Qnexq8MLtDUOVboIgpguzugFzQu5JKeHeQ+yhI6irJr6brmoVj TCkg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532WTROLlgMFXiTYdiP4BD7VMPnGh7LKwyUtrbI1g4Negq9wBQWl zZQtT5vkbxgrSiDcBDn+Tvg= X-Google-Smtp-Source: ABdhPJygNDbyyLaMqFCQsPFAi1OoHuDh7dsbHdhHx27/dPyOZocKpRH3+YfZRoauKZaaZcK6KKTWzA== X-Received: by 2002:a05:6000:381:b0:20a:8a52:5c86 with SMTP id u1-20020a056000038100b0020a8a525c86mr2883259wrf.554.1650618377507; Fri, 22 Apr 2022 02:06:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3585:b0:392:8fd1:58b5 with SMTP id p5-20020a05600c358500b003928fd158b5ls146478wmq.3.gmail; Fri, 22 Apr 2022 02:06:16 -0700 (PDT) X-Received: by 2002:a1c:4408:0:b0:38e:aa45:db99 with SMTP id r8-20020a1c4408000000b0038eaa45db99mr3155314wma.176.1650618376598; Fri, 22 Apr 2022 02:06:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650618376; cv=pass; d=google.com; s=arc-20160816; b=Di8iHVwoVQK7+Mydy1oVaZDEDwBSivbrAk3FgcgMtZv6cQW08jvemv6pDSldbEPyf+ dB0zxK00vmVauIRX91VCe4Bvkm1k9dJ4xNMZ4r3GRVaR/HU5d7AL+waSFdIGRVABIK0t BdNaKg2GZa33Zqp5Y9/nxIHDk/G1o3UdND970qjaHJ7MDPwmQmZbGBb+NRO0PUjshnae hngDzd+EstTQdl5xq8onYj3zejmSeSm+MCyqUUW8huuwNYolSe7WcyMizfdKfxMCvyrn +e3ajZd4uVWlM2s+6j5wNftER9oezSiayFMDhlvjXq/dQsCzx30TbsSHRNPrTjEJ/lpt 5ccg== 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=pmP+IbCu+KTujA4Fh7bo8SuLjZoXKb/GFzL77ecvfrE=; b=lfF500+InmVCPBvNjTr6IeUoQaYErAsDyhjyyO1ht4WpgvfZx29Ecj61H8anoVFJBi QvFi8hAMGq0HCI1RRjh2kurKWjgdJeaj6A7tTHtwkoJDfMDrsegpFIIpuOK4HM1uPA9c JgzT04uz49i1AQFghezQJY6DM6REMOJila8eZCAtEJ7kmbpjWAV/HE2DJoMuEZcdc/f8 rq61ZikW9P1W13eqDfMZuQTC3KgGMIVPDn3Ez6YYUNe4Eiufm4N/2aQpBR0B9wodrq2l B/I9j2ENQO+G19N2tm0pqTBvjzMKeU7MJtc6A3uhZd+m7nW7coLKtQovGGjPjpgKSspW 1YPQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=o7r4zpzX; 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:fe08::620 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0620.outbound.protection.outlook.com. [2a01:111:f400:fe08::620]) by gmr-mx.google.com with ESMTPS id p6-20020a05600c358600b0038e5649eef4si310251wmq.2.2022.04.22.02.06.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2022 02:06:16 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe08::620 as permitted sender) client-ip=2a01:111:f400:fe08::620; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NwG3t4mJSXcTHdg6pZeIori23wd1F9+vppyV+7HwAvKNOEILIW3fkRYut1ByFKTfseN/Q5kuLrlxr2m3u/rvYOXQuNKibZURnvtNgvRyotuez67nEhuHiE9iutq/B00UOSEy0HMS5rDVjjj8qdPo+xrzBmJf5TbVWA8Kh5cGmLkqThnEm7Uy8svcAbUYevBRJNmGy6Fzk+bshtv99oHcbPQzfcPG+iu+JHCjQmw4yxRQc6U03fBXOik6rtmgxTmQesg4BQTkEjA7Q4UB3SqbU6CbPK5nYRqzbJkk6zYrHEV99jJ4QxEYkO71LvYca9d/qkqv+9jb4h1bM0k988sQMQ== 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=pmP+IbCu+KTujA4Fh7bo8SuLjZoXKb/GFzL77ecvfrE=; b=kQw82ho6lL8nbfF1ZlOMhmdKO9OsEK2HBkRdx/Ka21RibaYDK7AKYJ2INcsM8iuC/EvO/lE7pOfMxd/tZKaFuvrcvoTc4b1pKU2GQbfPszEkDAt6mm6OaBbNUay+O2jX52QDNaf1yisVDjKKOoKHIjUORsPetCbu6mAbpWrFmevSRfVdwQNndSdCaKq/nzpBovZc+S2fXujTxLuwiy5oDms+qbUzQWVqaLaMVb+5j3uONmU0IodBGk5Xwbq+3X7Kmos1vAOErtWEP8m+x7yJL453jzII3L74Fo4jV683EQCkoyNx1u/TkxreuvzEbHAGb53e/CFZF4xy8V4pxXCx1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) 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 Received: from OL1P279CA0030.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:13::17) by DBAPR10MB4138.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:1b7::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Fri, 22 Apr 2022 09:06:15 +0000 Received: from HE1EUR01FT079.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:13:cafe::c5) by OL1P279CA0030.outlook.office365.com (2603:10a6:e10:13::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13 via Frontend Transport; Fri, 22 Apr 2022 09:06:15 +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 HE1EUR01FT079.mail.protection.outlook.com (10.152.0.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5186.14 via Frontend Transport; Fri, 22 Apr 2022 09:06:15 +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; Fri, 22 Apr 2022 11:06:14 +0200 Received: from localhost.localdomain (167.87.32.223) 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; Fri, 22 Apr 2022 11:06:14 +0200 From: Henning Schild To: isar-users CC: Florian Bezdeka , Felix Moessbauer , Henning Schild Subject: [PATCH v3 0/3] bump bitbake and wic for python 3.10 support Date: Fri, 22 Apr 2022 11:05:59 +0200 Message-ID: <20220422090602.21666-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Originating-IP: [167.87.32.223] 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: 5f9baa76-d794-4a17-db5e-08da243f5ad3 X-MS-TrafficTypeDiagnostic: DBAPR10MB4138: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: F3PXjmNm0IIR/rpKoSC1vAnwXceWWgQ5qzvswAoVVoEvk/nE9EPyKx0S4zntmmfA6PTh09sVk3Gb2XGYo8USKeXtBN5+Kt3x9wzrnpmnA0bgis5DzZJiqf0dw1+iDrlfCQJl/RNaxvzhkjpWRpl8cInaoa/xFtO56bK+rxvgL/oCwjFqQwfU4ClsqtV+dl1ijFUdccVqA+7541/rAeac1qOj9vE4obTf2S4JbveObvCoqqdhMEnlk5RlccwIr3hav3pEVF/XlwM9B9647z7deBy5zJ7vE0yBossi+pmggPgrd2lixzuZP9oqZ1v4WAd522izYF6DUfQ2vXPb5cXFDie6qMrt5O9hCB91ExtelGOAUmA+9V1ZvcjPPXs5Dgd2pnINSae/2tGXCMPASNndCpN2mqUSQINeELT2uwn6vrv66db1PLATOe2k7aSD0aRu19pEOOV0PYpNwXsrxdPv1Gb7N6PWBuK8To9/KR9a0NWULCjhRxsw4+41O6Siqw9r/7R7lsKqZ8u3X90NfS0f6MMpgYn+TD967j7Es/VmQp1/UXARg5pR2qizEZ23QBcomq33Yz71zhtAdf8pQo1PjXk/3RT9AIrnYGPA/xHWyBZ/PQTcyr3BR4Y7rwiCe1AuRKLKqGkucJa/JAzZ+6H/21JkgjSyp9lT6jsPxx1plQaMJ56oFU5Q61xPK9z04+USxQ0muZs5634EU0N0e8ly6w== 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)(36840700001)(40470700004)(46966006)(508600001)(356005)(8936002)(70206006)(70586007)(4326008)(8676002)(82310400005)(83380400001)(40460700003)(36756003)(44832011)(36860700001)(81166007)(54906003)(6916009)(1076003)(5660300002)(86362001)(47076005)(16526019)(82960400001)(186003)(2616005)(956004)(336012)(107886003)(2906002)(26005)(316002)(6666004)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 09:06:15.0936 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5f9baa76-d794-4a17-db5e-08da243f5ad3 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: HE1EUR01FT079.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR10MB4138 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=o7r4zpzX; 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:fe08::620 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX diff to v2: add p2 before wic bump debian bookworm switched to python 3.10 recently, our versions of bitbake and wic both have some issues with that new interpreter. All these issues have been fixes in bitbake and OE, so all we need to do is update the two tools in our tree. v1 was send as "[PATCH] bitbake: Update to 1.50.5 release", which is p1 here, only later i found that wic also needs a bump to v2 added p2 If this series is applied we do not need "[PATCH] wic-img: use python3.9 in bookworm", in case this one is applied before it should be reverted after the version bumps. Henning Schild (3): bitbake: Update to 1.50.5 release wic: align our fork of common.wks.inc with wic version we carry wic: Update to the latest revision bitbake/lib/bb/cache.py | 3 +- bitbake/lib/bb/cooker.py | 30 +++++++- bitbake/lib/bb/data_smart.py | 4 +- bitbake/lib/bb/fetch2/__init__.py | 4 + bitbake/lib/bb/fetch2/perforce.py | 2 +- bitbake/lib/bb/fetch2/wget.py | 2 +- bitbake/lib/bb/persist_data.py | 5 +- bitbake/lib/bb/process.py | 2 +- bitbake/lib/bb/runqueue.py | 34 ++++---- bitbake/lib/bb/server/process.py | 2 +- bitbake/lib/bb/tests/fetch.py | 35 +++++---- bitbake/lib/bb/utils.py | 13 +++- bitbake/lib/hashserv/server.py | 4 +- bitbake/lib/toaster/tests/builds/buildtest.py | 2 +- .../lib/wic/canned-wks/common-isar.wks.inc | 2 +- .../wic/plugins/source/bootimg-efi-isar.py | 77 ++++++++++++++++--- .../wic/plugins/source/bootimg-pcbios-isar.py | 6 +- scripts/lib/wic/canned-wks/common.wks.inc | 2 +- scripts/lib/wic/canned-wks/directdisk-gpt.wks | 2 +- scripts/lib/wic/canned-wks/mkefidisk.wks | 2 +- scripts/lib/wic/engine.py | 6 +- scripts/lib/wic/help.py | 10 ++- scripts/lib/wic/ksparser.py | 8 +- scripts/lib/wic/misc.py | 4 +- scripts/lib/wic/partition.py | 25 ++++-- scripts/lib/wic/pluginbase.py | 8 +- scripts/lib/wic/plugins/imager/direct.py | 11 ++- scripts/lib/wic/plugins/source/bootimg-efi.py | 74 +++++++++++++++--- .../lib/wic/plugins/source/bootimg-pcbios.py | 6 +- scripts/lib/wic/plugins/source/rawcopy.py | 35 ++++++++- scripts/lib/wic/plugins/source/rootfs.py | 2 +- scripts/wic | 9 ++- 32 files changed, 321 insertions(+), 110 deletions(-)