From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7143622811904376832 X-Received: by 2002:a5d:60ca:0:b0:228:d77e:4b25 with SMTP id x10-20020a5d60ca000000b00228d77e4b25mr5276242wrt.139.1663937001979; Fri, 23 Sep 2022 05:43:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:268f:b0:3b4:62fa:43a7 with SMTP id 15-20020a05600c268f00b003b462fa43a7ls1648449wmt.3.-pod-control-gmail; Fri, 23 Sep 2022 05:43:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5pqjnrGHxk7rliOPOJTMwYpcFUCLem28iphCYRHxf7EDrveAHNs7JWdgvMIj/2npkRECVc X-Received: by 2002:a05:600c:4606:b0:3b4:62b3:150b with SMTP id m6-20020a05600c460600b003b462b3150bmr5947061wmo.3.1663937000635; Fri, 23 Sep 2022 05:43:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663937000; cv=none; d=google.com; s=arc-20160816; b=j1vj9/kw7oLmcz8fHVv4OJzBZK3KrOAyUlkpvHmwAkmFotQ0OTdEDDCUMYKsnWSRxo 2kUggeaLSp0J+WUtr0V1wUuPOvheXM4cXz74EvvOqz81Fy5i1bGuX3as+uI9GBiLJNLt YTfvsicncffKeTcyn/5MorHQ/xjB0KT038EHSMr1Xrwh84ZxjptdQSa957oepJ1wJaii 6+lUgemmQnOLT7GQEr08ayNI6wYaTPCFIS3rmKmqJ3ItXmo0WDCPoiUxBzOW5Nu118WK s1J8Go94/E3aMD3zvirqm88w2jFmFTJeHSRvfZcsIYFDnvk4+3/MvulP/4f4Dq0E6BdB UO8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=jJG4bFBr7/8bhvBTakX70J3ORxnRwvpRm5zz7UC4jSk=; b=Ahr5PSQLtrMfnrVrTeuN/UfwU8KMuf3bQU00Iy5BIjXg8T7cCq95M/PXJnnHCiVa++ u60NnxnrnltYrCT0uTLth6tLZlJYRRwLsanTa5MNoK4GQ1JaJVIOytxTM3kRDKP9Y8aw AUh44ueX2xUkOnBIZ2nSJL4G5Q04hWMLjVpx99xdVTM2fzWm5Oq0nTb0NqwGuC5QmvXs rOxGJCQLYGYHOVgo5xzJVuseP6px1pSrLUpqUk9ZTZ48Tn+Slg2siC00DHiUl8fcUmah AR0rxVPV0+gBWg6GacflW+uIvbgYkKVrwF+O+GVua/fROGcHtWdYHlVVmzGftQD+6bGd a9aA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZhhyvfWr; spf=pass (google.com: domain of fm-72506-202209231243206b1541224af005f20d-vqlojg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-202209231243206b1541224af005f20d-vqLojg@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id n42-20020a05600c502a00b003a54f1563c9si84256wmr.0.2022.09.23.05.43.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Sep 2022 05:43:20 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202209231243206b1541224af005f20d-vqlojg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ZhhyvfWr; spf=pass (google.com: domain of fm-72506-202209231243206b1541224af005f20d-vqlojg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-202209231243206b1541224af005f20d-vqLojg@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202209231243206b1541224af005f20d for ; Fri, 23 Sep 2022 14:43:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=jJG4bFBr7/8bhvBTakX70J3ORxnRwvpRm5zz7UC4jSk=; b=ZhhyvfWr460xeimwRdBVJXE+34j5INI3+3/DzwhnR2VxxYa+xZeed+6x9TfaY3UukXRKGe VwwgnZEiRdxPdZyfKS0PJQNRFcNgQfwuEBYXbG5HA/scqBkkR9UWUtJmSSIEYSp+U8DbNiIc TOnVjbh5RT30CtvbAe6X+QXvsV8BY=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: amikan@ilbers.de, jan.kiszka@siemens.com, henning.schild@siemens.com, Felix Moessbauer Subject: [PATCH v3 1/5] fix: do not overwrite kernel_dir in efi-isar wic Date: Fri, 23 Sep 2022 14:43:05 +0200 Message-Id: <20220923124309.828972-2-felix.moessbauer@siemens.com> In-Reply-To: <20220923124309.828972-1-felix.moessbauer@siemens.com> References: <20220923124309.828972-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: EX3bb2nzPzEN This fixes the overwrite of the kernel_dir in bootimg-efi-isar without having in-line changes. The change is written in a way that makes it easy to update the plugin without having to resolve merge conflicts. Signed-off-by: Felix Moessbauer --- meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 5 +++++ 1 file changed, 5 insertions(+) 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 6e6cd6ec..bdc04547 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -436,10 +436,15 @@ class BootimgEFIPlugin(SourcePlugin): grub_cmd += "reiserfs regexp " + grub_modules exec_cmd(grub_cmd) elif source_params['loader'] == 'systemd-boot': + # backup kernel dir before overwriting + kernel_dir_orig = kernel_dir 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:]) exec_cmd(cp_cmd, True) + + kernel_dir = kernel_dir_orig else: raise WicError("unrecognized bootimg-efi-isar loader: %s" % source_params['loader']) -- 2.30.2