From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7143622811904376832 X-Received: by 2002:a17:907:9605:b0:6f5:c66:7c13 with SMTP id gb5-20020a170907960500b006f50c667c13mr332895ejc.66.1663254298461; Thu, 15 Sep 2022 08:04:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:7c54:b0:730:6969:95e6 with SMTP id g20-20020a1709067c5400b00730696995e6ls2524573ejp.7.-pod-prod-gmail; Thu, 15 Sep 2022 08:04:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4fC6Vo9GyeqtwWIyhbrsvvTzYJwgl+3fNodh/5R9auVIWlLs4m7MDmin8ilbbdgiW6nifJ X-Received: by 2002:a17:907:72cf:b0:780:2618:97d4 with SMTP id du15-20020a17090772cf00b00780261897d4mr322581ejc.150.1663254296776; Thu, 15 Sep 2022 08:04:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663254296; cv=none; d=google.com; s=arc-20160816; b=UiqQoV0Vc5aU8rdmzsGC3n0r+7WbM+EyL/6Qc8wxfafqZlheRzDuNEPA1YFqV48CgZ m2OYCajKCqv4rdJTGHDR6+/UnwPQfU6jqN0+7NyygvxcURq9LRU1T5EWnYuBeDGc4mFv 2aywgoSv/BuvEOogrZxmSIXh0Z+bxGIOcZzSxZtp9dl53+OurcYpBlGoO50Kp9YMotDA GxxsvOan+XOIycDX6z14D4H8iIwWh8oEs/lM6hFdu6jLjZ7ruD4ZMeTZuOGq4D19cevt aGVsVjQ3SRxzkwd4lRbs0nipG4UzQoPUu6OgajNqexSrlKrTTg6JhJqDKZP7qm4AS1kN eT6w== 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=o4CRlatEc1WDL6cS8VbZIB3cZEmdJ4Zl8ZpK91mY8HFkAEy37UbI22gJ9VcFGL2Y8c Qw9hpFuSQ/ujn2nCct8djEUgssxZjzWTYyYUo4sjoK7Tfsk8fNJ8ZMM/Qkglmp+HNtGV mgVYXsoTYdprrp1Z/RMaMy+PfIXSUpiu3H4wVaCDpNJnTsuirYLZSPHAvq703S5r3d9O 3flT4eqoMLyU7IQs3vjz2N0iQbAI5LbtFi/VOdc0Mu7PvYJYoDxPR2PDO2zXvz88uzI6 AhnKb71sRYoDqOmpUcc33fyMl1Yb00+F/P8ue8RUZKrGIATF1yvVlKtG9aIczEkESumf 7vKw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=nMfU0G3N; spf=pass (google.com: domain of fm-72506-20220915150456fd63c52f9cf1626bf4-7zqhex@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20220915150456fd63c52f9cf1626bf4-7ZQHeX@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id gv57-20020a1709072bf900b0077e2b420e6esi359360ejc.0.2022.09.15.08.04.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Sep 2022 08:04:56 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220915150456fd63c52f9cf1626bf4-7zqhex@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=nMfU0G3N; spf=pass (google.com: domain of fm-72506-20220915150456fd63c52f9cf1626bf4-7zqhex@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20220915150456fd63c52f9cf1626bf4-7ZQHeX@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20220915150456fd63c52f9cf1626bf4 for ; Thu, 15 Sep 2022 17:04:56 +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=nMfU0G3NjUxr/MRVCZCKO9ow32dhhZegINfzezk21tsL8NWsqPJMtsP/SwX3K5seZz6yY3 rTpFcG1M1n5pzdBri3cjjp0plpe0OTyXO175197oO8xEVC2kRtoMSez7QVEnTbZlvKOwJjXT LgCtYHvOnXlMEZJKn4FMYBM7hhxxQ=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: amikan@ilbers.de, jan.kiszka@siemens.com, henning.schild@siemens.com, Felix Moessbauer Subject: [PATCH v2 1/4] fix: do not overwrite kernel_dir in efi-isar wic Date: Thu, 15 Sep 2022 17:04:40 +0200 Message-Id: <20220915150443.887858-2-felix.moessbauer@siemens.com> In-Reply-To: <20220915150443.887858-1-felix.moessbauer@siemens.com> References: <20220915150443.887858-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: 2hHjnKWFOg6q 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