From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7130878582899867648 X-Received: by 2002:a17:90a:d90c:b0:1fa:c99f:757d with SMTP id c12-20020a17090ad90c00b001fac99f757dmr23021986pjv.240.1661168885756; Mon, 22 Aug 2022 04:48:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:5607:b0:1f3:dad:21a4 with SMTP id r7-20020a17090a560700b001f30dad21a4ls9352117pjf.1.-pod-canary-gmail; Mon, 22 Aug 2022 04:48:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR6b9q0tkUAoaEA+zbIX912SfHbTnLKxen6WGba9j9Jo++7bb6VqK1nMpPgs/vXMy/AiRH8f X-Received: by 2002:a17:90b:3c0a:b0:1fb:129a:a5eb with SMTP id pb10-20020a17090b3c0a00b001fb129aa5ebmr8817427pjb.94.1661168884705; Mon, 22 Aug 2022 04:48:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1661168884; cv=pass; d=google.com; s=arc-20160816; b=fxKme/pchWPdt3JKjj62aVcxnNTgtB2YjMBpn2rObXETkQ1gnwURVA3cvq3/FVhVb1 aNEdFuFkvsa7vBUu0AwWI60hblhHZszZ7BGiKDe7RWDzo13z4Ur+A5KVpRx+V9mN5/59 M2ObUfafsLDUgVLL6U7n4osf1wkPAmZ+Wh2sTl0RhgGsPP6atODP2JHzevMGT1evLY/9 DLgPCUIhasOU33ML5ZbQYFr9poPfuE2s51+eFFdJY02MiEk12+vhTrfVn9CTbnAw8yXg 491XaRypfD9eknVDetY6byO3WdpDzCjPgwsMrqR0NWB/pi4yhp0RmqKvotbWXW1wVge+ TxJw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=3sGcOYyvtBeouqNhkqzp2OwZqLpW3Jy0xCR5nv83RVs=; b=JJ9Ch3Jn+w/D94ky/y0DVa2OYwYhJqDRA71/4JJ0UaaZ/xdZMFuBZLSDolWAt+DRd6 90QeG6HjzEWGs1rVTxnUEqIG28OGfTUGcWhxyygn9Eax+zwAjjOTqNA2M/N2JzX7rE/R iQEt3U4qT9GkR8Q0PS45ePHLDOWTMZnRw9R4KuY07NHEO1pHb/lJClUVSymKK/jFpevN ubyyZzG/3btpz6IJpSkVJ7pgUtfJYKHf5svVLsOONgZAjBByoF9LsmFDbb+jv9Mmnakg UuadZi5Y8eAFMhDhmFlJ0UhltAAldwzO3xgDJkLs75XuHKKzUe0YuA1CQj6nW4ilMfUQ JyjQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="bwbaTV/I"; 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 henning.schild@siemens.com designates 40.107.0.62 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00062.outbound.protection.outlook.com. [40.107.0.62]) by gmr-mx.google.com with ESMTPS id e12-20020a17090301cc00b0016d3382bc9asi530409plh.0.2022.08.22.04.48.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Aug 2022 04:48:04 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.0.62 as permitted sender) client-ip=40.107.0.62; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="bwbaTV/I"; 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 henning.schild@siemens.com designates 40.107.0.62 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DrV7XZg+31cSG1gGLeAP+elWKavbUXolkA0MzJf+126G6cJxPLPrJ+WXM4A5EdNVDVfubSJKMFKsdayFQbn5DiCk93zPIGlop34qXwW9qq0z4v17F4KYPulVIqLMPiX7w589nOLL8lC0mh63TWjoLN+qFDVQwk8CzGX2EfkeHJO729azC8qwld2Sod91QZJ+WiqQEaiMtkDwnZO6EtZAxKa9hGIESirNa5T6xQsmQvokL0v6MY4XxYlwWKp840G97lXKAaBLM1sXZn0E8xlQ0V9+i7eaVnDXVPTeOUqfw4g4v1xhWn5CpyqPhXrMWhl4gDBJlRyM+pxSA6rzeL1A2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3sGcOYyvtBeouqNhkqzp2OwZqLpW3Jy0xCR5nv83RVs=; b=CXT23I7TeRoEvoGxPvhKsE7Wl2AMCR4gTWAKiyOZX4vj7oCQpoQWkGOIErLnKTzvEFUPB32gu74U7j8n0OtpLRK5E9UQ7VRk0Z8mjtDiwtOrXRJhsKZyxBb0W+DVl7/asGVcPNU8WtSL+Zw+fwLOc5mc26vEEMxiR7bkgfCVsQ1/YND+EqPqX1mWwXx21YZMfYieg1qQRY1IQuHvbKsYfwb4nEv7f95YBvEeUmMjxdNsaClZY+5irRPOOEZOy5D7/l5jlCmRU2gNKARmYD6+GgpCjySbRzSGZcESpkIKS4urnZ0sdyswdgGXkkv1gUPfqVsWBzlSKYQyAE134gtnCw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3sGcOYyvtBeouqNhkqzp2OwZqLpW3Jy0xCR5nv83RVs=; b=bwbaTV/I4YQrw1/0w/mVUWArvAhrjEUu03iGHu+lUGgNiXtj4H/dGoawSJMCDOZ+v4vUi0f7frBPjXUgxl//oyYhXtI/+yfwpHVmohJOfa4S2qdBpuS0QN3RkUhzC2qF85lsLJIzavyhePIpRHRHz59Xk/EyraJ1//qmbLaNFo/MRPgka/EnHFsw01nvnzLy1VfA7olnbHL4F8HHuDfsQjb3rrZaT2/fDyPddZSEv6bgn4p8fKiCgLDA+HTSar0z8eboolv6x5MUfi/oRUCUe5cXNgvav+TcUdAxGNIjJ25UKGesdwp3Gn/aFFyrsoSlVRi98IK5N3kDoi8i8FrImg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by AM6PR10MB2166.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:47::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.22; Mon, 22 Aug 2022 11:48:01 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::75ee:d5d2:6b1d:150b]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::75ee:d5d2:6b1d:150b%3]) with mapi id 15.20.5546.022; Mon, 22 Aug 2022 11:48:01 +0000 Date: Mon, 22 Aug 2022 13:47:50 +0200 From: Henning Schild To: Felix Moessbauer Cc: isar-users@googlegroups.com, amikan@ilbers.de, jan.kiszka@siemens.com Subject: Re: [PATCH 1/3] wic: locate systemd-boot efi files in buildchroot Message-ID: <20220822134750.44a99564@md1za8fc.ad001.siemens.net> In-Reply-To: <20220812065040.1580962-2-felix.moessbauer@siemens.com> References: <20220812065040.1580962-1-felix.moessbauer@siemens.com> <20220812065040.1580962-2-felix.moessbauer@siemens.com> X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0PR03CA0300.namprd03.prod.outlook.com (2603:10b6:610:e6::35) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fbecd231-1b8b-4deb-0433-08da84342ac9 X-MS-TrafficTypeDiagnostic: AM6PR10MB2166:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +bEpJ2m7F4BG+bxyk/93RSUT3MnR80aqcy+UP9EpzP1jdbklYJv9SFP0y2pcOqEu2mXonP6h6sQ/wtCUEiWYCru1vTrqM5cT+YOH3F1a/HHU4b3aGShYvrjG7udr7rRed50HVlqXcmYxstC/RpFgTObzIaLlAs2DE6yLnAwsXmPFVdoliEFQ0eL8WNcPCQx4S3PBGYgxgGdTub8sWFM8hGwyDnVvTOprBO8mgbrYTcPW23zYJWhNTk4hWgd3+I2hxonyH17WaxhBs4+u2dn6iWHMv4Nl6dXqCXvcwpJXHQPLHq+0Aci1ko2lC+Xk8RpH1AZ8vrE03Ty3HXgkysJascCi1Oq/wV1rFwhmIE5GZTZQwsmxNMGoir17CkdJI1Zune1iJB7NXnl7ACh8lbz42zCW/u6ysDnnH5UPjXxxFdZNjuhT7a3AasqG3DpK0TXOS8ZB5FXVcD8EDG0Me7F+i4ACRVr1DwwFQrh1zINevhjTS3ez64tJqjun5/52yIik5TZwTU15PT9C9BVAoO7DzKxpiCam0KZWaFaCpAU5YGjQgS6J8GxHhXXxAsjPVUhPZW6FB2WLV0KnQIy9Y0BYpA4BNacmmCozhnFmxgJ1dskzm3hX6/2Iw3JOioT47ENn1b3nu4V2be1nRCN0K9CE6fkaz4fFc6VGCVFP/uEjlYnoijL0SRaaxKANBOZOcvPkB2YcutdCQZEy8TPuS0R1eA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230016)(4636009)(396003)(366004)(376002)(346002)(136003)(39860400002)(83380400001)(38100700002)(8676002)(4326008)(66476007)(66556008)(66946007)(8936002)(26005)(6666004)(5660300002)(44832011)(6862004)(6506007)(6512007)(478600001)(6486002)(6636002)(316002)(9686003)(41300700001)(82960400001)(86362001)(186003)(2906002)(1076003)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZvLLhZM0cCpwBNksb/rSM/AXJkA1pND1H1Q1mFcu7v3bswsrW0ybuVzpYbUe?= =?us-ascii?Q?T1/DrkE1eYUeZItT2/TptoLiEdx53DYErJBLq8qt61td/M9D4bfKBYUYgwHI?= =?us-ascii?Q?pneAYCmtxjc5UagEXs7gVqwrkARMtIVOldY/x0R15wVz+6tymBaK0RI3J5Ax?= =?us-ascii?Q?Tb+5LyK9SGmSy1G96ex+KX1CKHWIIiE9eIxBwXYgfC3biI14sNMP32GVdT7S?= =?us-ascii?Q?mS8N+nuBG594cYI59XRFldcKR0cDKbMTuKnKEapng0zrkYyR7hvmHVPgJJyI?= =?us-ascii?Q?c+laXGCKAzgj9WAVw+6FUOUbIMD3rv2CfjsRKvwAQkfwdu0KoYlbG4rF/ciJ?= =?us-ascii?Q?PYBT3JCchmSVPcNDLl2WliocJX2fRsoJLL0dt9TyV5fVI3R983zRC0t3hXk8?= =?us-ascii?Q?T07eQsLzvU785rPVhq1UlB52f48PLiSOhuhboQDzGRuya01BFs/UEkYKRq8t?= =?us-ascii?Q?NFV+jSd1BcjO+T/pHi/O1+q8bB/xsEy1j7+K2KId35xdpjUuFlRkJxwciG78?= =?us-ascii?Q?Qt4IOF8ob0yuxmdxyTQ5f9pFvIflNgQ6Re47byvwN3qHAqdpkMSrfEL/shUj?= =?us-ascii?Q?woOvoR3K0yx7LYbh13jI1w/SSEYl5yhrxAXOTzRB7G6wHlqI2uEyfIsZSGjw?= =?us-ascii?Q?gTvzrflmTcts8RIbxvlEtfgnzdF+E5wHjXwv/Wj6i9SEGa3QqhcwpBeIO7Di?= =?us-ascii?Q?fnAf9CUELJb2Q9fBBJ4eiLV6pID5njesWNwODQeQI8GKNId+SnOqYnQuz1RV?= =?us-ascii?Q?1u7ZM4b43nnEXiaFBzYJBNx95S18/1uPfSEMxkzb+zMvrvM2ktcrCe0o5N/2?= =?us-ascii?Q?sEC2CYHGosbB8b+IRJvFGxt2ZUbQy8r/HvHjuCVrmuaWW7XcVZ/9sEMAaNnb?= =?us-ascii?Q?uIp4VtvDwlE2xb7uDSVfbQxd/wYMyEVXIma5gqUtRECViBXsjwLh7voZcPST?= =?us-ascii?Q?9Ts13/FlgdfbpnGYWAfpkLIjG94sQ1H+BQNwT86lPUMkZKSN3EjCOw0czZjE?= =?us-ascii?Q?y71wurMG/vfkScCvQTNiuOtuyUeSrVkIcAodLUlSx5PrPb2qUe4VzZFkLEHr?= =?us-ascii?Q?A6eACQkgHzhxvkBe2vYBsiIkpOHkLU6aLRtHe1cfcwH8bLPPV7DholzsPVK2?= =?us-ascii?Q?4OP0YBMfSWDE3egJeoUBWpKFxf5ER2dpS09NGf0TDjVJwDbrupqH6luThpcQ?= =?us-ascii?Q?lJoPg66zCBdhLYNKh02sRA3qGyLoQ7AhRkXMT6muRuNjOWOpfzZ3sGs5DVMV?= =?us-ascii?Q?Q4jNq5AuU8MFYR7jXZxsLZ9H1NOT/pEichIMxP7qrgC5kPDeM6tWgCvaejUz?= =?us-ascii?Q?10udbK6v9U/IHVf+EYO+yCFYq1M9XCqfg8N/IPvwwRTT/B0+s/yZrBbCESc+?= =?us-ascii?Q?WvpmmM3gUNFbNE7qSVm2CNJcfgYhOFBbCuEmlPc+uGjZZX0cESOmyqH0cU8y?= =?us-ascii?Q?eGCaXzAiwmTr1uanpnUNev3zoftUKL7xO5CxyVDUdgEtIwiUqEqBsARu6bGZ?= =?us-ascii?Q?3PDadxPSWcAZvcwgXfVO4Lu8OaQ41HES37ojG226JZbizmRkzRb+pGKrn/zR?= =?us-ascii?Q?96IJ/vYAoyK5ts5t/cx3/vixb/d/r8BrX9g9Tq/NtZ+jdMIeDKHclnivMym6?= =?us-ascii?Q?JA=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbecd231-1b8b-4deb-0433-08da84342ac9 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2022 11:48:01.8422 (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: 60e7DF+YL4r/4DbR0uLmhPv+3YHcB3iGhC0BhhGygbtc7oNuOoZkeFNCGa0h7clIgzYkR0U0M6JMwO6+SiW2nHWZq2GhdVbBkroSIcoyx8c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR10MB2166 X-TUID: 1b8c12wb02oh Am Fri, 12 Aug 2022 08:50:37 +0200 schrieb Felix Moessbauer : > This patch locates the systemd-boot efi files in the > buildchroot and not the target chroot. > By that, no imager-specifc dependencies have to be installed > in the target rootfs. > > Signed-off-by: Felix Moessbauer > --- > meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > 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 > a24e04f3..7a65a98d 100644 --- > a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ > b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -415,9 > +415,9 @@ class BootimgEFIPlugin(SourcePlugin): grub_cmd += "reiserfs > regexp " + grub_modules exec_cmd(grub_cmd) > elif source_params['loader'] == 'systemd-boot': > - kernel_dir = os.path.join(rootfs_dir['ROOTFS_DIR'], > "usr/lib/systemd/boot/efi/") > - for mod in [x for x in os.listdir(kernel_dir) if > x.startswith("systemd-")]: > - cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % > (kernel_dir, mod, hdddir, mod[8:]) > + imager_efi_dir = "/usr/lib/systemd/boot/efi/" > + for mod in [x for x in os.listdir(imager_efi_dir) if > x.startswith("systemd-")]: > + cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % > (imager_efi_dir, mod, hdddir, mod[8:]) exec_cmd(cp_cmd, True) Reject! Touching a forked file will need that fix upstream first. Or (more likely) need to play with some variables to make that upstream code work. Check the diff between the fork and the original, and the commit history! The code looks a bit weird, the idea is to only insert a few lines here and there to hopefully be able to keep up with upstream more easily and avoid merge conflicts. What you are proposing here is very much against that principle. Henning > else: > raise WicError("unrecognized bootimg-efi-isar > loader: %s" %