From patchwork Wed Nov 4 09:22:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clara Kowalsky X-Patchwork-Id: 5585 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 04 Nov 2026 10:23:06 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-yw1-f191.google.com (mail-yw1-f191.google.com [209.85.128.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6A49N4Y3000489 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 4 Nov 2026 10:23:05 +0100 Received: by mail-yw1-f191.google.com with SMTP id 00721157ae682-8b0d36c1db7sf7982017b3.0 for ; Wed, 04 Nov 2026 01:23:05 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1793784179; cv=pass; d=google.com; s=arc-20260327; b=Hufm4JWK+sUVHCCNQGxoEyL21TPYWp80QQlHSXB4komOKfT8p1GP8xPRGtCWB2+hso pHXA2ozaR8fyssYGvWQSAzuF4Z8Mj8jQi5/t3fIlC5wGwQLqK319t+1O5HYBAo9BCwlb 98dJYBU8BEpKa2a5XPnGRNy2Ofp6THDpM3tUNT9LhXGgAPekRDFq4DD+wVBT8F4fWAYo 0r+M5D0RMbalOid3Qo6JoJ9x2dmIBOTg+jFxhgCaZOSjFtfY4cNWqO/KCJpfXAIZQtRw szvy4FvUtWXqDwQB07lpykeAZ1p0/WdcKUr8u7Lp+DmY0OPEvi1XpbpR6JRe5th06XOM Y3GA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=eO0rjY4+h4WrnI7RSKVpSgPKzs9FaWQbU27rEpwFomY=; fh=FJeT8jvQJLXAnIMANKZNxN50CeHfmWkEjp4Z17f/imU=; b=pCuu+kcNNU98XpRxlDB4M/jzzy8PaSsNFRRKupaeXDMlhZVdhwvwTZVRV+8lVWk1/3 PsKBr/0aVdzmv8zPov/jhR7pQpjPFRGucjq/+zEuT1UO3Yjn79Q/Z7qc93euvh0MJH4q AaGI3mL0ykDSn/j7GiV24SMQkqz9QS6HBtGGmQgNyM/NFihNqzXKWY0zXG8OJHfy9o+t l0I8oL81KoHuRwM+btOtxwmItJz/SISGb2753DXuLkyV7k2DfE2aKcnVEVfJ40EYqrfe IN9EkyiKj5Ch073RHA+h7Fr8J6p5aiKofmAQkaiObE8UFJsOHrubPypyXtWHiIVG5+Gp zxGg==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=fYIIdvoE; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c202::7 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20260707; t=1793784179; x=1794388979; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=eO0rjY4+h4WrnI7RSKVpSgPKzs9FaWQbU27rEpwFomY=; b=Vfxxi8pPopYu+EkjlP7O/Ah83O262N+eQpBY4aM3CiTLVE4Vn9uvXgX60KkcNjUByw 4PBUxbQC9GuCh8bhuoCvZLt/UgoyMUFYY2wTxg8aqu9DpHcZRKOO1OAfF9g/O74d9oij i8ZBl/JrrcFCp6XtXtZYg7XRh5Y9iNmJupi45svC4DT6ZpsNRnH+NFGCuHGee6kZdqhi RixoOYPUUMHe4Ty/0vRtJp35YKZTEgYeo5EniTNUq+0lbsT/2epj8G0HHtcX6gNE2LSy SNY6WlH405LH8fexSvQ5t/ByUul0ZYI2Wc9oKilI4gzcfNawhpYwb+xPu0THp/Ao+FIs 5hNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793784179; x=1794388979; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=eO0rjY4+h4WrnI7RSKVpSgPKzs9FaWQbU27rEpwFomY=; b=SYYo1BL+67KKXrWmq6h7uyplUEvM8dt+CgDNIVNi8h0Jwxpzmha+hG1XqFbaNSl6H8 l5T/UCd54xxoQKrEH6n9m+CRAvIUtgmRGq0goCa+d3TVnXKRWcDj+2RI28S9KJineG38 BYSuHzIheL3yLnMWUIC3C2rIMdKG4Fi9DqLPPRnb/cwiaHsBX24K4mfXKqD6IdX1qy6s 5cSrQxDgD/hGG4pBIuAcw2zZn86E383myKaeY//TH7Y+J1RPKe6Z3zgn+XbTBZI4c2PX 9LDD8D2XyUF/NmSNd8BI/6guN8NM9MQjORVUKhamnaVUewYsVEK8DL4JVVbO4TqhZS2X YaIA== X-Forwarded-Encrypted: i=3; AKwUvBzVL+ffQVxplCSgpr/wKavu3cmTfVh1vSqG8pW3lpxFrb+u5i2VMOK6elyJr5i3NBx75kHgPyc=@isar-build.org X-Gm-Message-State: APuU4Z9wAIpOdODrs7neJnBftJgpZSNNXqgKIhr2kk9pfSkIh3lHCL6K L2z03NCtVJfmS33cdg3HLeHfSfPreoha3sit8Alwgo36C41LV5e8ydM3 X-Received: by 2002:a05:690e:13c9:b0:677:b7a7:ba38 with SMTP id 956f58d0204a3-67ba4c806b6mr14030432d50.14.1793784178982; Wed, 04 Nov 2026 01:22:58 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="ATskLddE96g2VV+HHA/1y9VAYuil2Ue8Esf6vrhHSRNJCh3WYg==" Received: by 2002:a05:690e:400a:b0:668:220d:e7e9 with SMTP id 956f58d0204a3-67bed33ba11ls636288d50.0.-pod-prod-02-us; Wed, 04 Nov 2026 01:22:58 -0800 (PST) X-Received: by 2002:a05:690e:bc6:b0:66d:1877:121b with SMTP id 956f58d0204a3-67ba4ed9d6amr12512784d50.32.1793784177936; Wed, 04 Nov 2026 01:22:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1793784177; cv=pass; d=google.com; s=arc-20260327; b=B2g+jCV81op1z1gMVcpPyg3OqSxfa6cJUm6CkM7W8ZMNcvUok6OEoThSQDW2HsxsP5 LvwebGD+K1Jx8/BBd1bCOHljkrlSsezDjVtLWS4y9/xdImZ6m893PXOY/E8dY1I8AUj6 UlgArxKQdKexM1YuOyC7DQ+XPFBxdAqXrnHGIboUibnbV4nCo6H1BIkklbrjQVSwhWHR bUkUbN1OVLzl8qGV6H2edEXgcElfvTUvbj9CecJrtpTuJS7NWYvTLtJ6Zglz8GKf/RH1 9b/y5VkgaY97dFyROEZfO/LlLDPklGIxzqagxmRKSShfHDMrPaRdGEeIJDK0yXWTobsq n/jQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=XNbfOhuCWk0GmcnYyQG1tVH01OxJLYSXTQ5fhyxQedg=; fh=AqT8zD6jUs4YP+XkSwmnbRYu3wrat9Vyg/xvm1MGQCM=; b=k23jETFmCK2CICfz3JMpWBhNMK756281pKUxh8CYw+rrKR/m+1rKXV+vlBf9s6N1im +fFCUYBlBSwnxTimohdeLdFYAEh28ZmJngGJLK50q0JAWkUZtcDwZIqmU4eXnKB6q2WP 5d7wOx3mL4mtLmZ+j6IDJgeBYGcUJck4k2ynlRsy02p1BccVQV0p9eRtLFzdgEUMpQYn Ki14smaTxG708aUCRCtk06YZfuebxxGQvUAoqkxzo9pFsJpnNXUMeYx7A6u620KHKD92 yXJez2HwOnDpbTszWI3KvV7BGSVZa+yhuLvZQWq0/KrBD5bRiP+v/S2mZipbwQJqXi56 Ik9Q==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=fYIIdvoE; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c202::7 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazlp170130007.outbound.protection.outlook.com. [2a01:111:f403:c202::7]) by gmr-mx.google.com with ESMTPS id 956f58d0204a3-67bedc43846si45146d50.0.2026.11.04.01.22.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2026 01:22:57 -0800 (PST) Received-SPF: pass (google.com: domain of clara.kowalsky@siemens.com designates 2a01:111:f403:c202::7 as permitted sender) client-ip=2a01:111:f403:c202::7; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=W+RKkuEk+I4S7hiSwgIVxn7MZ9vWvNNEldoH8dq4mQ9ApAhN9/GmLUTDOpc41KSB94JL/mZ0oOIQigpm2eEbTCJbsdIe7khhOfgc3ZPIySYAumSRF4jF5lS3NHxQvpAyBR9y3s1id19Jfo9N5EBOdXo60m3iEHGIUdWwM9eco1m6jT8HoXGwyX90DAJEYyj6vUzQSzmuN+5sSUgdpZT/HbUriACQS+eUhdC49ql49Vlip6TAvYErcK9y0BfsJuEDZo2tYuGQF2Ihu1ByRJr6kGB7yn680iNNuEu41OWzkJ+OexZLEmKLaUj+u7gdqESsxt3iyQsoHnRTsvW3IRA3TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=XNbfOhuCWk0GmcnYyQG1tVH01OxJLYSXTQ5fhyxQedg=; b=oI285MxTzTXvV6KjvSlPYQmeLC/HTDkd6UTlc8hejcGc0HVGvLDcnAAAzuNEdrLBu5vaS2C/GISAXNmZdRe8TPf15hT1KMpq2ELHaayF/74aGgBIQ/Nzg1+B1/rJaqff0pUQhyBCumg6fa33wqZ0f1ak3nu9B1zDWT1ybhnl6SOKq5Rtb0kqRCZDPVoYnT0L+KyE0WOACyXKS2VY+Bbx0ox88fesLspR9kYVpbtAT5mYNZc1RFEzdEKakAZL73XCpt01Qsz06d6IfppUFF+UgyUp6CSbbCGewN/ZLDRAi2KXY5loEwFD1C5hdu8SM5Bs279FFyziA+KCKqUaZiIEig== 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 Received: from AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:740::12) by VI0PR10MB8404.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:231::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.9; Wed, 4 Nov 2026 09:22:55 +0000 Received: from AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM ([fe80::527e:14a7:bd3e:86be]) by AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM ([fe80::527e:14a7:bd3e:86be%6]) with mapi id 15.21.0592.009; Wed, 4 Nov 2026 09:22:54 +0000 X-Patchwork-Original-From: "'Clara Kowalsky' via isar-users" From: Clara Kowalsky To: isar-users@googlegroups.com Cc: Clara Kowalsky Subject: [PATCH 1/4] base: replace BitBake's outdated persist_data Date: Wed, 4 Nov 2026 10:22:12 +0100 Message-ID: <20261104092215.3567061-2-clara.kowalsky@siemens.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104092215.3567061-1-clara.kowalsky@siemens.com> References: <20261104092215.3567061-1-clara.kowalsky@siemens.com> X-ClientProxiedBy: FR5P281CA0050.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f0::6) To AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:740::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR10MB9645:EE_|VI0PR10MB8404:EE_ X-MS-Office365-Filtering-Correlation-Id: 247a0688-f6ed-46e9-dfc6-08df3a5534ef X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|366016|1800799024|10067099003|22082099003|18002099003|55112099003|11063799006|261026140227099003|261022105027099003|261102123227099003|56012099006|261026121527099003|261028144727099003|261022075727099003|261021121427099003|261021123027099003|261009223027099003; X-Microsoft-Antispam-Message-Info: P/BVcZxX5nbEQWkHhBwE4NlpwtMiKFRK58HUKFcPTByvn1VnUP/0K1yMKjzk0SidXwxoF4apvKBVI7VBKpyNLP0hM8PkbUYJZwCyS7Ghc+NnErFeWBrlBTDTJ8tai6se9YZjNFF+f/v0uTZ5xSKzE3bOpgALLO1nlPr5S4J/BbrXwSrYv+kv1DdYbfSMP4oGYuF4nHoACZhADVN/iD7ZGxjf/Fq/XVwPilRZmSzR7xHYczsYk2eR+7t9YAHnjdEhzkk2iXHhXwr7VozRv/ro/+2A7CXyXQnqi9PxAd3dxr3Sh7aj+B6OOTKcb2J4j7me4zQoQ3BFu+K0k1DzSd4d1ZvVwmaYIRqyBEa0aXaxHmcYsUtCPVu6RZijY559P8oYHvtOaDRtodqLlQJPbyOIkHHqa1n8c/UgBxaAhEEsvywuG28qSAy3JzFlw0fpYOsx5ZJwkimB3WBmsvEgMQG9jjAunm1yL0VrUc7MMZfVbj2xNNTlDmeNYRZJVAMFIJaS9GFq8ZytyYtFnhX5eRDpIfrb5VJ0470JRfoOjCyeDP1KERX5xVlnpz8xu77oYjDTXfs34J9nJRudXNdN7q9KHiCm2V0yECV8ioTkrF5ZYQqfynBsLVVrvSylkXhBDrq/lHjWD7+HNS6ZcecQoitP3RRaJJUeReewTgVjsPHfF/I= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(23010399003)(366016)(1800799024)(10067099003)(22082099003)(18002099003)(55112099003)(11063799006)(261026140227099003)(261022105027099003)(261102123227099003)(56012099006)(261026121527099003)(261028144727099003)(261022075727099003)(261021121427099003)(261021123027099003)(261009223027099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zfmZs5rrI0RRLYVd/FOsf3qsy4iEwlDpuVjUViEGomisT60ouUbWwAJrKMGY/xnxrwY5KpWBCvSRhGtRRw9Q3WO89Z0QDPSCtD/5za+jnEsO+E+TmDiaktqvsWupo1zMC8p1OdHxIyZ+iBYJXRKlOgyDNmXnE1qpZD7s/g5T+N2PCU0GXYFrbeMpW0fNvysU8BR23xIi6yzxLQO3th0jLcJTLcWUzfP4do4BdpuITOKBZhh0RKccH3SeV4JrhhDnBzH/67lGGjF1BNAfboTltO1GvflNmKv/ENc7foo2pi+5lvJMtoUh+q+KFgIvNAcfljKqo7kKXVyHhznTHZpXvpW7MvBvTyJzOZPeJTm56cxFcM78DKjHQyPPpmr4MwCZ0AkvlPQh7sl/ILMbFpRrZo7FlDxAJdoJc94gVR1Hb+z+oDbqstpknvHQTnM7SvlbTk1FqR995r+NevgBSVKJ//T10wWDrP3zS1AlqlywhPFN5zVXQtViDBJmOzXPU/ufZuW+vqHhsyRPZudrNJomoVzwpJh38NlKxo2FWKmmz3B1hq+oNfeiMqmk1oSvLbygHxhn3NpTM9sISafkd3WBLfBbDUXIVi7zXmFZ9TLkVPKuM2OnUZDg9W32ryja+4Bm8wMMQFuFPOvYhC+OC8hypNewMRvgJlQxxtorJeVzpbnGQrPy6+6tWWMvlUA1sNLDvWH+p9CC4jTNnUbbViOXMkRKHXOG2DlM+jhUftSt84pISJBKV6m34sslgz11TAO72qWnmaAKDwzvRFIID4ZbeEHMuAgmb4epYEUaHgxpmLdkX6yXCMO9STK5fiXEngSZzuTtjHg/dD6k+XzBtuenfvlAjaN2g3sL/zQuhYA6rv6ZQItXBoK6L4RgE2ypLX7RYn9CrUlAFN7F4A7Mo5OMmS6y/pxUkYoyrwbbEtehDEMCGwBjJ2+qsI7DvHwRejTrYJUSF/1/9SaItdsVrtYbd7X41axs/HXzcxZD0tDgMDRLa2PaZXkA+aiDTT0+zWKo3XIlXZJV4HwDL8ewbFibVhQJh0zQ49KEyVBUvYKvApH3j6RZ5mHQa9+dSHFquQuyL4kE81Vx0mRX4xgnaALHoriItu7Y5AwyVddOAh5lgMk3WF7DtWERvQ7+s+vgZHzsGDunBGXXJZ+aK6MMsu4+ta+getkd+f/uREA2Gk6WrZJo6Fc95RloyTXEvK+s5pTY58gjKatsmILWulwpwv5Vc/76CBkG1qySgWldLILHeTRo88Li2xGdgh/VWVemmMME4Bz1Mi4U4N9OVnpwm6Du6cHH45Q70+pIeNAcRP8KROrcUu4U4HyRTn+hxd9bCigGNQSCCZguWxipbJC4oZNCOTd+OTBF4vyRTHqjtuzqNiBYnYEelymlom6sSEMDgOOockT03Jk59Kjt0qnMldckwWbzaI6plMk8/gabFIDaQb/NBRyxHJPy5yyEFd0hw44tHDk2ercGcm2zzKsY8ZBQp8jqudPLH9fPlCcq8yMpjP8fkjueL4RqoEFVI+D7kntDFqVR4kAtk9iiK+Aew/dzKnJsW8KWVWn9aMmfIwcTA7o876zb/BZQfd81Ba09Iz4bhBy6QkO2adbDf8fxzr6o28/TB2FnlCH5FGUK2jHp7phQUgcOfTyEJwt1/D1Y+wKDO1yVhp3akTc0cs3KCRoAfTUuW3oIQO1YBHU3nC2RcVMws7Rj+FFbq/n93vq/Pd7PbCA7sweY2U242qYAX+2BUVJRrox0fwn2HfJN3vSFUKg= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 247a0688-f6ed-46e9-dfc6-08df3a5534ef X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2026 09:22:54.5298 (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: nMYwy3ttKu0fNXdQ/gAoIdC1GGTj8ZMh3wJvVMPoaFWeKepjbgxmbXXMXz4SkF4u1/kTMEeSGL6cKt8gj02IqBeaV2Wro7GfbW1wHmHp1ic= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR10MB8404 X-Original-Sender: clara.kowalsky@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=fYIIdvoE; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c202::7 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Clara Kowalsky Reply-To: Clara Kowalsky 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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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: =?utf-8?q?INBOX?= Isar uses a persistent UUID to distinguish build-specific resources, including sbuild chroot names. The UUID must remain stable throughout a BitBake run, so parallel builds using separate PID namespaces do not clash on external mountpoints. It must also be shared across multiconfigs and cleared when the build completes. Isar currently stores the UUID through bb.persist_data.persist, which is removed in BitBake v2.9.2 commit 681a7516 ("persist_data: Remove it") from October 2024. Persist the UUID in a file under PERSISTENT_DIR instead. Use BitBake's file-locking helper when reading, creating and clearing it to ensure concurrent processes share the same UUID. Clear it on the default BuildCompleted event, so the next run receives a fresh UUID. Add unittests for UUID reuse across calls and multiconfigs, cleanup and concurrent access. Signed-off-by: Clara Kowalsky --- meta/classes-global/base.bbclass | 25 +++++-- meta/classes-global/isar-events.bbclass | 2 +- testsuite/unittests/test_build_uuid.py | 89 +++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 7 deletions(-) create mode 100644 testsuite/unittests/test_build_uuid.py diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 3d5d1c12..c61e59b4 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -341,12 +341,25 @@ def base_set_filespath(path, d): def calculate_build_uuid(d): import uuid - uuid_data = bb.persist_data.persist('BB_ISAR_UUID_DATA', d) - if "uuid" not in uuid_data or not uuid_data["uuid"]: - # Generate new UUID - uuid_data["uuid"] = str(uuid.uuid4()) - - return uuid_data["uuid"] + uuid_file = os.path.join(d.getVar('PERSISTENT_DIR'), 'isar-build-uuid') + with bb.utils.fileslocked([uuid_file + '.lock']): + try: + with open(uuid_file) as file: + build_uuid = file.read().strip() + except FileNotFoundError: + build_uuid = '' + + if not build_uuid: + build_uuid = str(uuid.uuid4()) + with open(uuid_file, 'w') as file: + file.write(build_uuid + '\n') + + return build_uuid + +def clear_build_uuid(d): + uuid_file = os.path.join(d.getVar('PERSISTENT_DIR'), 'isar-build-uuid') + with bb.utils.fileslocked([uuid_file + '.lock']): + bb.utils.remove(uuid_file) # Unique ID for this build, used to avoid name clashes on external mountpoints # When running parallel builds in different PID namespaces diff --git a/meta/classes-global/isar-events.bbclass b/meta/classes-global/isar-events.bbclass index 15bfdb99..cfe6d7dd 100644 --- a/meta/classes-global/isar-events.bbclass +++ b/meta/classes-global/isar-events.bbclass @@ -85,7 +85,7 @@ python build_completed() { bb.error(str(e)) # Cleanup build UUID, the next bitbake run will generate new one - bb.persist_data.persist('BB_ISAR_UUID_DATA', d).clear() + bb.utils.exec_flat_python_func('clear_build_uuid', d) } build_completed[eventmask] = "bb.event.BuildCompleted" diff --git a/testsuite/unittests/test_build_uuid.py b/testsuite/unittests/test_build_uuid.py new file mode 100644 index 00000000..374cce64 --- /dev/null +++ b/testsuite/unittests/test_build_uuid.py @@ -0,0 +1,89 @@ +# This software is a part of Isar. +# Copyright (C) Siemens AG, 2026 +# +# SPDX-License-Identifier: MIT + +import multiprocessing +import os +import sys +import tempfile +import unittest +import uuid +from pathlib import Path + +root = Path(__file__).resolve().parents[2] +sys.path.extend([ + str(root / 'bitbake/lib'), + str(root / 'meta/lib'), +]) + +import bb +import bb.data +import bb.utils +from bb.parse import handle + + +data = bb.data.init() +data.setVar('BBPATH', f'{root}/meta:{root}/bitbake') +data.setVar('__bbclasstype', 'global') +parsed = handle(str(root / 'meta/classes-global/base.bbclass'), data) +namespace = {'bb': bb, 'os': os} +exec(parsed['calculate_build_uuid'], namespace) +exec(parsed['clear_build_uuid'], namespace) +calculate_build_uuid = namespace['calculate_build_uuid'] +clear_build_uuid = namespace['clear_build_uuid'] + + +def calculate_in_worker(persistent_dir, start, results): + data = bb.data.init() + data.setVar('PERSISTENT_DIR', persistent_dir) + start.wait() + results.put(calculate_build_uuid(data)) + + +class TestBuildUUID(unittest.TestCase): + def setUp(self): + directory = tempfile.TemporaryDirectory() + self.addCleanup(directory.cleanup) + self.persistent_dir = os.path.join(directory.name, 'cache') + self.data = bb.data.init() + self.data.setVar('PERSISTENT_DIR', self.persistent_dir) + + def test_uuid_is_reused_across_calls_and_multiconfigs(self): + build_uuid = calculate_build_uuid(self.data) + self.assertEqual(str(uuid.UUID(build_uuid)), build_uuid) + self.assertEqual(calculate_build_uuid(self.data), build_uuid) + other_config = self.data.createCopy() + other_config.setVar('BB_CURRENT_MC', 'other') + self.assertEqual(calculate_build_uuid(other_config), build_uuid) + clear_build_uuid(self.data) + self.assertNotEqual(calculate_build_uuid(self.data), build_uuid) + + def test_concurrent_workers_share_uuid(self): + context = multiprocessing.get_context('fork') + start = context.Event() + results = context.Queue() + workers = [ + context.Process( + target=calculate_in_worker, + args=(self.persistent_dir, start, results), + ) + for _ in range(8) + ] + try: + for worker in workers: + worker.start() + start.set() + values = [results.get(timeout=15) for worker in workers] + for worker in workers: + worker.join(timeout=15) + self.assertEqual(worker.exitcode, 0) + self.assertEqual(len(set(values)), 1) + self.assertEqual(values[0], calculate_build_uuid(self.data)) + finally: + for worker in workers: + if worker.is_alive(): + worker.terminate() + worker.join(timeout=15) + results.close() + results.join_thread() From patchwork Wed Nov 4 09:22:13 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clara Kowalsky X-Patchwork-Id: 5586 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 04 Nov 2026 10:23:09 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f60.google.com (mail-oo1-f60.google.com [209.85.161.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6A49N8PH000581 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 4 Nov 2026 10:23:08 +0100 Received: by mail-oo1-f60.google.com with SMTP id 006d021491bc7-6f4d828b9eesf341036eaf.1 for ; Wed, 04 Nov 2026 01:23:08 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1793784182; cv=pass; d=google.com; s=arc-20260327; b=BMUs/yjkhZWe1u2Y/O8qLDc88+VU3MHYiTAxFNO3uMeDH20GNC0PtRbptyoJzwI4aS +dhlV7yIXKBXDQg5qNoJoNAyjFQcW0+cuQul6N5WSooVxDSMNyvY3TU+bjjVHyonq5bU iZtshV4oo2JzN1VgTUI7y2VeZjWioAiFBRP7GMcWoeHtlu5KVruDnNSsvsPmc1S69GH+ BGJ0a9W3c4+nJawPLSazJ8VB0XnAcVgVLN+I2aVUv97OIhvXb+k4UxT4PZwhwKZH7CoU 013yiIOz3y+4Qq4tkXiiF3CexqZrEsrsGLmemARIx99TXP2SY8VwOp/AqS58rLy0DK66 GlCw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=tuPnalK23g34iNmVhEzLGIVSQBFslCQgVlhM6grLE2Q=; fh=8iahpRdWIVtgImmuUSd9ZvuiiB/faYwbTTCw3LK27KI=; b=l6zGD5dJPy2suf/xFmDXcv3Ya/NEkP8QupvtpfIREdm09HtdNNWow0b1r82Ev6lQMX n7DN16HUHSlQ0M7RmpLvg3cUNZ+vlw0lnecr8tj5B9zvapdJk1qiBznbzTNfZj6TkyJR QtRDBXnADY9krt0i2XmV4fJdZ0p9/gaImisHF27sME7tlotmRE8s5HbU43gPxb6jzKvW mZdQNv91CCt1DGGdDlzgluhOsZAED5ZuN1UGM4CU5eNzQY7YR8sgINyRd2Ld5PPbx/9L JxXy/MFgyvafK6m21e6ujGtnMbkiAkURYMMjGZ6RUE8ufzIKTB6AJTBSFd+vicueZA5s g0Eg==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=VQzGH0FB; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c201::1 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20260707; t=1793784182; x=1794388982; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=tuPnalK23g34iNmVhEzLGIVSQBFslCQgVlhM6grLE2Q=; b=q6xc0A3RVUsGXoCxiTpCRRsNvdKe2IEgt1Twn/7rNYMWV96sb+FqWkG07Gw7k4961D 2mFYmBTVJGJENVSz1gdfA0wU93akwZv/UGkq2WYS3+tYXVkivEDFSISyo1sQxtIIK5QB VVrUgZdB+FPpxuRLVR3dFm78q1C0Bg0obXKZuK+qy6/EblDYyGkbQJWJnGSaH8kOXSzP YkkF3maH1sav+5yYSNPEa7oXJ9svh5Mv3UNlw31+lyDM8lh+fOw2YdbNAITXoSMhLKDu c9/3dZRKDQdEsOQ7Fg3GfXltDRyoFpnZEUf26omxvQWgWC8aKzBmK0kMNF+TjpttPsL6 uygA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793784182; x=1794388982; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=tuPnalK23g34iNmVhEzLGIVSQBFslCQgVlhM6grLE2Q=; b=yKtSGypkBkqF+FmUFssUblJyYEK4ClLs7OsMf8VNUA13dm3QYbyGcreSuACyOPbEDF nvhkZz6FXisKEgpf9h4L/q3LQ7nrZ7+5iedWS3O/xYxf4Psjuqw1MoZrPh9QW2RLAdWS IBQw7LO0QEb9KcguFw15808RMtK7t7prH9V30vh8ICLkeXphe0wgA++eXnpq7tm7vIjl 7TQi+KbTfFLtiDSMvMMxSDqWMyuSHQc9AUUbLkFDkTMy5uXj8nCd9aQJWkec7sBYJP8L in8RrQW/LidpmQ80Ut9RqZ8TW9o8RT4755NZzIG0YCbFWB8gAPX5ETcaq1xAQAflylGl szJA== X-Forwarded-Encrypted: i=3; AKwUvBznNJZiBvRBztIolbr9v7TnJwaqi03DarAsooNwj9ci91s4/4nPxr23wuW2YuUuhHJMrNfeRxg=@isar-build.org X-Gm-Message-State: APuU4Z8u6brYlVLl061c0NQJllUCr4B+JCh6H3R2rtsMWzlfOih0Gt0L XRiqgx4rMDl/SfMIg5eg98lin+ILAGuuIuMxeb5Ji/CSMsYZqbcUpf0S X-Received: by 2002:a05:6820:3397:20b0:713:f236:a78d with SMTP id 006d021491bc7-714f29b13a3mr6192998eaf.54.1793784182299; Wed, 04 Nov 2026 01:23:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="ATskLddr+QgqRjFYadv8nRJrTNLGW766XaBBvsvkJsXSLd9O6A==" Received: by 2002:a05:6820:a649:20b0:70e:177b:eb5e with SMTP id 006d021491bc7-716c01e1bafls102031eaf.1.-pod-prod-04-us; Wed, 04 Nov 2026 01:23:01 -0800 (PST) X-Received: by 2002:a05:6830:440e:b0:804:ec69:3979 with SMTP id 46e09a7af769-85d3662422cmr10398266a34.21.1793784181642; Wed, 04 Nov 2026 01:23:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1793784181; cv=pass; d=google.com; s=arc-20260327; b=ZS7nuYNR0iqEAUfGn9eHBgKqZ0mnyD6y/16mup7g1ywHoqJVrNaM1fgHEAZuUji3IQ elu0EaddFT0SoeCgb9ekDXzewXUREpSQ5Y0yivXxrJ4TIeS1JwakRHXJv3kmWCwkQSMx oyKhzbCj5QHu5pxcEQMJvBN96JdHrjk00Q38SP71xir0aG9zIIgxjkfL3ngYpam2VK4z 6pcLt/sOKj8nenA7R0/LG8KaZvLu59Vi7vaI04AheoPyXr3RFivfW/cwqGm5ecjGGlLY X4Ndlyev4lETkag8cPLrJIF5C+EInq6HWYzYEcw++4lDL7QxrBG4Y+Ppd91OriZhJQWB L4+Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=0obP1wx+i+ATPMYaTtgwTQGNdZ6zJ0+oCAbDkkZ8rnk=; fh=AqT8zD6jUs4YP+XkSwmnbRYu3wrat9Vyg/xvm1MGQCM=; b=PH/FyFWYTOnt6xOgxlMW0W2t5SCwnZ12ECznfUg2bCfh739Vz87fxXuGRhzc9MOWBn 788MY8fLTE+0Zgoi2GWmfIai5Oa/MOrTKi0mqIRPiz82ToAgH7SpFdoXQOgZTHcdaUDH e2apq5ErtO17izC+xIP47/AiSBP3iMhOj6IBJoz74c1chgyvgFnGJvH2Gm2jK1SBBL/a sH0LKwRhtARr5gQRt0IkdCJamT8bmjW25HIk+5vi4dREAB/vGRnsbL654nhlTaJzyqy8 RdnuXFRWJ6Ef53XlXqiWdL7VDzzFIGhlAGudPOlGz3fdn9UeGPX8bAWDEhlTzEx/jImY tx4Q==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=VQzGH0FB; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c201::1 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazlp170100001.outbound.protection.outlook.com. [2a01:111:f403:c201::1]) by gmr-mx.google.com with ESMTPS id 46e09a7af769-85ef37d073bsi35293a34.0.2026.11.04.01.23.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2026 01:23:01 -0800 (PST) Received-SPF: pass (google.com: domain of clara.kowalsky@siemens.com designates 2a01:111:f403:c201::1 as permitted sender) client-ip=2a01:111:f403:c201::1; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vtZ8mnqPk2HN47lk41lmkgwvbAitEiM17vql1ANvzBQx3jWc6UjjuQlG6haTPx9yCrjt6NQKhOJdScfqUSdM8sgKFfqeugUOWJ65IbPGv4orwoKZr2jgfCDumFMYz+wGNXvvVdvt48PAsqziyUw/q6yI5jz0wrxYvbWzs1tZhn6jw616tz9A5hTAaGsAYSnBEj1OeSgk/tDPcSfjDJcjrueyPoVDJNItpPU8QvW5gDLXeTVTxjEX2/eAoakuKbNbRuNYMk4oer5S+p9nZgLC6FooATS1+FqfLZ0RI9a4YHzKNt/FzwmBegfBZ8n0zU4fg1D89//ik9dhlXYaBAQNhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=0obP1wx+i+ATPMYaTtgwTQGNdZ6zJ0+oCAbDkkZ8rnk=; b=YNdOJIx6iau0jsyjoDKFk8DKU9DgoShr1v3lILan7DWxiJd9D5ywXK25rn+LdalsTbTfw+gO5cyAjhaqzsVSjsJEUpfoOxDMKtgFI+/FYzFbWWyfDtrTCtZh/WnziRk9LkbtqopJ93l+yuWwH/sXHL3tmEgp5q1dRKH19Yiy/Tj0JXLgeIr6suPZLR2qGl/yybtSWzvYM3sqFvkN9MxZ5zCfuxQZ+qCtOxK01YK6BslbxYIS4z4Q0FxlIG6mS2tXIQ/A9Ut6npoXqkBwZ7PaImGZtujl2Fj+yc+vdtoRD5HeLWMFjvHr7CKihVapxv3r1POLTO+M8P5T3C/r3KPF/w== 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 Received: from AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:740::12) by DU4PR10MB8710.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:56c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.10; Wed, 4 Nov 2026 09:22:58 +0000 Received: from AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM ([fe80::527e:14a7:bd3e:86be]) by AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM ([fe80::527e:14a7:bd3e:86be%6]) with mapi id 15.21.0592.009; Wed, 4 Nov 2026 09:22:57 +0000 X-Patchwork-Original-From: "'Clara Kowalsky' via isar-users" From: Clara Kowalsky To: isar-users@googlegroups.com Cc: Clara Kowalsky Subject: [PATCH 2/4] isar-events: preserve cleanup for default multiconfig Date: Wed, 4 Nov 2026 10:22:13 +0100 Message-ID: <20261104092215.3567061-3-clara.kowalsky@siemens.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104092215.3567061-1-clara.kowalsky@siemens.com> References: <20261104092215.3567061-1-clara.kowalsky@siemens.com> X-ClientProxiedBy: FR5P281CA0050.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f0::6) To AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:740::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR10MB9645:EE_|DU4PR10MB8710:EE_ X-MS-Office365-Filtering-Correlation-Id: febf622d-d157-41f2-c2f9-08df3a55368d X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|23010399003|376014|11063799006|56012099006|261021123027099003|261021121427099003|261009223027099003|261102123227099003|261022075727099003|261022105027099003|261026140227099003|261028144727099003|10067099003|55112099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: Gsszp+Fyd+OdhvmLGJA1zrJGGYQOKVMQseNRR+gpHBynP20eXE+k9xp+srSLkYMPJB5gdAMbiQxPY5lW/5Jn1OS7KnnSmXoENWlZRjOC/rr/nd0T+pFj0sUGa5JRX+8kkTPo/2CZW3FKGBENRUOF5QJZWzpNt+qWBHQw8fPANrixaUdnQHxaVNLsCEGll+TSKiUiUXEsjvqLAhTXukzKfTb7JRK8vgVBSTdj6PsSmcdkZCorwFznggm+qNw6dVco1r/7T2pmQHkEK5/dM6cn2MlmZCxhL2MLul+cQWD4jlNiBnXIQf/PUK+5SrAeudzNGudvD3XJJCWdz9dfPWL1f6Ljwi5vgOlIgqbBfCtw/yxUXfjWJEVodLxkWrJvAinqzQvzUckMaUY8fZ4gIDt/6DgH+/ElO7SBMvfpkBGSNt5a7tDOKTgdrkfzwG6hAv6r8jT1aJ8PEpJlWPBYB3GfSdl6o+9VyAYTE0/SaukEipO0iPuMXIoxk3Y/IZoWjNwsmSOCy5axlJLU5HzAcvTvL6qhPuCVh/6RrGdMIPZB4OPlWmXZ8dwPzTLv0cUtAdtvmXISDrIEO2WbviNhiGe8H9yJX8scYtnjB0ga6GfVKDQhKrioEIswkj8DeWxbpUK94PGv2Zj/BV2vlmk65SYW/Zln8kfBW9Arv1uGG5N7Cuk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(23010399003)(376014)(11063799006)(56012099006)(261021123027099003)(261021121427099003)(261009223027099003)(261102123227099003)(261022075727099003)(261022105027099003)(261026140227099003)(261028144727099003)(10067099003)(55112099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EE4cwRayiXSkVlZhYaSWhSAIrYQIvo0z++G4S3gUsLUTMkcHERbSN/jx08k+QHXbY7g4+ikrQ7KgmBMC5T8BeYeWU84YqjFvYrn0b+MGgxifoaUuLnQfZtdc+ncuThBLJ3rLs4RgN+9XQXkv4Q+gxfHZx3TGfvl2qo3Yg2j5rRYToWu39aIhtfSO0IAz+LCJB9M9d3mHiakzjjkvjKL1Dm8Knt08B1cZ/FFppWKgyqp5O+wLo8pgE/g9ffPLPFxrVMc84f3p/7eLzMntbA5rsVxN4TVHMlP73NpamIOBU3NBbwpfLvQuhztYNS4hJzI/9LQu0gdyuwt28z1ZzVfcTigHAecz5l6EHVjytS2SGQzqHd/p+ZMUsWLlY0Jw+dwfgSzWC+iv0nRXyVXo+ufVLlg5rrf8+KEUT6xSCjvePFEziltg1eUJDUHXta4qf+5c7ZM5CFi6rtwjjlFJlf6diw7Ii5U13XiuGFEJSZo5B13A4Q9TGedMEw91IurQwbzz92cAqbgPZc5CIvfDCzOMrCDdbkk+WQx33iHuBxhOD0H2fFB5BRI4G56RxEjTgnM0OT9DptwaVMsgrpw6oshuKLq7Cv+xjyunnPKKZlQR37Wq8PWnHOvqKFccEW91PWNRYkXt4MOt8D2Mk3YwqcF0vBgqO23gIN29fT0HQQ2oZPSdi3fXvuK98o3IKVchtRn2kpC7jl6gUeP5b5TZEp/zQJV9OagKTSdplbt31Ik5G2xPDVkCdHh3hR9r5YuklincbBc9AqqZhepYD/G26tD1LNR6OvfOijS99gcWdkN1qNjDFPkrBSTAMznANL+GWYLZ44WL0MsHxP/f5i+DpI6qt4JclEtVhqJ0m28pCEvz2knQMQKYpaKY/X9i/o/qx0OiKoOLvDuwjK3RECg0wV8tYWmJJZX6Idws/U4hTfYSNp3qvJWASkVm+8Pwh0DE1n9bobCu/W3oyDXAqiI1WnhMc5x9/2XOcvitFBIFl30SuCuDwjtxSRx/B/jz5scDnoYYJ9MJkdkXurtk/ncgce7ZOWwgV5+qW1DAT8pqw0ZK5PSZtll4xTc+E9agFKhkvXHAqo1kcS3LyDbJZJztoBx/tRtOtaw2yOwbD5XJvM7gKH/rWmezh+Y1NpU/mdaxHS7ICmJKID9Kg89IVcoZkOU2geQEdy/j96WxUJC4Xb5LUDKdNGB82QIFZYGNCi0moCvPN6uJt9JCDyei9jwFnCotHiZp+uFZzxV0/LGPh0Qc0b7ulKsas+CxEB5wgxr773St6UUXGEXkgyaIxlcrcmSvBJqxvIP0K0j/TK4wrT84/D1qSAUJk9nVjUbYyDhlfOAlYrfRP5mfMbw6rUlraChVVZey4858rqDiRjJlv7qndE8EgEpSiGLGHWEU5G9aYMlwoi+WChCJR3yuTOGYz6vQacuw89jr7JEXa+sinuHRrqroqmaSY+pUv3TY3ExBbkME1w82mO425gpTNmViFXoixSC8BbrZ8CAe3nIZXdU7+64rKJ2RGQxbbMHxOoHkBaG/iHSo5yasLuo2tSmhuKs1fyAc2Vmft+cad4QKSg3sExX5FmnLsJ8KgrzJr/MpGXCvYVHdoNHOqaDcJF/f9v2mDDbImUFBGeYErzxXbmyrSb71zpGHocd3Yb0pPVDvpStCp7qgGLcoE//wv7e2yW2R9u+4s7NuIqAMNLaIjR2CnFS2eeUmHLQWOg4nODWdbVRmlIMVnwyqLFGKG0DV17BZsjSF62POKFFFQy3o2/dpweg= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: febf622d-d157-41f2-c2f9-08df3a55368d X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2026 09:22:57.2489 (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: 5wuW621Zqnm5ZssgBduOmXBiYQyq7591bSzr3KPaYccG4XuTAaXYodo3apBnU1hMIqmkt+CduCCBUccgBMN+d+3jteDkq8eo5Tifx5bqRjU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR10MB8710 X-Original-Sender: clara.kowalsky@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=VQzGH0FB; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c201::1 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Clara Kowalsky Reply-To: Clara Kowalsky 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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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: =?utf-8?q?INBOX?= BitBake v2.9.2 includes commit 0fa0d8d764bb ("cooker/cache: Drop mc 'default' string value") from January 2025, which changes BB_CURRENT_MC for the default multiconfig from "default" to "". The build completion handler checks for "default" before running build-wide cleanup. With the new value, it returns early, leaving mounts behind and the build UUID uncleared. Fix this by accepting both the empty string and the legacy "default" value, which can be dropped once BitBake is updated. Add unittests for both default values and a named multiconfig. Signed-off-by: Clara Kowalsky --- meta/classes-global/isar-events.bbclass | 9 +++------ testsuite/unittests/test_build_uuid.py | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/meta/classes-global/isar-events.bbclass b/meta/classes-global/isar-events.bbclass index cfe6d7dd..9b66796e 100644 --- a/meta/classes-global/isar-events.bbclass +++ b/meta/classes-global/isar-events.bbclass @@ -52,13 +52,10 @@ python build_completed() { if not tmpdir: return - # bitbake calls cleanup for every multiconfig listed in BBMULTICONFIG plus - # one for the entire build. E.g., if BBMULTICONFIG="mc1 mc2 mc3", we call - # "bitbake mc1 mc2", the following cleanups would be called: - # "c1 c2 c3 cdefault". - # Skip running cleanup for additional multiconfigs + # Run cleanup only for the default multiconfig, which is empty on + # newer BitBake. mc = d.getVar('BB_CURRENT_MC') - if mc != 'default': + if mc not in ('', 'default'): return fail_on_cleanup = bb.utils.to_boolean(d.getVar('ISAR_FAIL_ON_CLEANUP')) diff --git a/testsuite/unittests/test_build_uuid.py b/testsuite/unittests/test_build_uuid.py index 374cce64..5d364ed0 100644 --- a/testsuite/unittests/test_build_uuid.py +++ b/testsuite/unittests/test_build_uuid.py @@ -18,6 +18,7 @@ sys.path.extend([ ]) import bb +import bb.build import bb.data import bb.utils from bb.parse import handle @@ -59,6 +60,23 @@ class TestBuildUUID(unittest.TestCase): clear_build_uuid(self.data) self.assertNotEqual(calculate_build_uuid(self.data), build_uuid) + def test_completion_resets_only_default_multiconfig(self): + data = handle( + str(root / 'meta/classes-global/isar-events.bbclass'), self.data + ) + data.setVar('TMPDIR', self.persistent_dir) + data.setVar('T', os.path.join(self.persistent_dir, 'temp')) + for multiconfig, resets_uuid in [ + ('', True), ('default', True), ('other', False) + ]: + with self.subTest(multiconfig=multiconfig): + build_uuid = calculate_build_uuid(data) + data.setVar('BB_CURRENT_MC', multiconfig) + bb.build.exec_func('build_completed', data) + self.assertEqual( + calculate_build_uuid(data) != build_uuid, resets_uuid + ) + def test_concurrent_workers_share_uuid(self): context = multiprocessing.get_context('fork') start = context.Event() From patchwork Wed Nov 4 09:22:14 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clara Kowalsky X-Patchwork-Id: 5587 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 04 Nov 2026 10:23:10 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f63.google.com (mail-qv1-f63.google.com [209.85.219.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6A49N9tp000587 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 4 Nov 2026 10:23:10 +0100 Received: by mail-qv1-f63.google.com with SMTP id 6a1803df08f44-9178ba8eb30sf913346d6.0 for ; Wed, 04 Nov 2026 01:23:10 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1793784184; cv=pass; d=google.com; s=arc-20260327; b=izvQ0A7xbQSktuQtxwDelBigXG2xqBHYHqXCgB/Ql4wDm9Wl/ExfcIGXsU12WBbJIB RXKszJi5FWiX1eEUg9RsAuB1vHTWxGhnOvKZmSbBjeDKg3c+UOKKwiNX306aaP/ho9zQ tGFIlyaSgzR3mSWvrDpcyziIswx8g5JCDzpJdJG32HwXCeMCh+os2HvtBx2MAmShgB+8 X3Z1eDlBZeGTOqn6gXY7ZN9nI1D+wnhgshohVCQkjalIajU1IxNRl2doF4O/R+v+7B/b KlWPxlb6mQ+Jmc4VepFnpmf26up/xtKc73nUs7fiAAU9C5iN6lGctbWfcFJY6uwDBMQ5 brRQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=SqGAmcTJ/ZzVQSDJGb62enl/zFXV7ytpkhHMJZXmqwU=; fh=JGCEtOlYaD9I3eOKethZV0/GwMu3+fjj2hwEozUNB4s=; b=lf7KBs/Y9AhRPYURYJl/hpglA/FDbEJvKKLxeTNq3c/vmPjgci86j60SYEJqag4OvQ qKKLiZVCEkib7eOTHFws/lFaCFfXvE+cA3i2jvWZOBz8TW7CcFwtKGOCzDcN1OO1ViEH nidYz7LqPbEUJziEgAIohVaTLrWcE5Z4IsShVPmWffWd6YKBLOdhZ9yl+f73mkyi/+7d zpPudOooiueij6C4peZC3WvW5uftls3gQHWtP80LregUnQRgwo8kUCpAu7HeHXQdqeEI pWKIE9BQHuvQ/WbpavwVJs693w3TnFbmy+iXs7xH0vZzO1MD3uWF3SluJA57qVgLq5wA s2oA==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZyhWdxFz; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c200::5 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20260707; t=1793784184; x=1794388984; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=SqGAmcTJ/ZzVQSDJGb62enl/zFXV7ytpkhHMJZXmqwU=; b=nWHAzUFbHr4iJura00mtpfoLCo3dZh4JACMSsXD+YxDT8Ja3sgEqmqe8G1YpTwXfes FMIhVdPJBpUjGBpXseinpIPk+rrMR5a5i3SqwmkXBXmEI6IUUm3lavinvnM1zSddMFhw +JbFC2Cb1VGsLYLvVBi3aopLk5ymVpjSBj2jnrKfOE6qrmHdZlTE+1AzdCH1R2iXU0IW D8PDkffXEaNkGmu1fgUu7cyfva9vykeyCdevgPgkqe2oesQE6l3j7WhsKokwqUATLgro HYXDuG4R2/VvFKnrJBDiuihvaC464vkGFRGaMuMP8rTte+uJqahUFGF5GvJO1DqxTmHT /apw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793784184; x=1794388984; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=SqGAmcTJ/ZzVQSDJGb62enl/zFXV7ytpkhHMJZXmqwU=; b=rqCJH0SQwhDYf7Cgoo2oYRhDrAQtshm83EcGp7W6iA1bOuhqZlldM5l/vHHNbSTmoX Pjx3VPB/2WZcMuENpzY+xbPcsC7ro7gn6SZtAJidfhh5VqUCDjO2UjqDKpETNhJzvQS/ 3/LS494iWJKtm2vAZ1Y54Q8zeQfaTrJEOmjNv5Ry1QtXXbzPDtY9Fqepmo3dhcO2DCFS mJcHiNcRgD1axByVj6qfwZ43kxAOzf1XHPx/LYG6khrlKP2ua1SqVoELSVhX3JPvG0c8 QVXhqlpxrgSJWzhDja8kqEj6nPUjKAAXUHnjo/BIN4BwKZrWL7N61UM6Swcv5jknp8nv TW/Q== X-Forwarded-Encrypted: i=3; AKwUvBzie5RFeyZNzMrhReZF7pvRdHAmJ+tVOqbQpRGCSXnNd+pT5TYoJCe8lFgYzv2npN8s5R+4rWI=@isar-build.org X-Gm-Message-State: APuU4Z+wX/i6Ccx5qrQPSfpFnVLgOqjwXkijsv1Xo85dvMeFsoR6prDN xBUExKzqsabP2aH7DwLWobZbxJQbrBUh3DqSd/7SP4N2+XIqHkz8pUik X-Received: by 2002:a05:6214:1943:b0:914:4464:41c4 with SMTP id 6a1803df08f44-91ca4b23661mr323881936d6.4.1793784184013; Wed, 04 Nov 2026 01:23:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="ATskLdcanlSDBGhO2+pAFabWocB8qWigjTQNQ/DVPZhFLIqFoA==" Received: by 2002:ad4:559a:0:b0:91c:2c6b:3b2f with SMTP id 6a1803df08f44-91e7d3ef01fls13031266d6.0.-pod-prod-04-us; Wed, 04 Nov 2026 01:23:03 -0800 (PST) X-Received: by 2002:a05:6214:2f0d:b0:91b:5d39:e140 with SMTP id 6a1803df08f44-91ca4bf3beemr243639346d6.53.1793784183237; Wed, 04 Nov 2026 01:23:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1793784183; cv=pass; d=google.com; s=arc-20260327; b=dRMdGBRd6U1GkNTD8KfoxsXtNgWgTu8pP9iLAfoSJUhnFpOdVULDkCivCiyru3QOOH KCmk3tEs3z9A14Z3qIaq1/93Zje0q1zUxjkHtDMdXX9WrQh7f4UWTvu2Ji3JhCcVYRgt Njz4e/Apyiz1Sr9iErR2qvu7FUAVvPU1M1O25qT2w0vJbE9gqSnyk5E1fQHsRk4kOz1f UFKusvxXmqeYJvr0jU/dVlA4JceRG9Rgt0+czz8AiawYBIgVduOEhinFFkQrXpz6HhVR LaAlA/iNEWJOswKh0RCOBxIhupWp0PHYQcXmU2MGVlNzAacAocR5mont2yPqIzacuvmD ynmQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=W4n67uDQPYgB3xMGG0E3bNEFHOU6TyQ8LXVKDDfRtdE=; fh=AqT8zD6jUs4YP+XkSwmnbRYu3wrat9Vyg/xvm1MGQCM=; b=bkXE6+jj1/pbsIB1TI2VO5BvKmk+Gghu6cqo21DXbf5xZPGwMWZ4rmHpB/X1E35uyK PtkIt31nyRsT/Uh6N4sB1OEWVsplXvBqbNTtccRp9WILRiFhj7s1XId3lE4TGtka4E0/ ZVZ3Anxb7K2R1qXceqmKICSd9QudaWvntrbfMKYLGlvpShRoI13d4PyangE2DepEDoYF ndtdH+HHl2SBOtwfzQimSQ1WUtlO6Gykd4DicOos4hcnN+UrKtUrsJxdZFeopLkphoXW 3UzCeRt4+cc3LHOpkoX74UHg1ltOxpN6LHQ3WJWk9zSJ6H0RyYEkFIhL2FOI3Ifvydft Z3wA==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZyhWdxFz; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c200::5 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazlp170120005.outbound.protection.outlook.com. [2a01:111:f403:c200::5]) by gmr-mx.google.com with ESMTPS id 6a1803df08f44-91e7ec57223si361546d6.11.2026.11.04.01.23.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2026 01:23:03 -0800 (PST) Received-SPF: pass (google.com: domain of clara.kowalsky@siemens.com designates 2a01:111:f403:c200::5 as permitted sender) client-ip=2a01:111:f403:c200::5; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pqa+NpM1PBLf2UbF/8mzD8c/vVJQO6yz4IAh/TebOKHClG8EIM01Eb4bsb2byCK+oFWXrQOuzx7/jRRE8/FlzIW5tvnKLO5Nyn1W5c4h6bQjlh7bVOnIKb3TozO56sccspMitHMfrHUD/3SZGItRg5U8W+2EkYIT9O4ZJYFgBWTA2qaV8h/GogGNxQ6Eg/E6OtlKUxLoGgVW0fSG3XofjZ8iBZSpm97UVGrlA4Y1kBpiP8s96ATv0cpm42xmCWed1/SXiKVdMrGjNSrHuK8VjOTy1eIhlVhDlgSB0YCu+FqK+7QX2giVg7xbW9SeapTF8bMTZUM7GRGAm7EVzK0RYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=W4n67uDQPYgB3xMGG0E3bNEFHOU6TyQ8LXVKDDfRtdE=; b=WaU8pNEo7TfbKNVMO6220rGcqnXmnLd229Zz1gWFqpC1oO36WiWMLDwiA0ps1yjAhow1Rp5VJWIqawF1y9ozMSAN57acyy5XKgZLSvCkIf75eaX2HG+ysyAFvG70TAODKrQhfT7Dienb/Q48Ei+l33jGBrQK/orbUwayJyvOndgCafck3oFfmuByIBczXBkfSocNFujrJBxMFfDA53uHE0B0isU/61jm0kuBLAeFsp6mT0n90ztzN5ATk0giqtdUEd3c8OY2dsL5yFkEBzUXeCtdOiQ+xzB64ya1OhSmGQUDb7BZ+yWVNmZD9rgcyRl90cDEGIDtiq0jhbl74K5msA== 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 Received: from AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:740::12) by AMDPR10MB9501.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:73a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.9; Wed, 4 Nov 2026 09:22:59 +0000 Received: from AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM ([fe80::527e:14a7:bd3e:86be]) by AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM ([fe80::527e:14a7:bd3e:86be%6]) with mapi id 15.21.0592.009; Wed, 4 Nov 2026 09:22:59 +0000 X-Patchwork-Original-From: "'Clara Kowalsky' via isar-users" From: Clara Kowalsky To: isar-users@googlegroups.com Cc: Clara Kowalsky Subject: [PATCH 3/4] isar-events: close /proc/mounts after cleanup Date: Wed, 4 Nov 2026 10:22:14 +0100 Message-ID: <20261104092215.3567061-4-clara.kowalsky@siemens.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104092215.3567061-1-clara.kowalsky@siemens.com> References: <20261104092215.3567061-1-clara.kowalsky@siemens.com> X-ClientProxiedBy: FR5P281CA0050.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f0::6) To AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:740::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR10MB9645:EE_|AMDPR10MB9501:EE_ X-MS-Office365-Filtering-Correlation-Id: 3ebcc170-444e-4a79-a4fe-08df3a5537b8 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|23010399003|376014|1800799024|6133799003|10067099003|22082099003|18002099003|55112099003|56012099006|11063799006|261022105027099003|261102123227099003|261026140227099003|261028144727099003|261026121527099003|261021121427099003|261021123027099003|261009223027099003; X-Microsoft-Antispam-Message-Info: Y11+RknYIVf+h4Ls9PBzopwtiEtyMsrLKa0V/lDmUJcwwBDSHhVLtkcSdjC/gVVpApzGaHR9bNuAn6d5RkSmP7IGeaex8kZ0OCTPqm85fPCKB6EE69Fo6Qec+HhmFLODRC1ERDOHO+ZO9V669PwRnBVAXY7uAW/QZ27w1TQikHJOQEKQyRGDnoVtdtOrkw6XQWhiipSVbPWnW+p0jh4R7Vj76/aJ93SYJ6d6QsCeOWJgFxVlegnzqWq1Teq/JfD50z1dteTLyc0hKl8R3lp8I4k0GkNyMt9X1tTCGqFaG9IVvQKMMKiZpgD4DRPTg/GWet9Cam5NsSUFn/9U5oqoVSE9enDICQ6swnkJHnDLCCG8BhTxG2Bv9tkPmsuzGcU6fcWbVH1NagN32BnpnPYhBEqKQal5gbf9OUiQkD9W4bscUMr/WbZfstUXdECvWYzddwGyNh3P5GYchEdDAfgg9kTRlqK4/aJAyHJOCif9aIaSQNC2RIu0oE6Mxeqh0kJ69dyocn0V7w+eSi4wQFSZSHNQP2GNaquJRpus7TtR56w9VYMOLvHxIio8sYVvXro8t+RJFBwtj7MSGbjQyFQlXEOGcP9eaj5CaJn1ZiXj1O7Oi0rlTY45k9l0n4LNwX18DQ/N95zHY2WbLDs7ChlzMNcmJ1J8OyeDuZ/x9Zi1GoU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(23010399003)(376014)(1800799024)(6133799003)(10067099003)(22082099003)(18002099003)(55112099003)(56012099006)(11063799006)(261022105027099003)(261102123227099003)(261026140227099003)(261028144727099003)(261026121527099003)(261021121427099003)(261021123027099003)(261009223027099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0212wiKpm4GjvswfD4Hc0YXKof0BbMK67NRhSMsDk8DLQkU4qvQ57Cte/Da4UlDU7wvBpnOgcsCRiDxLzJ5P51PHAAuSBptZT78lh5aJdIM4a/WCgTOiQfeUTpCgSi6XBg50nhBAbMKFtzXX2/t/Gvt5nt4pXOlxj39z/YWvgILMi5DvJkGdI1EmRRz6G0mMJJwfi32pQey3R6AY1Y6Vr/PvbxaINtj8CXWVnZcmm43OQusIWpUnmPnvLJpF1PpF52rKERzb1NLxtbqAI2mkFbPECrzCVoiK92oNE/Dh1tvB6JRVeslCy8ojMgJxuPjhmzVVoMWfNZZwAXwQyoSOh90sMLtK5VlcVko1XjcPj3Q9vs96P7B8zL4wNytZJDencvbwNI1wbjfCaET70y049EYtCw89G2UaWEQ6+G88lCkxO65cNfCMTGRLah6iGGpFlVBzSEdjF4MZmtquEDA93MrydgbtTDrZMMOdTNDNv8QiltR4PxmdORcZdVMYNptACz2XHOfrFTmVfKbVBkgnfSBdBtY0F1Z+ExPVdzaSbR2btQtpVdr8urmwgo98Vq5bsIbaYOcKUZJGbdj95ZEBChpmvZw0jG+4m5IVBZjzEE43/sEuYuMpWuHEo8PnK1WyMHtfskS2Rwcm2kTBB5rgAWQ6TCxAhcht1vUZitycACCtofKQ16QbPwGXVyo5e9owiI5W3oPA7o5jMNAETpmDdIsW+pEhKQOJzVe6PZyeYJJoFycBGZ5aQ+2pjPTqD4ar7vwgm1owRGM04OaWJ4/pngwhkzPHTlPzjL1YZsjS3iBNLfpOZzmH1n+1pjo39+htlOlvo+M9bmgVHTY6WL3Dxs7Z65cJbTwT8AU/IBVS7GUpKzLuwU+PWGYyjOIwqlGDsdGEJGv2Y9yVN6/2Bue1opQimAjA8OWFKT5vEFCivujGJVCY1/xEOvK0XWARumMOizHoH1NT5OTzwDjcaXNGXauzLpl3RlZ02lzke03bO3gZzWpfX+KlxnGtCVtly/ZaEN9Zrkhi7uWdlmc8piyT8sFovVLx0cknCYbi1OHX9wk6nAN0prYPwGhr8lJtSXbsI9VIio0rQ1WQiBdja7mXicLxP8KMAtbCrW6APe0/cSd551zLNPktM1mSqI6f5a3fK9dXGBrsIno8PNXW5AE/iGrf96HDZTNiRnBmOhDE1uougHjMSaijivvZUzoi435WTrkarIEGgKdVQwM1jOlNZa0RkO6OuFfHwzpUmBeaSwKcL2SHhJQtIDc2V14n6Ad2hbvmYyuPam+RUGr4fUxYJvHL6R8viqaaN8BW/kZnbK3mJ0pgBMT0ZmZ7k0jtXXN7m4XEO0RK9DdjWFCKa7Gw8BAjMtPLR6LIw5knOrOnjCYHdXyiuibz1N7VM4PALqjSFB4MSP1HBw+U6w9NgRmlxaMvtvmdZ0/aHzW7WGI3PI4RH1fkOMAcqZ+SUG76VD3b6GCpk059qlnSZKfA7/5TwtdsbvW2r+3A76iqE2MTFKd9jW7oWX1sW/CXIUYpN7DVELpp6lUpNdd5zmj98whE9tzPIQLEdNo0BOO/ltiSuA86QJ0fA2GHMxmvkQxOvbkx8CqSD8KLwzcd7l5j4Ws+aEFnFC9DIEm5HmO0tiNM9O7KDutGIG6DrtZdakBlYwRPK1/BjC4Nj6HBxz4L9AEvSlcutkxBjWrr4LEhCabWih7oe2nKVo+nalv4rt5RtAtAnxtjKVGyo+MtBoJVRJG8JPiCBkxrtHm+nSiLoHWD/tQ= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ebcc170-444e-4a79-a4fe-08df3a5537b8 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2026 09:22:59.2231 (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: DbzmhlUriEXIO8Zj5/ym7RdMyuWlHYOB1HzOWM/3vZAAUOQhRvrwdUCn55Qub35/JVKi7sCgXimiIk1/rePVf1LEn5k/N6VWPYmx6cvCPmE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMDPR10MB9501 X-Original-Sender: clara.kowalsky@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZyhWdxFz; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c200::5 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Clara Kowalsky Reply-To: Clara Kowalsky 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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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: =?utf-8?q?INBOX?= Running the UUID unittest: python3 -m unittest discover -s testsuite/unittests \ -p test_build_uuid.py -v emits the warning: /isar/meta/classes-global/isar-events.bbclass:65: ResourceWarning: unclosed file <_io.TextIOWrapper name='/proc/mounts' mode='r' encoding='UTF-8'> The test_completion_resets_only_default_multiconfig exercises the BuildCompleted handler, which reads /proc/mounts using open() without closing the file. Fix this by reading the mount entries within a context manager for deterministic file closure. Fixes: e596cdf97198 ("isar-events: Unhide mounts left behind") Signed-off-by: Clara Kowalsky --- meta/classes-global/isar-events.bbclass | 37 +++++++++++++------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/meta/classes-global/isar-events.bbclass b/meta/classes-global/isar-events.bbclass index 9b66796e..48f5f441 100644 --- a/meta/classes-global/isar-events.bbclass +++ b/meta/classes-global/isar-events.bbclass @@ -62,24 +62,25 @@ python build_completed() { basepath = tmpdir + '/work/' - for line in reversed(list(open('/proc/mounts'))): - if basepath not in line: - continue - msg_line = f"{line.split()[1]} left mounted" - # If bitbake is started manually, bb.warn and bb.error go to stdout; - # with bb.error, bitbake additionally fails the build. Under CI, - # bb.warn and bb.error currently go to a file. - if fail_on_cleanup: - bb.error(msg_line) - else: - msg_line += ', unmounting...' - bb.warn(msg_line) - try: - subprocess.run( - f"sudo umount {line.split()[1]}", shell=True, check=True - ) - except subprocess.CalledProcessError as e: - bb.error(str(e)) + with open('/proc/mounts') as mounts: + for line in reversed(mounts.readlines()): + if basepath not in line: + continue + msg_line = f"{line.split()[1]} left mounted" + # If bitbake is started manually, bb.warn and bb.error go to stdout; + # with bb.error, bitbake additionally fails the build. Under CI, + # bb.warn and bb.error currently go to a file. + if fail_on_cleanup: + bb.error(msg_line) + else: + msg_line += ', unmounting...' + bb.warn(msg_line) + try: + subprocess.run( + f"sudo umount {line.split()[1]}", shell=True, check=True + ) + except subprocess.CalledProcessError as e: + bb.error(str(e)) # Cleanup build UUID, the next bitbake run will generate new one bb.utils.exec_flat_python_func('clear_build_uuid', d) From patchwork Wed Nov 4 09:22:15 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clara Kowalsky X-Patchwork-Id: 5588 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 04 Nov 2026 10:23:13 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f55.google.com (mail-qv1-f55.google.com [209.85.219.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6A49NBFS000680 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 4 Nov 2026 10:23:12 +0100 Received: by mail-qv1-f55.google.com with SMTP id 6a1803df08f44-91b7e7d5f56sf12747936d6.3 for ; Wed, 04 Nov 2026 01:23:12 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1793784186; cv=pass; d=google.com; s=arc-20260327; b=SRn+8l1LE2aEQbCYwS7laWLDQMEnYBIOvB16Npoo3LvDTVfxHR/MrF07aUNlXWC/w1 i+lOp3Zpv6z2K8y1iOC0gzijlLNsTuIHZLBJWZWi3RHt91teDYlZQcMAJmfzmGtGkKMP DEKxn1nqZ0/RiRMjbgwr1or26Cuc4GAhH0auPQ0bTQ2LsRxc99l1bL4cx2R1T02S53zL vxJ/vp6Q95qQyqSWj7/4xOujpq22syQs4nK0F9C4bwDIIuf0umVO8oEFGk/o+HGNp5MW Y9danwYDHWxifxGkOXKO/ANkaImxPAdQcv7z2Ur3/Ym+Fjyu0eM+I30YKKUUlaCDmUhU Rm7g== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=PY1imTE85J/uBHuUJL1HZvtpYdNmzylIQ7Ba2AXH2Uc=; fh=pH4NccjWyqkTzvO/O1vaS7hMvFtIZ/eZSODAkzdgwNg=; b=eqq2QLfR/HQdCHihsRK7p3gz10R044fuTqbz//PrM/yILyB3yg6FYv5YLIWk2swk7V CPr5clj0KeziYSzVtXqA9c0JbZ8FoEN0EzBbWb/Q4HziqWAtEwJ7lydrqddW3BmNLQ3r sGRZ4CFJHFs5fHrP089fVO0A1g+uq/rokf9oNB/ZwbBYp16bI+ab8NVWY27wgN5j+Xa0 xgYLId/+R6ozfK/YtvtmIqKlbmDk+kGWUoCMqcktGqhtYPF+1vbUSNqcIGgl1JppQVk6 ZbXb85Bc8bCBW61nuA8jSq+wpot5JiG4osaidlXu7Z1YzJCXHJ6e72Vhi5kioErhTupO +5zA==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="nbRXmh/T"; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c201::1 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20260707; t=1793784186; x=1794388986; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=PY1imTE85J/uBHuUJL1HZvtpYdNmzylIQ7Ba2AXH2Uc=; b=s2lul0blvSenaEbR7fm6G8RvD3MWkE3XhTMNlh3VLoQJclIUhZGuDxLsfwiRte3/oD wAuG+8MUTKK1w+75CTtcocM8s8c/a0crZI4cfTjvgdAmNREq+ZZx9LofpygkCbts949t fZ/PSrHcRgp8y78u4sAEeIf29XSLYTZDfzG1Ch5vE1V6jRNVl5asL7iT7SV/VZgtSyaw BkRCUwdpACNZRkB7Qv0+/WUIvaNpulqeos1ZhZOyEs8QUdiNR7hioqOns9I2RFFlZ8b6 CKlCr4vur5ehguy0WrTqMUCS+OHR2bwH0DHMYacxCQ0MipJADVZzX9Lq66wtUpwZrzN1 OlMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793784186; x=1794388986; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=PY1imTE85J/uBHuUJL1HZvtpYdNmzylIQ7Ba2AXH2Uc=; b=gtxire5C0+2VzWjvyPvlUs/2OOO0ayZ/jA0hbvaoWGdQJDgyBjEof1EXZtlPFRcEHr 1D/BSqex4iZ2Fmo+AoaBjowrEKZb1FnR4TkNm01liNTwiq8VairCo26F8R65uFf1QvpB GwTpJrgu3RKskgf++NWnWzKVoZcietsiIWzS0zXNI0P8a2ZbD/CiFqZJ4+3f+2DApPHv dYEUcrRZ/IsxK+l7xWqAjm3l8PTbBR8L7ZAX7EuXVGEU9lL0vroJErErfVIkOQj2HosH sdTbwCbyIKHMpmRzB/lqWd4u8u9XamzaVdOTXT5HFIogkWcL7UB2GR7WTaQn2wYNesRh uIEA== X-Forwarded-Encrypted: i=3; AKwUvBwrJkXE4CUoouIuePS+yP/GCC3MTxxGgTmRwtPdyXsrfrTWSznXlcUcOKbZfxOru5YsGIIJINQ=@isar-build.org X-Gm-Message-State: APuU4Z+NfhydclXvIf+fRJbd9M2ri03IF+LF9T8sYPgNDLx7i1vFFCu8 K3kj2Fb6PWDkVoWlVOLcxTICLNctNSjOd9rxSUrZ+nzzDjK86v+i6sYo X-Received: by 2002:a05:6214:2507:b0:91b:9496:6a18 with SMTP id 6a1803df08f44-91ca4b50fc9mr256141266d6.37.1793784185935; Wed, 04 Nov 2026 01:23:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="ATskLdfGjaYTPKKptM8RmVbNX7CQ8dka5Xud/ELn3TI5oW1ySg==" Received: by 2002:a05:6214:d41:b0:914:1182:d90e with SMTP id 6a1803df08f44-91e7d863843ls16491886d6.1.-pod-prod-03-us; Wed, 04 Nov 2026 01:23:04 -0800 (PST) X-Received: by 2002:a05:6102:418d:b0:7a8:2a34:432e with SMTP id ada2fe7eead31-7d072554415mr5540112137.9.1793784184534; Wed, 04 Nov 2026 01:23:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1793784184; cv=pass; d=google.com; s=arc-20260327; b=RuhstWh0YJSOBGIv19ZE/YICCMGvjjTjH2BNoqw9i8wk6m0gfHTl6c8OSXQLJNEbYW zsoNUoc/10gnXX5VtffmquPow5udk57DJ1qjdS2pbpwCkCO2HsehQyPkMkdT5S2T2e1d vJEkG7rq9CMNv+55FrEFIBJUod8KZPG5kARBnmtmdlw3tRD43xTDZc5AnrROs3IZjSvy TkzIXo6G5yf9EWH/O/BYAg/82osuAmv48RRKahkvb5zX3HPTxZ2aKiop1/YHDU6Uf4QV 0pGj0eGCIfj4Shsa/7iG2fiI003Yad6Qv2T1lkqhY1ZeuVu+9IKkFVrd3D7vN83c7Tla qXIg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=XELGVWDAhpIfsRj56o6BAoncBrQN+P02dz2dBxUslKE=; fh=AqT8zD6jUs4YP+XkSwmnbRYu3wrat9Vyg/xvm1MGQCM=; b=WfzZsOFdHsW/BP3LpsBRUA7g02+V5NE1Lizn0Y0MP78IxJGeO61pBbKI1KZmk94hCW QRyLx55InW66eZkuFuZapon5MmaYMhyXFqtcdQwM25SPgzh1i45ye0lF9FLgBaISAgIK XIRJYudZAAWJJmagkqW+5hgCkbd7EXN7A2w7JqeAivlPJRUYw21kldyzEwTYQzafOILU DOP/1JGjtud1AqpoW4FMh05Dwp9F4oWclcDSRhnB87Xod99ndHNNGM8daPOZhIcTUddk A4gnuSULefWZw8vNe8J4RJ/WQUOylHyqCExDkIRL/4FtJD6wOiVHKrnXwDXEPgQWToAs eHRw==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="nbRXmh/T"; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c201::1 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazlp170100001.outbound.protection.outlook.com. [2a01:111:f403:c201::1]) by gmr-mx.google.com with ESMTPS id ada2fe7eead31-7d26fe27be6si38192137.7.2026.11.04.01.23.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2026 01:23:04 -0800 (PST) Received-SPF: pass (google.com: domain of clara.kowalsky@siemens.com designates 2a01:111:f403:c201::1 as permitted sender) client-ip=2a01:111:f403:c201::1; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sFmNr4cIaD8/WjVftL7z7EbV+dfA5COBnthln9DKgn0GiZpLawDPuvilR0GCcHQP08cS487nv22CbMHKKvgN99a9+8rZ1qu3Xj6/bJXz1b/JlmormUPTal8a1RCE+QtgA+au8QnEkYHcs4eV3O4lm7GTdZUIQCJwZyssi1Ck9NT6DTjeUjf/xQOXFOXQHlXxAKjgdqdFqlYDWMnr7uEQLFtsEOuTgwFEvWd2k96U9hPMJjhX5H+HQVWTwA7k2X2erbiQyoMGLsC8SBcuWg9hSUFG9HtuMyH5XvDT0snxC7VA7xvr+2XgbmV057zINvePja8FbUVGyw+DvCFhfRxQ2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=XELGVWDAhpIfsRj56o6BAoncBrQN+P02dz2dBxUslKE=; b=CDmoTyr7R69QbkviZoh1bUe5T9nFYfx/+fB9DMcV1dHjWOrHprk3hOMXRAeEsC2djqqP/pz0eu+MbMGFOiks+YdVWDyut1mo0rVaPkfv2BoE88Cc6dJL4XPz7VHaUh4tyA8+NjWJ/oZWD+rkFSQm3nTpG+UmgL5y+9MhLp36TUCJcp7JY92bRqf1m9III2YMEbh1i6Lu8D+rsOtqt0ED3V8Zi7E3JZfV1ETc41zD0mOuyg+og+uXBD3QdN03BQs94tBovGIV5FxCRU1Ga2mM5M4nj0x7k7CfFlj/jDRJY2Dkie+84Y/FuyR7qqSjoULDLfTbbHlv76jMbFsKrh/Pxg== 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 Received: from AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:740::12) by PA2PR10MB8512.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:419::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.9; Wed, 4 Nov 2026 09:23:02 +0000 Received: from AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM ([fe80::527e:14a7:bd3e:86be]) by AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM ([fe80::527e:14a7:bd3e:86be%6]) with mapi id 15.21.0592.009; Wed, 4 Nov 2026 09:23:01 +0000 X-Patchwork-Original-From: "'Clara Kowalsky' via isar-users" From: Clara Kowalsky To: isar-users@googlegroups.com Cc: Clara Kowalsky Subject: [PATCH 4/4] meta: migrate fetcher references to bb.fetch Date: Wed, 4 Nov 2026 10:22:15 +0100 Message-ID: <20261104092215.3567061-5-clara.kowalsky@siemens.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104092215.3567061-1-clara.kowalsky@siemens.com> References: <20261104092215.3567061-1-clara.kowalsky@siemens.com> X-ClientProxiedBy: FR5P281CA0050.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f0::6) To AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:740::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR10MB9645:EE_|PA2PR10MB8512:EE_ X-MS-Office365-Filtering-Correlation-Id: e4a65d0f-08b9-4b52-31cb-08df3a5538c9 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|23010399003|376014|6133799003|10067099003|22082099003|18002099003|55112099003|56012099006|11063799006|261102130727099003|261022115727099003|261022075727099003|261022105027099003|261022113327099003|261102123227099003|261028144727099003|261026140227099003|261026130827099003|261026135527099003|261026121527099003|261021135927099003|261021133027099003|261021123027099003|261021121427099003|261021130227099003|261009223027099003; X-Microsoft-Antispam-Message-Info: gKUKynqVHEJlQvwWFfabKkrnauZARtXGqut/WkLZvC8KBgjpNKSRTBBgbMLxE1N7HacFsQC6eueNVifXn32w1s6OML1ntQi7LT4Pgbes/aYGACpT8suySmaci6olmdYa7TEqnY2V4kuNERZ9QD8d+S5iWg44E9iyCQsU4uGAZE1kxbhAz0RguU/ZJOST4xhbCYL4tw2pZqSSPL1XKpCWdhTvHSoHcG8umoj9yJEvIa55LRxttplXvN9uxH12rJsZweSysNM0HakeBjobJkoOvs3kWg0gSXu9lwlqTjkrE6Vi4b1rfmRpKzUqu1w//i15V1UktplG0T1xJI9Kg1YNt06rqIoo+NuzvDK0pw3rOWHK0eNy8qEQ8z39aLk8U/7pLdxP6FgF0ImDJv/g5r3IZhuM268KCMezipcfSc0rNtiBeJ20QA0zzC0L1lAOuAtrSgfw3xnr/V7+uDWGrysGez129fctdw6e/I7U5LXxZQMtWDHXpPXqVDNBvoJOEq93VzQoeoAM9KM21BPgoMayli9sx8qyd2k6fhSlqRRkQuDIxu2HEyEwx6vucVu6TCAxKsZcoSrwRZ19gGAgThmwTjRkqiMWKcXFWdfHIAFOpFIlgEYsjrVSlTje6XHNyNnF0cg35PJgI9n74r7KwXb96SZrlBiNXkCMEKUZ48uZA90= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(23010399003)(376014)(6133799003)(10067099003)(22082099003)(18002099003)(55112099003)(56012099006)(11063799006)(261102130727099003)(261022115727099003)(261022075727099003)(261022105027099003)(261022113327099003)(261102123227099003)(261028144727099003)(261026140227099003)(261026130827099003)(261026135527099003)(261026121527099003)(261021135927099003)(261021133027099003)(261021123027099003)(261021121427099003)(261021130227099003)(261009223027099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G3HqACE7IY8aqB9zxkZf851rD1XXr/bqVD7euzkHFtEMJlcF/BxoTJM4PC4IICDKswkEZmgkca7jy0pwHpxKNJqXT1KMUL4bkX4etSCSpynp6eRQPjnM2kQBYnzozz/vcdxSmo2OG7dLPId6ZKsiLH+w/vWspgQ7MbsCos14ny3uOoIQj9im+423YW5fAeWUSS5oel7W/LlyvR3VGWkHLgfb0VqN7wE3fSexCGaPFtEbFqQ9E4cclmnD4BbWikk3DLF7bI0fyt4BwYFjpJIJAzXSNJ4MoCcxdFIyxLCy/GB8RXVlMiXsL/gt904HWyscx8GdhK1DxyjwOjXzKMumdhc2RhMPRo6hBPH+mzvM+xzeQ6BYSdGcF4j0aN/oF1LiI/RFJMfCsMLW9W6Ng5X6VUTHbcmb12WmScIdrTKTVl5giANC9KsAr2OjyHQFPLFvOufQCfzENKwemf2TN41NWqUgBEHIar8H2y9BRMjTpFYnzhXuYreUO3htgIHDLRKQPu+Vat1mJCOuk+xQjsDGq1EEyviRhPwLKcF6aMsyVZP/XgYwoRHZSrcH8eN/W4KfzK1Jeo89h4JvNlIost808TN9cSrn122vBOHk9hF0bT9BS2HsPTiNFpVuT5hCWyfajilLec/65Hcs8RgB7M0knQHXdsqjG/9r3Dfl3nr5Gl7EXy9F88lZtktAN+n3RAwArmXtR4rHQx10wY5Zqm+inBK/lDsCd8CAchMs9aoffIG9yzEr6EQ28RezxAAr2kPnSdTF0H6A8a5EnueLKeTFYYe2QuYsWSF5Rf9tYZrq3i3EGqytn1nKR8Ckoq3Aosxy3cN3x8zpgVZT9WLceF1dg7SKwF8z6FnvFPMSYAQ4jXhoVXh+KklnYSV2ker9Xy1wyPdHZkSCYsl+4gYTepSVW5RTC/2bR/ZnXw+K925VuBI/OEaix27HVe2KyuvZktfiCBBYuS4pp6CrhlrmjJ00HzUo5WS1f+vXndpE1WyB5ZkKKyuN95dVgw38OGOg4aeKEFS/MkvHoHYtkkUs8Jjkv+0iYDQz+CYKTXthdkIuHqIZ8mPrYNSRmGdGf6jW/YYc0o7djrrdhjnpjT60db6+CP3ntCPH724PmK8km6S7GgRxO0S5gF0ekn/dXFNYezzfNlSUmmPdR9hUCaIIqdB8hUg48Id7a3IivxvkEvxgz/3zqNRve63HPXsVFzjDhlOIOZ4kyqxMzAX9/UrVWIb85Mj+/zorClPuE9AlUKM/bCNiTYBU/T72/t9t7d6kCzwePoBrj+tpDpFKbc/TCzZhIp99p27q4n1P9x70IVBRKS4pCrPce+ju20Bb0lYeSqdepmJo0h9bNnx3BCsV+Vq6npzCuXluvi1Lji9loVv/ZdG+/OKchxi/Cy3iVpiHjYhuYaoyOmyegrFbHsf+sNr26IxKY5/aTSK9hC6Eyp9GrI4byf1ejCd+SOvgTS6yjhsJ5vfito/uivUgakHFuf+ja1+6bSu76oBH1QMQN22/O2+BJBccD4e3W/amyNqCkwgfsPIS26iK7qiIv1xPEu5OEehtoV+wEb++8aWXWYGxrS+o1UB5jVZTLtCaY32EbmfTuy/htOXxtk9C/2uQmRGH5A4qCCU1Mcwm2m2o+u5IOdlxt7TT3+tHdhwhhXPEord5EfJv8E6E7sL9rp5JWmwbFbmMdBBtD0wAztNF8Shrb2PYEYrfwuZIIsfpPrOvccCb6Vu6sgn+quslby9QMWiKQaSXWvxoLXDCgjLmYMFKgUw= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4a65d0f-08b9-4b52-31cb-08df3a5538c9 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB9645.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2026 09:23:01.0112 (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: CugEnUHIPZfXzfMaBcweWzqXQLDnwkMaewtxqZxVxjKR9YJcGSyHPtmE9Jh9TnhtlH8VYppD5q9S/O7+JD2uXao48mPpLTrM24+/tu4CKVM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA2PR10MB8512 X-Original-Sender: clara.kowalsky@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="nbRXmh/T"; 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 clara.kowalsky@siemens.com designates 2a01:111:f403:c201::1 as permitted sender) smtp.mailfrom=clara.kowalsky@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Clara Kowalsky Reply-To: Clara Kowalsky 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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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: =?utf-8?q?INBOX?= BitBake v2.20 includes commit 34ea7cb48090 ("lib: rename fetch2 as fetch; invert compat shim to make bb.fetch2 = bb.fetch"), which renames the fetcher API to bb.fetch and keeps bb.fetch2 only for deprecated compatibility. In preparation for an update of BitBake in Isar, migrate to bb.fetch to avoid relying on a deprecated API. The current BitBake v2.8 already provides bb.fetch as an alias of bb.fetch2, so this change is a pure rename. Signed-off-by: Clara Kowalsky --- meta/classes-global/base.bbclass | 14 +++++++------- meta/classes-global/sstate.bbclass | 14 +++++++------- meta/classes-recipe/bootstrap.bbclass | 4 ++-- meta/classes-recipe/dpkg-base.bbclass | 6 +++--- meta/classes-recipe/dpkg.bbclass | 2 +- meta/conf/bitbake.conf | 6 +++--- meta/lib/aptsrc_fetcher.py | 8 ++++---- meta/lib/container_fetcher.py | 12 ++++++------ meta/lib/oe/patch.py | 10 +++++----- meta/recipes-devtools/base-apt/base-apt.bb | 2 +- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index c61e59b4..54da1421 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -161,7 +161,7 @@ python() { needsrcrev = True if needsrcrev: - d.setVar("SRCPV", "${@bb.fetch2.get_srcrev(d)}") + d.setVar("SRCPV", "${@bb.fetch.get_srcrev(d)}") for e in d.keys(): flags = d.getVarFlags(e) @@ -244,9 +244,9 @@ python do_fetch() { return try: - fetcher = bb.fetch2.Fetch(src_uri, d) + fetcher = bb.fetch.Fetch(src_uri, d) fetcher.download() - except bb.fetch2.BBFetchException as e: + except bb.fetch.BBFetchException as e: bb.fatal(str(e)) } @@ -263,9 +263,9 @@ python do_unpack() { rootdir = d.getVar('WORKDIR') try: - fetcher = bb.fetch2.Fetch(src_uri, d) + fetcher = bb.fetch.Fetch(src_uri, d) fetcher.unpack(rootdir) - except bb.fetch2.BBFetchException as e: + except bb.fetch.BBFetchException as e: bb.fatal(str(e)) } @@ -314,9 +314,9 @@ python do_cleanall() { return try: - fetcher = bb.fetch2.Fetch(src_uri, d) + fetcher = bb.fetch.Fetch(src_uri, d) fetcher.clean() - except bb.fetch2.BBFetchException as e: + except bb.fetch.BBFetchException as e: bb.fatal(str(e)) } diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 76a7b596..4c50f7dd 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -731,7 +731,7 @@ def sstate_package(ss, d): sstate_package[vardepsexclude] += "SSTATE_SIG_KEY" def pstaging_fetch(sstatefetch, d): - import bb.fetch2 + import bb.fetch # Only try and fetch if the user has configured a mirror mirrors = d.getVar('SSTATE_MIRRORS') @@ -766,11 +766,11 @@ def pstaging_fetch(sstatefetch, d): localdata.delVar('SRC_URI') localdata.setVar('SRC_URI', srcuri) try: - fetcher = bb.fetch2.Fetch([srcuri], localdata, cache=False) + fetcher = bb.fetch.Fetch([srcuri], localdata, cache=False) fetcher.checkstatus() fetcher.download() - except bb.fetch2.BBFetchException: + except bb.fetch.BBFetchException: pass def sstate_setscene(d): @@ -1017,7 +1017,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, bb.utils.to_boolean(localdata.getVar('SSTATE_MIRROR_ALLOW_NETWORK')): localdata.delVar('BB_NO_NETWORK') - from bb.fetch2 import FetchConnectionCache + from bb.fetch import FetchConnectionCache def checkstatus_init(): while not connection_cache_pool.full(): connection_cache_pool.put(FetchConnectionCache()) @@ -1039,13 +1039,13 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, import traceback try: - fetcher = bb.fetch2.Fetch(srcuri.split(), localdata2, + fetcher = bb.fetch.Fetch(srcuri.split(), localdata2, connection_cache=connection_cache) fetcher.checkstatus() bb.debug(2, "SState: Successful fetch test for %s" % srcuri) found.add(tid) missed.remove(tid) - except bb.fetch2.FetchError as e: + except bb.fetch.FetchError as e: bb.debug(2, "SState: Unsuccessful fetch test for %s (%s)\n%s" % (srcuri, repr(e), traceback.format_exc())) except Exception as e: bb.error("SState: cannot test %s: %s\n%s" % (srcuri, repr(e), traceback.format_exc())) @@ -1072,7 +1072,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, bb.event.fire(bb.event.ProcessStarted(msg, len(tasklist)), d) # Have to setup the fetcher environment here rather than in each thread as it would race - fetcherenv = bb.fetch2.get_fetcher_environment(d) + fetcherenv = bb.fetch.get_fetcher_environment(d) with bb.utils.environment(**fetcherenv): bb.event.enable_threadlock() import concurrent.futures diff --git a/meta/classes-recipe/bootstrap.bbclass b/meta/classes-recipe/bootstrap.bbclass index c1a59fd2..2671602f 100644 --- a/meta/classes-recipe/bootstrap.bbclass +++ b/meta/classes-recipe/bootstrap.bbclass @@ -45,12 +45,12 @@ python () { distro_bootstrap_keys += own_pub_key.split() for key in distro_bootstrap_keys: - fetcher = bb.fetch2.Fetch([key], d) + fetcher = bb.fetch.Fetch([key], d) filename = os.path.relpath(fetcher.localpath(key), topdir) d.appendVar("DISTRO_BOOTSTRAP_KEYFILES", " ${TOPDIR}/%s" % filename) for key in third_party_apt_keys: - fetcher = bb.fetch2.Fetch([key], d) + fetcher = bb.fetch.Fetch([key], d) filename = os.path.relpath(fetcher.localpath(key), topdir) d.appendVar("THIRD_PARTY_APT_KEYFILES", " ${TOPDIR}/%s" % filename) diff --git a/meta/classes-recipe/dpkg-base.bbclass b/meta/classes-recipe/dpkg-base.bbclass index 4ec0ddbe..a237af8f 100644 --- a/meta/classes-recipe/dpkg-base.bbclass +++ b/meta/classes-recipe/dpkg-base.bbclass @@ -49,7 +49,7 @@ python do_adjust_git() { for src_uri in (d.getVar("SRC_URI") or "").split(): try: - fetcher = bb.fetch2.Fetch([src_uri], d) + fetcher = bb.fetch.Fetch([src_uri], d) ud = fetcher.ud[src_uri] if ud.type != 'git': continue @@ -83,7 +83,7 @@ python do_adjust_git() { bb.note(' '.join(cmd)) if subprocess.call(cmd) != 0: bb.fatal("git alternates adjustment failed") - except bb.fetch2.BBFetchException as e: + except bb.fetch.BBFetchException as e: bb.fatal(str(e)) } @@ -94,7 +94,7 @@ inherit patch addtask patch after do_adjust_git python() { - from bb.fetch2 import methods + from bb.fetch import methods # apt-src fetcher import aptsrc_fetcher diff --git a/meta/classes-recipe/dpkg.bbclass b/meta/classes-recipe/dpkg.bbclass index 35408495..737915b8 100644 --- a/meta/classes-recipe/dpkg.bbclass +++ b/meta/classes-recipe/dpkg.bbclass @@ -75,7 +75,7 @@ dpkg_runbuild() { [ "${var}" = "DEB_BUILD_OPTIONS" ] && continue # Don't warn environment variables exported to the bitbake fetcher - case " ${@" ".join(bb.fetch2.FETCH_EXPORT_VARS)} " in + case " ${@" ".join(bb.fetch.FETCH_EXPORT_VARS)} " in *" ${var} "*) continue;; esac diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index c31719b8..4ffe6d14 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -37,10 +37,10 @@ PR = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[2] or 'r0'}" PROVIDES = "" S = "${WORKDIR}/${P}" SRCREV ??= "INVALID" -AUTOREV = "${@bb.fetch2.get_autorev(d)}" +AUTOREV = "${@bb.fetch.get_autorev(d)}" AUTOREV[vardepvalue] = "${SRCPV}" # Set Dynamically in base.bbclass -# SRCPV = "${@bb.fetch2.get_srcrev(d)}" +# SRCPV = "${@bb.fetch.get_srcrev(d)}" SRCPV[vardepvalue] = "${SRCPV}" SRC_URI = "" STAMPS_DIR ?= "${TMPDIR}/stamps" @@ -50,7 +50,7 @@ SVNDIR = "${DL_DIR}/svn" T = "${WORKDIR}/temp" TMPDIR = "${TOPDIR}/tmp" PERSISTENT_DIR = "${TMPDIR}/cache" -GITPKGV = "${@bb.fetch2.get_srcrev(d, 'gitpkgv_revision')}" +GITPKGV = "${@bb.fetch.get_srcrev(d, 'gitpkgv_revision')}" # Isar specific config WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}/${PV}-${PR}" diff --git a/meta/lib/aptsrc_fetcher.py b/meta/lib/aptsrc_fetcher.py index fe8f1cd3..8de86fce 100644 --- a/meta/lib/aptsrc_fetcher.py +++ b/meta/lib/aptsrc_fetcher.py @@ -3,10 +3,10 @@ # # SPDX-License-Identifier: MIT -from bb.fetch2 import FetchError -from bb.fetch2 import FetchMethod -from bb.fetch2 import logger -from bb.fetch2 import runfetchcmd +from bb.fetch import FetchError +from bb.fetch import FetchMethod +from bb.fetch import logger +from bb.fetch import runfetchcmd import os class AptSrc(FetchMethod): diff --git a/meta/lib/container_fetcher.py b/meta/lib/container_fetcher.py index 52a75ac9..7f9bfdbe 100644 --- a/meta/lib/container_fetcher.py +++ b/meta/lib/container_fetcher.py @@ -7,12 +7,12 @@ import oe.path import os import tempfile import json -from bb.fetch2 import FetchMethod -from bb.fetch2 import logger -from bb.fetch2 import MissingChecksumEvent -from bb.fetch2 import NoChecksumError -from bb.fetch2 import ChecksumError -from bb.fetch2 import runfetchcmd +from bb.fetch import FetchMethod +from bb.fetch import logger +from bb.fetch import MissingChecksumEvent +from bb.fetch import NoChecksumError +from bb.fetch import ChecksumError +from bb.fetch import runfetchcmd class Container(FetchMethod): def supports(self, ud, d): diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 52c0aa4d..a4dda29b 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -92,14 +92,14 @@ class PatchSet(object): if not patch.get("remote"): raise PatchError("Patch file must be specified in patch import.") else: - patch["file"] = bb.fetch2.localpath(patch["remote"], self.d) + patch["file"] = bb.fetch.localpath(patch["remote"], self.d) for param in PatchSet.defaults: if not patch.get(param): patch[param] = PatchSet.defaults[param] if patch.get("remote"): - patch["file"] = self.d.expand(bb.fetch2.localpath(patch["remote"], self.d)) + patch["file"] = self.d.expand(bb.fetch.localpath(patch["remote"], self.d)) patch["filemd5"] = bb.utils.md5_file(patch["file"]) @@ -560,7 +560,7 @@ class GitApplyTree(PatchTree): shutil.rmtree(tempdir) def _need_dirty_check(self): - fetch = bb.fetch2.Fetch([], self.d) + fetch = bb.fetch.Fetch([], self.d) check_dirtyness = False for url in fetch.urls: url_data = fetch.ud[url] @@ -778,7 +778,7 @@ class QuiltTree(PatchSet): if type == "file": import shutil if not patch.get("file") and patch.get("remote"): - patch["file"] = bb.fetch2.localpath(patch["remote"], self.d) + patch["file"] = bb.fetch.localpath(patch["remote"], self.d) shutil.copyfile(patch["quiltfile"], patch["file"]) else: @@ -908,7 +908,7 @@ def patch_path(url, fetch, workdir, expand=True): def src_patches(d, all=False, expand=True): workdir = d.getVar('WORKDIR') - fetch = bb.fetch2.Fetch([], d) + fetch = bb.fetch.Fetch([], d) patches = [] sources = [] for url in fetch.urls: diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index 97e3ae16..d54786ec 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -81,7 +81,7 @@ python do_cache() { for key in d.getVar('BASE_REPO_KEY').split(): d.appendVar("SRC_URI", " %s" % key) - fetcher = bb.fetch2.Fetch([key], d) + fetcher = bb.fetch.Fetch([key], d) filename = fetcher.localpath(key) d.appendVar("KEYFILES", " %s" % filename)