From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7143622811904376832 X-Received: by 2002:a5d:6c6e:0:b0:22a:c36d:e411 with SMTP id r14-20020a5d6c6e000000b0022ac36de411mr4995380wrz.183.1663937002739; Fri, 23 Sep 2022 05:43:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d20c:0:b0:228:ddd7:f40e with SMTP id j12-20020adfd20c000000b00228ddd7f40els2348795wrh.3.-pod-prod-gmail; Fri, 23 Sep 2022 05:43:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5OO0nTWsFiYntACGz5igarKbVCy0YgYWQhCgCC/7/alIaUniNANF+K7//UjPrgfeqg0KB0 X-Received: by 2002:adf:e199:0:b0:228:60f6:f775 with SMTP id az25-20020adfe199000000b0022860f6f775mr5095995wrb.478.1663937001456; Fri, 23 Sep 2022 05:43:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663937001; cv=none; d=google.com; s=arc-20160816; b=ERXgxKVko6ZyNIv69fES81zxgwQ2oaSSRnoppnJxj1wGpC3ycIvwx/DAPpab3tW/pE YD11/xUA6n59+cr5cCPLMrogTWiV2+fE3qae0rcAZXvA7UNo/Za6Ax/liCxrYnlJOKPi o/uyisSPMiwt7K0fQIwUpC3sOmsXrEqaOp57dsWI2BO57Ksvd1QG8hOTs1Tg8ioZrBoL MgYSOdx7C/PDzma5mSDQZF6Dy4K96dvODptNd2e6yWYLkcBfrZPrbgQXQwengEefwlLP Pc3Mnd1U7/7ffLefsPRfmvFLXbcdb/AdTQjjmNAa3403+Asna+2fgb4sfFQ5Iim+l8aV KFHw== 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=AUzRa/fdC24YxyL3J56gpg7NvKWkvgi1qnwlUbLwnlE=; b=JxlKE0pPFvWTXWbFwhQV/zqAfiC2o42P4bqc1dPuYC/+FehdkUxAVprFjqaMkghwwE Tc7xB397Wlky+jX3Hh4b736295OUQfn0SgkXCDaGww2JsT9EtqN1UktYutydMBVvlkNy oMt6dfAoKnIU6WAI9KzL5OTKn53oo0PRYdClp9bZDMb6xXw1rMH78BJigU+uVkGa8Sie lCFFBtvUPQeRvNHpcIa6KrAYDX1tV2v1dyhV02bqglsvlYTi3eNgRCmFvl9f2n/C4n8y EWwnUlvzR/1BQC8dELglxFEdKHc1XrQr1GzbRuL0X/sVZ0ATpbon+SaUg5kAIB+qaJJo 0LuA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=kOp0by61; spf=pass (google.com: domain of fm-72506-2022092312432117b61e025780f1d954-1srhdb@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-2022092312432117b61e025780f1d954-1SRhdb@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.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Sep 2022 05:43:21 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-2022092312432117b61e025780f1d954-1srhdb@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=kOp0by61; spf=pass (google.com: domain of fm-72506-2022092312432117b61e025780f1d954-1srhdb@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-2022092312432117b61e025780f1d954-1SRhdb@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 2022092312432117b61e025780f1d954 for ; Fri, 23 Sep 2022 14:43:21 +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=AUzRa/fdC24YxyL3J56gpg7NvKWkvgi1qnwlUbLwnlE=; b=kOp0by615nMx6FsFNGuvjo8kBCUNOfdSdhYKiieuUBM3qg0wHMcDBqXYQ7P+FPrEYwMESC DLYqE35jXYDqN9cQmZHE8KtSX1mi8lAmt4rbI86UjXSDrLgnPmCsypO8+I8KikJSMoS6VSRn bxUHxpdgUMFLyu6MaCdH6w5AlOBtg=; 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 2/5] wic: locate systemd-boot efi files in buildchroot Date: Fri, 23 Sep 2022 14:43:06 +0200 Message-Id: <20220923124309.828972-3-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: 8seLnLCzJZsU 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bdc04547..006c8bc2 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -438,7 +438,7 @@ class BootimgEFIPlugin(SourcePlugin): 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/") + kernel_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:]) -- 2.30.2