From patchwork Fri Apr 10 13:22:49 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5029 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 10 Apr 2026 15:23:15 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ot1-f64.google.com (mail-ot1-f64.google.com [209.85.210.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 63ADNDrs000342 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 10 Apr 2026 15:23:14 +0200 Received: by mail-ot1-f64.google.com with SMTP id 46e09a7af769-7dbb6b95836sf3802749a34.3 for ; Fri, 10 Apr 2026 06:23:14 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1775827388; cv=pass; d=google.com; s=arc-20240605; b=kHLxk3fiPiryCgyglqvyrO6GOkonB7iBzq+PnmwBTebrPfyLImCSSOKGwNLRasKNrH M66E2ASaGQNVYa5Qw0Vb14a/0TOTsGBDkNJgdBCwPRqB5fOExc+Zjnsqoux0Y/NCuqDo 5JwP2MDWsot4fntYE2Ip7ZD/zoNrIG+LtSuM6RlGzMii/rbj4cO2NkxG2wLM1qhmUh6p nFenGZ7IjKgSVyqwXsTSd41UYLSDwO+48EbxR1tPJNXRPkIYccKhWG6UeKnv0+3TGajh yMl4Enif75ifJDgjk2uVWIXab0OqI0E8g7rbewmqIA9AGFjbIinVqN+ngDMOXZLhbMIE Wmkw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=I1QR35sN7cvfqJw/CdbUUtfzU4RuShZ5Kqm+Ff0U5ko=; fh=tCKJbYKujR8O+3SljdgYpnzKoZMMVxYLpEEeUZDwNSI=; b=eIubcqAwOCP78uSN8oC9SvegBt/gyjc+feIn415fpllHUIveDFSH9qBQajpdWFy/xH NU0D3iB03V9C4ubzoqkTJUCIkKr+zr1Jj6crXAKxRRod6QhZFqmtutMBlAxU4bzqnmsd LUvLX1AE7VSpDHc6l7dCzSAe5aRgPFSAbMcW5pjKmN+qRRuGPid23RdXlnACCjBNNKos yZ+LWbOV4+lJ3aEe2jMgTok7q6p8z7qAChyV8cPO5U1CKWtkUx93edUrqDk5b+yqldDU raoLY/rpPBPYCXhRwuxKkmWydRuFxVNHgUgNKURlGY5gSDWwAl0cuJ8X1nlEAXcR2LcY n+0A==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=HhAzJJ0r; 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 felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) smtp.mailfrom=felix.moessbauer@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=20251104; t=1775827388; x=1776432188; 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 :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=I1QR35sN7cvfqJw/CdbUUtfzU4RuShZ5Kqm+Ff0U5ko=; b=b5xHajy7qHK+C4DUB/H5kfSX6/bSeKmefJBj36AuFsboUR4hp/O71GW+C9qYJlLwzq UcbOL8avgMvr7tV7GMeHhIdOMLDWHyn1PtqnvPkIssVjFi4pMWJWWBjrotvFi45EAhdw Hul8P4pI8kDUKDUGtowhIT5BG/FBnTM+S/YcljVykGxtAY/XLvAT3qnE14O5HIONWLXs /+82opBaugKsgjRwU8bgxKDlaK4cr9vfWQQgAaEeiihy0vZYpo9HhDd77nVvLxxugxY4 SXhPHuYOR3aY8ojU+0Ek+qoPpXf4lpuXOD7f+b1Kp64O58RDMQ/nOv5yhWe50X/89kUm LONA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775827388; x=1776432188; 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 :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; bh=I1QR35sN7cvfqJw/CdbUUtfzU4RuShZ5Kqm+Ff0U5ko=; b=qoXvbPVMgsVUNIh6nb3nwS6sGHXMBxOUtoZo4JMQydZWyCJPcPBrj9fh4stxDfTF15 ArIg7OB9EfI/NwpKznK+lm9D8Wvbi1jB70NquoDjPR4I2IU10dKucSwm8aZF+pZQki5V l6i4B2vKx7C0tJo5ekANg2EhSeM2Tnu0iw9V034kbut4sanX3csuAGtoysZSWvhBe1yV izUGgh7xCCtdHt2GEkgrBQdkt1/ox9PYs5Ibx9Y+CJG9VcokE/RbmFpr9oVpsOzggQAx eb//0ZtD5egWIrNhZJP6Z2a8bawwWdqHlM3jC0DwqyzEaV5MvAGhol50pm4l6ozKrNhS q+uA== X-Forwarded-Encrypted: i=3; AJvYcCVp2TR+9aPZY5uX+xOCu5UHDcH1fu/Mw3EpIRp6t8elzU8NrLV8UNeneGj3JQBdytz9LQv7JTc=@isar-build.org X-Gm-Message-State: AOJu0YxGCWJS+QbVBED/9yQplTat1FJ5s1n4+8CsNPvFnNT9Pav6VvHZ 6cxlh6imtYLRIxehTIxbXx8JZvvySIh0K86n3hnxRb6p1761LSsPvLhe X-Received: by 2002:a05:6808:4f20:b0:467:999:9a14 with SMTP id 5614622812f47-4789f20ae33mr1779599b6e.42.1775827387928; Fri, 10 Apr 2026 06:23:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiJlefLUbqOkhwZZ/s7CtXWRFPdK72/BQ9NnNZicHzUr5w==" Received: by 2002:a05:6870:a092:b0:422:c0f1:a9e4 with SMTP id 586e51a60fabf-423dd0223a3ls422793fac.0.-pod-prod-08-us; Fri, 10 Apr 2026 06:23:07 -0700 (PDT) X-Received: by 2002:a05:6808:1796:b0:467:db23:25c with SMTP id 5614622812f47-4789f9008e6mr1517342b6e.46.1775827387066; Fri, 10 Apr 2026 06:23:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1775827387; cv=pass; d=google.com; s=arc-20240605; b=iNfQLYtXOaupbMJwhUliXWdKwDshXm6xRDGbZ0Ozilb7Fc0vfauEXZ/KEHT+P0+QmP 3VnA2//2Qab8TIKNDgoSb0w4t2PO7xjEWUdO1tuS+vKyZzB+1E3Wi4tW6ZGIDXjB4Ctd O6+WNxCfaz+ho07EDsBZqBSlGstR/Zbqza4NJqi6Rk1BmXmdW1AqvIzf3nYZYtPCWQlB B79M1S9X7U3AqbmFZ1XAP71PrrLGIhr3lmc/tPESRxutgJTRhAkAxUJPEhSRw5D35ig8 QIunRr+QN1kgduCIltImkzEvOWNZ/gqcg3dCooMWyQA7sJkfwgcvT42HkTPlox83HSW1 D9PA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=n7vUQBPdd/hcB+NeJDxxjKRRrog3Xci9riZC96Fwuss=; fh=N0kVcd6F7cJj85D1ny+AO9Yl3Sl8grbN8lECpF/9Egk=; b=Bzy3WalJg2skm7iD8I76O0K65oevU7rMch5V0cY6amIifqCTsIhaRp6y41j1fGwGUd /K0LbWcIeChnBn2n7TUWuPO2oZ73Q5Q4wXQo+mKugF5R/VvDWmHhypXZBOEch2bWhI3X mnhB8DOuPHDWX/nbZoIdcmfvsJhGBmqROQDcFsDhLtwqllBJkDHpU7sHPBAxKc/sJ3R1 bTsYtfvp3XBeiuRzIdybpZjV0PQQehO2p3cy4Mpxd0Iv4tTMvODTdSF/dV/yaaO6HdqO bBJUMRyezuCiMOFGuStNm8e4FPpasRFgQlST8gfH1QMTkdJuneYgY9+yZoPagSTpGSNl BVzg==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=HhAzJJ0r; 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 felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazlp170130007.outbound.protection.outlook.com. [2a01:111:f403:c20a::7]) by gmr-mx.google.com with ESMTPS id 5614622812f47-478a0608157si65804b6e.2.2026.04.10.06.23.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 06:23:07 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) client-ip=2a01:111:f403:c20a::7; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jr4mzzFwGbEdpbh7AcmVdqND6hlLPPbvoeEMEDr/ahj4zb3tXSr21rdz+NUEkc1t2Z7WRVFEaOahi4VT7vqm+zpX4QVMGeK39iSBbFYCfxd+ZkliVl72oKR3hG/PMYiwQjYmOYSjQVx0fPLBFL23KbqEiR8gWa1YNfLeSg1c0kz1lLDfU/G37VjhzTMZ81Wq3XHN1wI9NKKNx4W3ruNfuQ3DQMg9SRkcOFOvD1Scel3eDavs5Opr1KIKP+D8eNposA3h94IQzKSFBnPtC3KkJce3zLjgquvdfxIgiIOeGf3GOPt4c2OuSDbYF5TfjSm2GM512OG0KRjZbTbK+ImFlg== 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=n7vUQBPdd/hcB+NeJDxxjKRRrog3Xci9riZC96Fwuss=; b=UxQg97yQr9zQbfrkQLXK3kYxJ7k3RS53LTGR7rgtzKi99NjlU8jcJtIuScbVZW6WSyeLbHk0KQM9cENW3cksmHMe9C1H47ycFOF5UcKkx1wbHIHBHvPKx2bgBMctDoLwz4t6K7l/pH/OrBWM/WRajo0Ite0DSiP01YgMTRjPp/CrN2wqbY2U4ry/mYnG8z+VwdKKkcJbGjB4oylfgskbVw5hni/LvdIvelQkquO/9Aac/zWh7GTLygdTvNRf2sx0IOPjeq+VOmBj/d5zkNdgMVQAZ/b+HQWY0xN8xInxnUp/o6LLh4YfgGNPxyQqdJRfF0e2JlbmZujEEXwGPlOKog== 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 AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5f6::12) by GVXPR10MB8492.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:1e0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.18; Fri, 10 Apr 2026 13:23:03 +0000 Received: from AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM ([fe80::349d:731e:a849:b4a5]) by AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM ([fe80::349d:731e:a849:b4a5%6]) with mapi id 15.20.9769.016; Fri, 10 Apr 2026 13:23:03 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: wzh@ilbers.de, jan.kiszka@siemens.com, quirin.gylstorff@siemens.com, Felix Moessbauer Subject: [PATCH 1/2] Revert "meta: Deploy image build artifacts into distro- and image-specific subdirs" Date: Fri, 10 Apr 2026 15:22:49 +0200 Message-ID: <20260410132250.3320171-2-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260410132250.3320171-1-felix.moessbauer@siemens.com> References: <20260410132250.3320171-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5f6::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS2PR10MB6823:EE_|GVXPR10MB8492:EE_ X-MS-Office365-Filtering-Correlation-Id: a0724ee4-af2c-4ad5-b8a0-08de97044b63 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|10070799003|1800799024|366016|55112099003|56012099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: DeTh2prYqepZsIzMJZChB1PCuVHgiw5RZUdKKsd9Jrc9bZE+srOHTZPc+iCNmMg1L0YE2tPrlGuCNLvvOK3L9BJl0/oUe00qIxpH8H8dpFCWqp7n/QOnZGe/5NsyPaLE8S4SeWVYvWD6bXL4WNvzlat2MxdhC1nec4bb3XQHdZpSnQJ6uQk5EZmo6ENpdnY8xxaPPj+lXRbZ5zIsfYp73szHOvr2xTbMb+BYDb9/efUJb5irUHDnnTeshdKU4/73ptqFeykeOD206+deDekulO9WfSpvbgHQ6bOM1OPZyvNynee84914DXCsKTr0DbGqBjb7QTmiGFCF8y2/pXachGo9flwkGvtNlSYS3GfpdP/Db8F7/bSoQRLjxV4pxD3YKQKlRVhszs+oKh9iZy1IEBKQPdkenD21pEdmgwAetbnk4Lx62N2/Fd7ICsZKeIoIJup0eFlR4NeLZCGxoCc5ID0kgemf203wjGRvLCozxSJekjt/EZcY+7oO+hWn9nw1Q4auHSJo3yrl8qKitSMDKgwqgmzHtsUnLPzpaX9iFfKifQYPSc3DUZTgzCDm7DgS+/ldDEiLScKb3iZwEwPnZp7tlWByOQurBM2NS92DHaOgLE7l0ybdDgHcdjQo5xHYdnpUi9PzSVvwvFFldo1USG4wzi/+8LGWPrXHDO+MdGNCimcH2amNOdGNz4aF8z8NcTRt0GjzcsHshSI2YWuCNK3sWHXR72m7dNPttbL/pOQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(10070799003)(1800799024)(366016)(55112099003)(56012099003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: a8ke9fdBCnFOwfoVdBUTawaTpTkivpaydNCeknH8eeGSalFdsk1qSDjgAUEawknEV/oiDlrgMlowAPNAS2IaBNKFpGtcBoDqkFUXUmmV8cgLbc+IkykP0ZXcGjaT4zCdu9EEVZ+S8iOirFyVuHzZJYf3+yWCEj2MPGDYunii3aEP5K1vy5S80C7X2v6oRDfghdzRo0UTf5sKh0xgI0qnpqnTAfRdhcaDAITX6E8/7QXwgzq2/Fxo1zE7it83ncTZGWmVuxcD4JUvs3EIkikEHN+X5Jtq0SXAx0JFmDwpZjebHFCHnaKXT0lN4+Y0NDeaMjEZNZhW3f5aDS/NQmbAnUn7p2iOYlCLimhAf5KnSi4slS5inTFfXG0eA5fZwzgL4vXD9KRDAcuxUEuj6viJnrgSEKs7ZYcJAvrsrlapNs0KeUcR6gVw+v54qb47gV3Yjx4Kq3GCwhmdcwXGo/kJx6vUWPBrllAP4sc3RkgdHFAsnnCPljrDdPYqe+wxHRfn8OG+4zpqqH/8bN6j9obBLofh55n1t+HZRjkESKqZd+wCZ+SLVSPYkRquz/AeaabevVo5AT7dMubYU/us/gU6Wn3R3GoOUXLc77p7LPd4m5nw/GgnWX64jgQVXUdZ7UcQ9YOneMRdWEY55hRMs4ZQYRWP3z5mdL+5bb9szDIfnjKI++c9z/OV+lyIHT2Wm5S8Pmcup+UqSscSpYMc0u+VUNkg1E9Pn7Cu+BIlrahrDRObqUJY5pzqW8v290qsFyJv4WZ5FvMGyfP0Eix3ACC+gUJtzQnv8mwfo4NEkFixt9TvsbbX26g+vUywD1PubOxS0bxXicDL0N1oEJ3YLe6h4O7VMfOIc8V9mf8cfDX5FzDA8AFVezGf3r8xcWjXEEaX788tY+vekeS59AdWksQCP4sY0S/PrW+yHzrotScnS2Urkq04TVj7QA+3CUCu0WBArBFbWMbvC6quk/GGgic/bfAMBHQ5m2XBJrHPg1Ys+z2S/aRFQWwkHHLdsNEGSjt5LbWGEBYQhN7LGSB+HlQraugmn3ivZUAjNqmetqWgF6+LT5CL+5+NHiY/kPQONGIApYcg92IEZrNUsT2B0VVFsqxeRUxE+QoyC4GNF/WFSy6yGhx/ydzrXvUXevsbLhb41L8HTKd8330oAW0AQpmppwYctaQHemgbUGugAWFoVEe7Ju3u5UMiDNsHxnqsXPBKKf2vzKVqiyPlG0hnnmdBmMcUhpOPhpxgcySDHIC3YJfK6ogwQ7GvqWkdUoubdvaXE2ntTfXjkwjf9O01iwlbRYxhV0wT87d/+5rTCRXisZg6PfQc3hK6DeVnHOg3PeOpdT+1eOPSPZ5f5ccUb1iIp+ZJUxnI0LN8iNC/HpLdvE25erziUTGP2WugSktDA2k5I0OxBShpsfVA8tCIHbcOUXSCqSF68C/XH9ZNSrUFtR+gBP1xxmy/zpc9auaCu8fGeCwKb/frwSAjcoPjIwCORkEyHPhwLuqieO2lpfw2/Fe6g8Q9a+OL1LqwCaq4wdYFO+eK5XbE2m5ol38Z33g6sxD6WorJz3GZsb4mjxrDvih/BBueWl9FiopXjKFxETmLaaiFs4j7P9EEtSUN2L+SfPCvm2x0rIFXiizopF8v6qKbBOKvEIVF8koE50T/lDnOEE7bWpD+KLattXrLx7SyFNbmaQh0wcLyprI8/Y48jfczrdTsLmxQR9I/XV/5WtciA132IWsnayD92VvDyqFiQFbGnQYIQoaI/k0J0Bpp2erhYiitdYPSye58gIMwh3DMEoG8oCC9 X-MS-Exchange-AntiSpam-MessageData-1: OGSXkWfWQV1OXdvejtrFJ99Fo0FrH6zFmF8= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0724ee4-af2c-4ad5-b8a0-08de97044b63 X-MS-Exchange-CrossTenant-AuthSource: AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2026 13:23:03.6124 (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: eqaDTVGJcrSatyOeVvvYzl5c0QWTcx9910CiS28/5TVHyHyhzQnUzgt8b7P8K0DdYq5YDStgmGfo3gDvC/moxhRDXMcj6MMTbyUFfCVzZfA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR10MB8492 X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=HhAzJJ0r; 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 felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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?= This reverts commit 13cb77dd04614b655499bbb6d2b88b96718634cd. As the changing of the DEPLOY_DIR_IMAGE has proven to be fundamentally incompatible with custom initrd recipes, this patch was reverted, re-introducing the do_copy_boot_files error on DTBs that are named equally but belong to different mc targets. Signed-off-by: Felix Moessbauer --- RECIPE-API-CHANGELOG.md | 80 ------------------- .../installer-add-rootfs.bbclass | 9 +-- meta/classes-recipe/image.bbclass | 11 ++- .../imagetypes_container.bbclass | 2 +- meta/conf/bitbake.conf | 3 +- .../plugins/source/isoimage-isohybrid-isar.py | 2 +- testsuite/cibase.py | 2 +- testsuite/citest.py | 7 +- testsuite/start_vm.py | 2 +- 9 files changed, 17 insertions(+), 101 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index c5962969..0e6a3172 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -981,83 +981,3 @@ fragment, this can be specified via adding `${S}/path/to/fragment.cfg` to `KERNEL_CONFIG_FRAGMENTS`. If a fragment was checked out into ${WORKDIR} as part of a repository, a tarball, or some other directory structure, just specify it relative to ${WORKDIR} in `KERNEL_CONFIG_FRAGMENTS`. - -### Change DEPLOY_DIR_IMAGE path and artifacts naming - -Change DEPLOY_DIR_IMAGE from ${DEPLOY_DIR}/images/${MACHINE} to -${DEPLOY_DIR}/images/${MACHINE}/${DISTRO}-${IMAGE_PN}. - -When building different distros with the same machine the following -error occurs: - -do_copy_boot_files: The recipe isar-image-base is trying to install -files into a shared area when those files already exists. It happens -when some files have the same names (e.g., dtb files) for different -distros. - -To prevent such collisions, image artifacts are now deployed into a -distro- and image-specific subdirectory. - -Additionally, artifact filenames have been shortened by removing the -${DISTRO} and ${IMAGE_PN} prefix, since this information is now -encoded in the directory path. - -Example 1: Build isar-image-base (phyboard-mira, debian-bookworm) -Under "build/tmp/deploy/images/": -Before: -phyboard-mira/imx6q-phytec-mira-rdk-nand.dtb -phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira-initrd.img -phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira-vmlinuz -phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira.dpkg_status -phyboard-mira/isar-image-base-debian-bookworm-phyboard-mira.ubi - -After: -phyboard-mira/debian-bookworm-isar-image-base/imx6q-phytec-mira-rdk-nand.dtb -phyboard-mira/debian-bookworm-isar-image-base/initrd.img -phyboard-mira/debian-bookworm-isar-image-base/vmlinuz -phyboard-mira/debian-bookworm-isar-image-base/phyboard-mira.dpkg_status -phyboard-mira/debian-bookworm-isar-image-base/phyboard-mira.ubi - -Example 2: Build isar-image-ci (qemuamd64, debian-bookworm) -Under "build/tmp/deploy/images/": -Before: -qemuamd64/isar-image-ci-debian-bookworm-qemuamd64-initrd.img -qemuamd64/isar-image-ci-debian-bookworm-qemuamd64-vmlinuz -qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.dpkg_status -qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.manifest -qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.wic -qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.wic.bmap -qemuamd64/isar-image-ci-debian-bookworm-qemuamd64.wic.manifest - -After: -qemuamd64/debian-bookworm-isar-image-ci/initrd.img -qemuamd64/debian-bookworm-isar-image-ci/vmlinuz -qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.dpkg_status -qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.manifest -qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.wic -qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.wic.bmap -qemuamd64/debian-bookworm-isar-image-ci/qemuamd64.wic.manifest - -Artifacts that do not belong to a full image (e.g. isar-image-base, -isar-image-ci) remain unchanged. For example, a customized initramfs -built independently is not affected. - -This change affects the location and naming of build artifacts and must -be taken into account by downstream users. - -Note that this approach differs from OpenEmbedded. - -OpenEmbedded typically avoids artifact collisions in multiconfig builds -by using separate TMPDIRs per configuration, resulting in multiple -build directories such as tmp-qemuarm64 and tmp-qemuarm64customized. In -this model, artifacts with identical names but different contents do -not cause conflicts because they reside in their own isolated build -directories. - -If multiple configurations are intentionally configured to share the -same TMPDIR in OpenEmbedded, conflicts may occur and are not handled by -OE. Artifacts with the same name overwrite each other, leading to -incorrect build results. - -Changes in next ---------------- diff --git a/meta-isar/classes-recipe/installer-add-rootfs.bbclass b/meta-isar/classes-recipe/installer-add-rootfs.bbclass index 62301c34..69d87be8 100644 --- a/meta-isar/classes-recipe/installer-add-rootfs.bbclass +++ b/meta-isar/classes-recipe/installer-add-rootfs.bbclass @@ -13,10 +13,9 @@ INSTALLER_TARGET_IMAGES ??= "${INSTALLER_TARGET_IMAGE}" INSTALLER_TARGET_MC ??= "installer-target" INSTALLER_TARGET_DISTRO ??= "${DISTRO}" INSTALLER_TARGET_MACHINE ??= "${MACHINE}" -INSTALLER_TARGET_IMAGE ??= "${IMAGE_PN}" -INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}/${INSTALLER_TARGET_DISTRO}-${INSTALLER_TARGET_IMAGE}" +INSTALLER_TARGET_DEPLOY_DIR_IMAGE ??= "${DEPLOY_DIR}/images/${INSTALLER_TARGET_MACHINE}" -IMAGE_DATA_FILE ??= "${INSTALLER_TARGET_MACHINE}" +IMAGE_DATA_FILE ??= "${INSTALLER_TARGET_IMAGE}-${INSTALLER_TARGET_DISTRO}-${INSTALLER_TARGET_MACHINE}" IMAGE_DATA_POSTFIX ??= "wic.zst" IMAGE_DATA_POSTFIX:buster ??= "wic.xz" IMAGE_DATA_POSTFIX:bullseye ??= "wic.xz" @@ -30,7 +29,7 @@ def get_installer_sources(d, suffix): target_machine = d.getVar('INSTALLER_TARGET_MACHINE') sources = [] for image in installer_target_images: - image_data = f"{target_machine}" + image_data = f"{image}-{target_distro}-{target_machine}" sources.append(f"{target_deploy_dir}/{image_data}.{suffix}") return sources @@ -42,7 +41,7 @@ def get_installer_destinations(d, suffix): target_machine = d.getVar('INSTALLER_TARGET_MACHINE') dests = [] for image in installer_target_images: - image_data = f"{target_machine}" + image_data = f"{image}-{target_distro}-{target_machine}" dests.append(f"/install/{image_data}.{suffix}") return dests diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index 866df68a..26a4ec06 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -18,9 +18,8 @@ IMAGE_ROOTFS ?= "${WORKDIR}/rootfs" KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar("KERNEL_NAME") else ""}" IMAGE_INSTALL += "${KERNEL_IMAGE_PKG}" -# Name the image as the machine name only, since the path includes distro name now -IMAGE_FULLNAME = "${MACHINE}" -IMAGE_PN = "${PN}" +# Name of the image including distro&machine names +IMAGE_FULLNAME = "${PN}-${DISTRO}-${MACHINE}" # Deprecated; this would be set to e.g. "${INITRAMFS_RECIPE}-${DISTRO}-${MACHINE}-initrd.img" INITRD_IMAGE ?= "" @@ -30,7 +29,7 @@ INITRD_IMAGE ?= "" IMAGE_INITRD ?= "" # Name of the deployed initrd image -INITRD_DEPLOY_FILE = "initrd.img" +INITRD_DEPLOY_FILE = "${@ d.getVar('IMAGE_INITRD') or '${PN}' }-${DISTRO}-${MACHINE}-initrd.img" # Make sure dependent initramfs recipe is built do_image[depends] += "${@ '${IMAGE_INITRD}:do_build' if '${IMAGE_INITRD}' else '' }" @@ -53,7 +52,7 @@ python() { ROOTFS_FEATURES += "${@ 'generate-initrd' if (d.getVar('INITRD_IMAGE') == '' and d.getVar('IMAGE_INITRD') == '') else ''}" # This variable is used by wic and start_vm -KERNEL_IMAGE ?= "${KERNEL_FILE}" +KERNEL_IMAGE ?= "${IMAGE_FULLNAME}-${KERNEL_FILE}" # This defines the deployed dtbs for reuse by imagers DTB_FILES ?= "" @@ -109,7 +108,7 @@ ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${@isar_multiarch_packages('IMAGE_INSTAL ROOTFS_VARDEPS += "IMAGE_INSTALL" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" -ROOTFS_PACKAGE_SUFFIX ?= "${MACHINE}" +ROOTFS_PACKAGE_SUFFIX ?= "${PN}-${DISTRO}-${MACHINE}" CACHE_DEB_SRC = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', '1', '0', d)}" python () { diff --git a/meta/classes-recipe/imagetypes_container.bbclass b/meta/classes-recipe/imagetypes_container.bbclass index fba15503..e07ce8e6 100644 --- a/meta/classes-recipe/imagetypes_container.bbclass +++ b/meta/classes-recipe/imagetypes_container.bbclass @@ -9,7 +9,7 @@ CONTAINER_TYPES = "oci-archive docker-archive docker-daemon containers-storage" USING_CONTAINER = "${@bb.utils.contains_any('IMAGE_BASETYPES', d.getVar('CONTAINER_TYPES').split(), '1', '0', d)}" -CONTAINER_IMAGE_NAME ?= "container-${DISTRO_ARCH}" +CONTAINER_IMAGE_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" CONTAINER_IMAGE_TAG ?= "${PV}-${PR}" CONTAINER_IMAGE_CMD ?= "/bin/dash" CONTAINER_IMAGE_ENTRYPOINT ?= "" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 5f339d40..5c71078d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -57,8 +57,7 @@ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}/${PV}-${PR}" GIT_DL_LINK_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}" DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" DEPLOY_DIR_SDKCHROOT = "${DEPLOY_DIR}/sdkchroot" -IMAGE_PN ?= "" -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}${@('/%s-%s' % (d.getVar('DISTRO'), d.getVar('IMAGE_PN'))) if d.getVar('IMAGE_PN') != '' else ''}" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TOPDIR}/sstate-cache" SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${DISTRO}-${DISTRO_ARCH}" diff --git a/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py b/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py index eaef9c79..0ed61fff 100644 --- a/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py +++ b/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py @@ -196,7 +196,7 @@ class IsoImagePlugin(SourcePlugin): raise WicError("Couldn't find MACHINE, exiting.") pattern = '%s/%s*%s.%s' % (initrd_dir, image_name, machine, image_type) - pattern = '%s/initrd.%s' % (initrd_dir, image_type) + pattern = '%s/%s-%s-initrd.%s' % (initrd_dir, image_name, machine, image_type) files = glob.glob(pattern) if files: initrd = files[0] diff --git a/testsuite/cibase.py b/testsuite/cibase.py index 060607f7..4a6308d0 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -44,7 +44,7 @@ class CIBaseTest(CIBuilder): self.configure(wic_deploy_parts=wic_deploy_parts, **kwargs) self.bitbake(targets, **kwargs) - wic_path = f"{self.build_dir}/tmp/deploy/images/*/*/*.wic.p1" + wic_path = f"{self.build_dir}/tmp/deploy/images/*/*.wic.p1" partition_files = set(glob.glob(wic_path)) if wic_deploy_parts and len(partition_files) == 0: self.fail("Found raw wic partitions in DEPLOY_DIR") diff --git a/testsuite/citest.py b/testsuite/citest.py index a1b362c4..3eea07e5 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -498,9 +498,8 @@ class InitRdBaseTest(CIBaseTest): super().init() self.deploy_dir = os.path.join(self.build_dir, 'tmp', 'deploy') - def deploy_dir_image(self, mc, image): - multiconfig = f"{mc}:{image}" - return CIUtils.getVars('DEPLOY_DIR_IMAGE', target=multiconfig) + def deploy_dir_image(self, machine): + return os.path.join(self.deploy_dir, 'images', machine) def dracut_in_image(self, targets): machine = 'qemuamd64' @@ -529,7 +528,7 @@ class InitRdBaseTest(CIBaseTest): bb_should_fail=False): mc = f'mc:{machine}-{distro.removeprefix("debian-")}' initrd_image = f'{initrd}-{distro}-{machine}-initrd.img' - initrd_path = os.path.join(self.deploy_dir_image(mc, initrd), initrd_image) + initrd_path = os.path.join(self.deploy_dir_image(machine), initrd_image) # cleansstate if the initrd image was already built/deployed to verify # that a new build does result in the image being deployed diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index 958ab00a..8e28f11b 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -50,7 +50,7 @@ def format_qemu_cmdline( image_type = image_fstypes.split()[0] base = 'ubuntu' if distro in ['jammy', 'focal', 'noble'] else 'debian' - rootfs_image = f"qemu{arch}.{image_type}" + rootfs_image = f"{image}-{base}-{distro}-qemu{arch}.{image_type}" if image_type == 'ext4': kernel_image = deploy_dir_image + '/' + kernel_image From patchwork Fri Apr 10 13:22:50 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5030 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 10 Apr 2026 15:23:17 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f55.google.com (mail-oa1-f55.google.com [209.85.160.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 63ADNFwb000360 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 10 Apr 2026 15:23:16 +0200 Received: by mail-oa1-f55.google.com with SMTP id 586e51a60fabf-40a4d2264absf4019987fac.2 for ; Fri, 10 Apr 2026 06:23:15 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1775827389; cv=pass; d=google.com; s=arc-20240605; b=W87MpJsTIca1FwKgeet7gcW2LRWiJcDwmVxV+4a8yNIdyymp72NIMUonlcdobr3XJa K0LxD4u5zlEWvfCkvsMit9Amvol0fZ8chmkaZbct3grq1gA0KgwBbzh+r2JjE8CkU5P5 VKNFVb5M5HelN7/M+w5YpD32b/WE+h4AvTZxyj/MstBwwkwHFtYCzLLK+ywUu5xb9+Hc 6ftbC/DVcjoDH6wA/bYZKP7cT2jDILDFV1v7OMzzhnz6QSDI64PzOKk/dEouWqJg/vQM 6r1PusrpCeURJEHYigRixvKnsgPbT2WG2RrPD5cmHNnv1Q5AdiN9UaCQFntjmmsiV8da F41A== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Wd2Ip4YDK/XYyOZXjZXkuKnKFqZVWEJb1ersyCuHYes=; fh=NdJ47dxpjZZo4NMwstKl1988sHGF9IqfZDU5k4MGaig=; b=bqkd+r2eCL0vGk2rY90dZw1cFJ6Zuxc6+qUkvDXB/PqUWW7FQ+E7vNCpJujXKNc9wl Iz9Y4zpbqRzwYotnp0XcfVM1ua9CWr12ECAGYVN5OoME7R3kIuk61pvOTk0GdY2BLlbV bfGBmghiazuO0Aod/iZ7vfV+lUBL5Khs33oHaBoyA0vaF/db/y1Qsy0s4j+IohiSQJ4C 59dObIayAuhcj983gRsBYwp4+2FdTh3wK9EXDMZgSJZzuWrDiBNJiZux3eCwTw2IHk8Y +UeusEdpGTfB+EwkEOPVHEQA1FZHtweJLAHhQHX7KdW+niwf2tE4js8HNhLd7pWcuYUU PyDw==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=PxfPSJ+M; 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 felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) smtp.mailfrom=felix.moessbauer@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=20251104; t=1775827389; x=1776432189; 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 :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=Wd2Ip4YDK/XYyOZXjZXkuKnKFqZVWEJb1ersyCuHYes=; b=gVcor9vkBwDh0MUdR8aIDQ1dD/9LbcBygdi3ukyTyGcZWcVmkdFkt1FJBpmyG332CW xxVSCpbi80IJHr6B6936egD+i9fvlAo6U/iZqVC2lQO/0RPV9J7J/skqiMQeFyfd+m9B XntAPX1Tq/pCzMQ3Fx3HOOcJaDIb+OMB/lxU/EvNs54SOxCe8Gm5yzVTXJnUfTMYPd4M 0Gc3u7HgcwvM3wtCUUl8R0KdTqnCsmM6OV5xgqEXg11PXqfiGRe+GPusWNSX7BSSfGGy Vh78FRRK2K1NBJwEVWWAjHpkqX9yF3T1yUuEPDKfsCAhPccqLtRJj94/ejiTXN/aPpWc TXUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775827389; x=1776432189; 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 :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; bh=Wd2Ip4YDK/XYyOZXjZXkuKnKFqZVWEJb1ersyCuHYes=; b=IXeDDmA8Kwo1uOewDxweXB1xI0WQknRvzl+atjjC1fcOq2ZLAAC4Up8XfnICQfOWNa y4p37NgD1O01ObagkzRQ4SF7rYJc62Qzb27DCHKL1svkAV/O5Tns8lr2w81jgucCRY1U rWnxPUPBXmVJwO5CJbBd6Fs6dQazkzq6D/vePkxwSCdUDhGOmcXZyxv6iJvPEp2bJiq6 Pko+8ZGUIdlmXgmT5kl/jWh+FVBO2RwBfJhtNSegaMssikoJFMNik75HnvjiNSimZz93 1Uv1UJkAv86OF/Fjg5q8Aj7qkQiFVfTs3H081Nrzz18CPQcU0J3SnxYlrV1+NyVQGZ3H 08DQ== X-Forwarded-Encrypted: i=3; AJvYcCXa5oQ/MRMIAe8jBx4DxHFa/hkaEnYxNkXvMXwtYPwoHOpDjeNrwV6746k2cIP+ZwBAOum/LrA=@isar-build.org X-Gm-Message-State: AOJu0Yyp8zefmtdtYRhQK4yrlTUyswivDQsWQ4hHzcu34J7tL24LZow+ Hh80dVhUsl6UAJTtiPP1zBPxTLdBIb5lWZiqFhKwjntSsh7SHMHj0adU X-Received: by 2002:a05:6870:959e:b0:417:1ba0:7320 with SMTP id 586e51a60fabf-423e10e9c13mr1525069fac.33.1775827388545; Fri, 10 Apr 2026 06:23:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiLxW1M9KG4FQt1vtQk9aF9hnR4ythrfURooFqvSfIXlPQ==" Received: by 2002:a05:6870:b17:b0:41c:65ea:68a1 with SMTP id 586e51a60fabf-423dd0194a8ls451147fac.0.-pod-prod-03-us; Fri, 10 Apr 2026 06:23:07 -0700 (PDT) X-Received: by 2002:a05:6808:c2b8:b0:45e:84e7:c20b with SMTP id 5614622812f47-4789f50fc59mr1765368b6e.25.1775827387583; Fri, 10 Apr 2026 06:23:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1775827387; cv=pass; d=google.com; s=arc-20240605; b=UObC9K6IE8SDd6sAtjG/s7wKr6qQzDqHGTornxF6yXhuOvAvkvwSofsWvZecxbM03S SuHl7h4bL8eQU7kXkH82Zo7Fr4ne0EKbGVP14w0p4bZ0Kx2UwohmFdubijJn/uia8epG jZFRsjoAGzX58Flpmu2YKnsGUse2dHp++ONcpoem+XROxWwR0V8ZzuBEfTvBVa5mmHUf IvQTKSRhp2sMDhUF5alBSBDz8n5nTVI2GEbh6nzrTpa5hZ6BsZ9Gdv8njkpIFIrvikkr 0e5SHOJTbv7sMz2wiBXgTkvbPFqH7m7ddjrc0+zFh0YnmDefrRQMalmlDqZzAWp9t9Do QmPQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=fDyGjBl2FTwNZ1bl6DLB6xnMJ+GC+Xc6s4jX+4DHbPY=; fh=N0kVcd6F7cJj85D1ny+AO9Yl3Sl8grbN8lECpF/9Egk=; b=kpUa7kRSU9Hp2uW4ECRcrnWiJj698k+gM8byHccZvL+ttePdS24RKup54pd79vmId+ YCcUfNoU7K5yidzGfKP9eyAYovMoeO9t5v6fjQ/rPDQF8jkAPG/mhWKGBtie8COd98DO 7c8m/YoZwt3zpivG4MlcJSIbYbfg3iu6ntw/7brXSD73yr/hYQYjkRDdYP/JnueGVP0k JKXKbU2Aa4P64qSVEWwZ2xmPkTdhlSVLCd+3cHfIN3VIcp817qqbffiPDYV5h0IV4qN8 ehD33hcS3P2ro8SbPhmnbqMOmzH4c76t9ib0vOxz/nKlMuS2zTfCqINX7gTZVWKTaXGL Ovrw==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=PxfPSJ+M; 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 felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazlp170130007.outbound.protection.outlook.com. [2a01:111:f403:c20a::7]) by gmr-mx.google.com with ESMTPS id 5614622812f47-478a0608157si65804b6e.2.2026.04.10.06.23.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 06:23:07 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) client-ip=2a01:111:f403:c20a::7; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eFpe93xki2zONFeZ+f+I3DtVlF5yWeMiLbVnCQbaFVzBsv6AFJY4Oc/cxTgTJba5Sc2wU7Z1tW/llSUPdvRy6fu79pJ1cE+GhcUSFau5xBgSBD634Nh7ccMvVS5N6asRKSd8V+Oi+LP5JA4QYbcgyhLPRp4NO+KJN49IYIgm+SXJd+qg0vo4la6L0XcqHMR4JOvwvJln0CTv1jregxDXTsIse1TKvmPY3sfDSStq1DywRU1L9Vir5TmrcxzMyw0gHgFqpi3Qw2dBmV2b/s9V2cUw2jkC3/6ttqVstOdLh7it7/mB6Sle17ZOeA+5sBmeZsCAslLq5eGi5bCybvKx2w== 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=fDyGjBl2FTwNZ1bl6DLB6xnMJ+GC+Xc6s4jX+4DHbPY=; b=u65aCRTob+HvbQqufOkJ3br+r4Hqp/PKDSG9iHhL7O7E2kExuv38VQI1Ybnwph6xy/drJt+l2Xngqx579JznRKlPtCSK8Civ+wufYjQz/e01auSaqny9lOL1pzS8THlqwZGqSEqV7YZ/5unTRcwvm1fOZ542oZDzSjwEyP0ETFU/m4OPqCCkHLrJ8H/JStED702+Qdsh67pxWpUsI/HtCDkGAPNJJlIaqXd3vPYiiEy/4UNMlygaGi/BI6jD2RkwbGF0BBghDKbGuYw4Ml3b4Zw2O2XOp+gp9tmPINGpQOMHcst5v3ya6VyGl4EaRnNrcRWUz3K2jcJ+I9e77TaRDg== 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 AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5f6::12) by GVXPR10MB8492.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:1e0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.18; Fri, 10 Apr 2026 13:23:04 +0000 Received: from AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM ([fe80::349d:731e:a849:b4a5]) by AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM ([fe80::349d:731e:a849:b4a5%6]) with mapi id 15.20.9769.016; Fri, 10 Apr 2026 13:23:04 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: wzh@ilbers.de, jan.kiszka@siemens.com, quirin.gylstorff@siemens.com, Felix Moessbauer Subject: [PATCH 2/2] prefix DTB files with PN in deploy dir Date: Fri, 10 Apr 2026 15:22:50 +0200 Message-ID: <20260410132250.3320171-3-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260410132250.3320171-1-felix.moessbauer@siemens.com> References: <20260410132250.3320171-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5f6::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS2PR10MB6823:EE_|GVXPR10MB8492:EE_ X-MS-Office365-Filtering-Correlation-Id: d9a8092d-df07-499d-6071-08de97044bc1 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|10070799003|1800799024|366016|55112099003|56012099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: NIWgDPBhAl+IWZp9Utp8L5sFS7KSq6b9QkB61FT49Am9JYF49QCMhR2mD5HdPqR0bYU29HzkTf+DQuPoBxRs5+CwV12jnIzyxysQJL6/tzfoMaJbB9qJVDhBCb/DWS1CSWW2EOqley/1brqQ5LEHTSu/sPyhcToplw0lqqUZz67YmjbVPZWT6SYXt2Bc7LJNkPzJCeOzQ11xefVReId8nfxe0OIGeHF1uacXPKi1+udTp1n+K+ePfrfiEqCtwV1rZcXSPxshKYimgqth+YSfD3DiWdVI/O1mBYbPf2ol70/KY3812pbBg3M4Z6X7bWl4wnWnH5Xy3bXYHOTlD8XumAy4sTKz71cnbizgDKH+YceXu9q9GgTGYw2VlEQQ6GTzOJp9VVEDm+BjGhwr+EGXeWqFg+x8e+3+kjZHcF6kHvsuc8tE9H2kcg5Stc2/o3GLztIcQSoYON0jRgToFyZMTbM/7B7esuI35EO7V+z65gQo0qDyeIA6gWJsg4xPgbO6IZMntJCkDcUw8cXi8olMF/qoU1JS6al5mx8VnBuxXcKl1VcmUwQsl5YIMhj++1OJd6refVy617h8Pu4VFdleXn8THELPg53m4bWhQlECliJNHc+8zW3mJ1SMYpXyIZh2ROV4WeRq5X/3h0nJjHNBRfWhkASESEgQnWksipRyW7P+bgUQdwieZQuuvxyb6+ZsSaYWiUTTdGqm10GCUVWgztXzw6IufKqgcZe7pK7mA4s= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(10070799003)(1800799024)(366016)(55112099003)(56012099003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: zvjFq7FO/gN24JfwEv+vnr88ZIvUQYi87AGYcbvAJ4p6XAa87XdLuis1RaKFwub2vFWegTz6SeNWQPOPzs3xbkV+NNl7VMNoSmafsm6tZNHmoAAoXER0n39KqeKVsXTri7zZP8urBtujvPJC358l71fORHhecTbOkdEYlkrc+uJX02Nfv3j9JKLRiRjfjGYm830g/2HYByaVjiYBBtbSR+7bvo8WNYcgr55/GCXxHP+ENgNEEF+cFJV+2xnUPvP8vbP5BB+lNx/L7nm5jHzarr15qKb+riGIwWsjd5WYjiP6M1GuZ1EocsUIGG8XwFCgMVZnKniYf0KUnchVl4ybY2bd09NYnZ70/rsPDPli2W2C8Jr7aSi+YPCYOKsay+z1CaEc0q1YXRUY5yoc7Qi9EUNAuhBO3ZtvIelI/G+hxVp2Fn7QPadTeJDoqJtdzvzgQeHYegzWwEOqe61fzUI0bc9yrLqEYta6T1v49DX05moFAoljr4ZrRpIH4qpXbSrwlqHL0a92zkM16lvubYn+wJI7ooHU7ClHdVe4FhIlODSkIHC6F/xVAawVuwqVy98IUJPHD5UuggSvRM+7V3yFQZYNv4z5a+SlCv5+Nw3fsw2SK6OPDBiTY/9WsybMim878hlggWxHU+XIitrcgoQBEoDvZ9xIGpJaKeEkT02H/k2X1jQzCJudNpqbjR+U0DN4789w3gMZVeOV68NCN44klwcnE09T2Yx3rgVc1oYaOFUXI+21cHV0RrKFQzGBJt3HJHVwbhl4okPRUXndl6wcY8VAGiVvpU/hrpmhH3m+ct2yAM3+bt4AM9Sv96VnY1Y6GNIBaFBW3DSmnQpKGkL7PS3unLlD3irir0tQ6JlFqU03R+NSXbZKKcOD56zl98Vz06b9KSvVeQ7P2oEyVU//7nLyV6BVO0Jfkv3rchQanx0W+hyEqK59C9GruRPy8iXYuqGodnGUT4EJWdOVSPNLMSqKnrba2h60zwdexwF3UEytRRAkG6pfSCOYVTCZOs1t1fAlnT5Js5VK20fGUmmKAFhO6B7hV79XN0guqXKfIMsdDfT8LXwkQ6q3dw1tc8icetEHbKwQ7WEhmFeS7+jlPIiuOBiVb6mFHheNmCBvq1eiv0MA+4vLgQBgsrHgPGyiUofiU7uaMMt6A+iOcReynyaM3tDsu3uK4CMllEOeoOESDLU0GFjm8XYuCjFU4WRc64E502oY3EMyLUg25uQP4V2PEaXpc6Z0eFVFKQxmM/jAjfEH+GSj8Pz5IDZs4N1ch6NfiKyDbv15RqtEtLcQPk9iNhci69uOl5/t1CTVfCRXr6gXXfDacxm2xwBc5vP2WB/RnzUACAzBr2EQc9byZtxvWZfwa7522xJHAukMjEP/XpFoNkbEHCzqmgHxCeusqwvvVt+lZ4FRTm0Qnle4l0itM5GgjF7dUDVFy19mn/1z0Xl+9stL0U7N1ajpkLus+ZI8dUJwxeFEGpuMWATHA4i2YC6tg7n1Md3HBrXQfpszO2GHl0yxYRhyKoo0q48lF3yhZp3JXMKZF2ZdVHgHHvTJZRY4aJPUr1YsQixg3vm7RCnrYjDTWsoHEpIe9giY7uWScSadH+Ny2kKF8TxNyy5csHAE9/fWOXkl1QUcNnAb60sxxgNHseHrJE4CL1GAt40FuKX4oKYFcqJ3WQKFerh0UVN+BapR9tLXvXlCcS+iOAepwfVIRjr11pfnrcWvc6YsWVpwwdUI0b44ICSLBVScg5VpVz5qvCjxuxZvzta9gCBi14NqxRF7k3IFXSC2j60Hea0W X-MS-Exchange-AntiSpam-MessageData-1: I17I9CC/fwthsSyHnoXBsd/Z8uVN2qBb2ic= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9a8092d-df07-499d-6071-08de97044bc1 X-MS-Exchange-CrossTenant-AuthSource: AS2PR10MB6823.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2026 13:23:04.1285 (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: Is9PW0UIopSXPvHf6P0Hp08zNjJZ39vmAMguOeLo+zXXr4MT7GtFqKdea930MEkubt9VDhFgLZIplWwRJHBxCJDnUtrYfI3uWyXmYBoz2IU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR10MB8492 X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=PxfPSJ+M; 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 felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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?= As the changing of the DEPLOY_DIR_IMAGE has proven to be fundamentally incompatible with custom initrd recipes, this patch was reverted, re-introducing the do_copy_boot_files error on DTBs that are named equally but belong to different mc targets. To mitigate this limitation without breaking custom initrds, we prefix all DTB files with ${PN}-${DISTRO} when deploying to DEPLOY_IMAGE_DIR. On imaging, these prefixes are stripped again by the imager scripts. Signed-off-by: Felix Moessbauer --- RECIPE-API-CHANGELOG.md | 20 +++++++++++++++++++ meta/classes-recipe/image.bbclass | 6 ++++-- meta/classes-recipe/imagetypes_wic.bbclass | 2 +- .../wic/plugins/source/bootimg-efi-isar.py | 3 ++- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 0e6a3172..856da5de 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -981,3 +981,23 @@ fragment, this can be specified via adding `${S}/path/to/fragment.cfg` to `KERNEL_CONFIG_FRAGMENTS`. If a fragment was checked out into ${WORKDIR} as part of a repository, a tarball, or some other directory structure, just specify it relative to ${WORKDIR} in `KERNEL_CONFIG_FRAGMENTS`. + +Changes in next +--------------- + +### Prefix DTB file names when deploying + +DTB files are now placed in the ${DEPLOY_DIR_IMAGE} with a prefix of +${PN}-${DISTRO}. During wic imaging, the prefix is removed again, so no changes +to downstream wks files are needed (i.e. `dtb=my-device-tree.dtb` is not +affected by this change). Custom imaging plugins need to be adapted to this +change by removing the prefix from the filename. For that, the variable +DTB_PREFIX is exported as bitbake var into wic environment. + +This fixes errors when building different distros with the same machine, +whereby previously the following error occured: + +do_copy_boot_files: The recipe isar-image-base is trying to install +files into a shared area when those files already exists. It happens +when some files have the same names (e.g., dtb files) for different +distros. diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index 26a4ec06..9b5dd23e 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -379,7 +379,8 @@ EOF KERNEL_IMG = "${PP_DEPLOY}/${KERNEL_IMAGE}" INITRD_IMG = "${PP_DEPLOY}/${INITRD_DEPLOY_FILE}" # only one dtb file supported, pick the first -DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" +DTB_PREFIX = "${PN}-${DISTRO}." +DTB_IMG = "${PP_DEPLOY}/${DTB_PREFIX}${@os.path.basename((d.getVar('DTB_FILES').split() or [''])[0])}" do_copy_boot_files[cleandirs] += "${DEPLOYDIR}" do_copy_boot_files[sstate-inputdirs] = "${DEPLOYDIR}" @@ -402,7 +403,8 @@ do_copy_boot_files() { die "${file} not found" fi - cp -f "$dtb" "${DEPLOYDIR}/" + dtb_name=$(basename "$dtb") + cp -f "$dtb" "${DEPLOYDIR}/${DTB_PREFIX}$dtb_name" done } addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_install diff --git a/meta/classes-recipe/imagetypes_wic.bbclass b/meta/classes-recipe/imagetypes_wic.bbclass index dd6c501d..c0813223 100644 --- a/meta/classes-recipe/imagetypes_wic.bbclass +++ b/meta/classes-recipe/imagetypes_wic.bbclass @@ -107,7 +107,7 @@ WICVARS += "\ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH" # Isar specific vars used in our plugins -WICVARS += "DISTRO DISTRO_ARCH KERNEL_FILE MACHINE" +WICVARS += "DISTRO DISTRO_ARCH KERNEL_FILE MACHINE DTB_PREFIX" python do_rootfs_wicenv () { wicvars = d.getVar('WICVARS') diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index 6bc78d42..32b220fa 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -57,7 +57,8 @@ class BootimgEFIPlugin(SourcePlugin): if dtb: if ';' in dtb: raise WicError("Only one DTB supported, exiting") - cp_cmd = "cp %s/%s %s" % (bootimg_dir, dtb, hdddir) + dtb_file = "%s%s" % (get_bitbake_var("DTB_PREFIX"), dtb) + cp_cmd = "cp %s/%s %s/%s" % (bootimg_dir, dtb_file, hdddir, dtb) exec_cmd(cp_cmd, True) @classmethod