From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7128466769373560832 X-Received: by 2002:a5d:6252:0:b0:21e:4457:1bca with SMTP id m18-20020a5d6252000000b0021e44571bcamr5049051wrv.287.1659725507473; Fri, 05 Aug 2022 11:51:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:238:b0:21d:a0b5:24ab with SMTP id l24-20020a056000023800b0021da0b524abls8155164wrz.1.-pod-prod-gmail; Fri, 05 Aug 2022 11:51:46 -0700 (PDT) X-Google-Smtp-Source: AA6agR74AGkmm5GYFjw3Ah+r3Idjta2WDC18wZ0PYFVAHYVoUsd9J4IqvvrIsuujxVhFJYZmTDC9 X-Received: by 2002:adf:f6cb:0:b0:220:7859:7bf with SMTP id y11-20020adff6cb000000b00220785907bfmr4822938wrp.683.1659725506357; Fri, 05 Aug 2022 11:51:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659725506; cv=none; d=google.com; s=arc-20160816; b=x9newNO2E5Fo1q+7L47L3m9TsPX8320s78CM1OQW25mRLKHsRu7fRwGxB7umEzOd27 arHv3gaQ1weVYzkiPZ+RmkWj525RjtCCjNkGmVK0LLGzHc8SXCcieAxvA+o4uRIT/HVZ Vz90xUSQI1OdJyNIuEBGL3DVACFtGHKsZXumqOzS+pXIEBoaEmeEVu4TX42mF6lktdYe g5MRh0EMdC7cP0yyIVLebqASpTwYiRwvMooTYf0gTP2GZYA6zT2GYx4xAwtd82BxtUrD YGxXvyQSDyAbWSI+0uBJyv65CrJqOqNQFtDSfvl3u+k5m92jssZ7tznqajeIIPaBDxn2 CVXw== 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=zcevhn0yWmCZH+NwfonffTTWX7hdxtv8N2OiSijY3R8=; b=YEKx9IyVmsJYWCJxdrpcwlWYgPGp7PU7JrF3XgAjMfjTsXb/aie25L9bviag/zdmaC 7r9YdhvEvSzVfZyMpUNeYq/ijC7IDpMfMXS0vz05M8xCdgskZepiwNiiEhueh21qRp1l KP/bt89w6LQajaRF6UmXYk42ZY4QziNzVJ44wLZ/eY8/9BXHPgxqUPFxKjDBK8jCcMEk 2yIMKVAaYHJ7Tvlvxe7j8/umR6MGVM83Ey0XN+thSLqBuhIHGj+SSRBRigzw4r7VyVYy hR9QyfRUN/W/ZfJySFNx+OfF2RcTbIglnkQ9er31b0xvs13rAa/mDUhQXsHh+rpH6X13 UBbw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=PrhdD67h; spf=pass (google.com: domain of fm-294854-20220805185146577963be67b2f2f292-n0mry0@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20220805185146577963be67b2f2f292-N0mrY0@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id 189-20020a1c19c6000000b003a31bb11cdfsi470323wmz.2.2022.08.05.11.51.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Aug 2022 11:51:46 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20220805185146577963be67b2f2f292-n0mry0@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=PrhdD67h; spf=pass (google.com: domain of fm-294854-20220805185146577963be67b2f2f292-n0mry0@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20220805185146577963be67b2f2f292-N0mrY0@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20220805185146577963be67b2f2f292 for ; Fri, 05 Aug 2022 20:51:46 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=zcevhn0yWmCZH+NwfonffTTWX7hdxtv8N2OiSijY3R8=; b=PrhdD67hm9KuRB2EOgFHC6XR3r5BnT54td7Do2PZ6L78Kuu7hRKTCofXzpgVKIjVd1Ri0l c2PEAgRDTQ9KdIRb+HG3QrtgABzM/ZLLxHH3P7B/oCIt8R3lChOPtBIGbgztjkffYIHnSKn5 QT200eZ+nNg5yK3CXqeThA0uLqBcI=; From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 7/9] wic/bootimg-efi: Factor out some common bits Date: Fri, 5 Aug 2022 20:51:42 +0200 Message-Id: <32a56d0c69f723b02da00087d283df70d048aca9.1659725504.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: UzGg1ssdII51 From: Jan Kiszka The paths for configuring grub and systemd-boot have some common bits around copying the initrd files. This will even grow when adding dtb support. Factor this out into a class function. Along this, avoid evaluating 'create-unified-kernel-image' multiple times in do_configure_systemdboot and suppress a bogus warning about "Ignoring missing initrd" when it is turned on. Signed-off-by: Jan Kiszka Signed-off-by: Luca Ceresoli --- scripts/lib/wic/plugins/source/bootimg-efi.py | 46 +++++++++---------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index a65a5b97..57e79f45 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -34,6 +34,20 @@ class BootimgEFIPlugin(SourcePlugin): name = 'bootimg-efi' + @classmethod + def _copy_additional_files(cls, hdddir, initrd): + if initrd: + bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") + if not bootimg_dir: + raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") + + initrds = initrd.split(';') + for rd in initrds: + cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir) + exec_cmd(cp_cmd, True) + else: + logger.debug("Ignoring missing initrd") + @classmethod def do_configure_grubefi(cls, hdddir, creator, cr_workdir, source_params): """ @@ -54,17 +68,7 @@ class BootimgEFIPlugin(SourcePlugin): initrd = source_params.get('initrd') - if initrd: - bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") - if not bootimg_dir: - raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") - - initrds = initrd.split(';') - for rd in initrds: - cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir) - exec_cmd(cp_cmd, True) - else: - logger.debug("Ignoring missing initrd") + cls._copy_additional_files(hdddir, initrd) if not custom_cfg: # Create grub configuration using parameters from wks file @@ -119,25 +123,17 @@ class BootimgEFIPlugin(SourcePlugin): bootloader = creator.ks.bootloader + unified_image = source_params.get('create-unified-kernel-image') == "true" + loader_conf = "" - if source_params.get('create-unified-kernel-image') != "true": + if not unified_image: loader_conf += "default boot\n" loader_conf += "timeout %d\n" % bootloader.timeout initrd = source_params.get('initrd') - if initrd and source_params.get('create-unified-kernel-image') != "true": - # obviously we need to have a common common deploy var - bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") - if not bootimg_dir: - raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") - - initrds = initrd.split(';') - for rd in initrds: - cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir) - exec_cmd(cp_cmd, True) - else: - logger.debug("Ignoring missing initrd") + if not unified_image: + cls._copy_additional_files(hdddir, initrd) logger.debug("Writing systemd-boot config " "%s/hdd/boot/loader/loader.conf", cr_workdir) @@ -185,7 +181,7 @@ class BootimgEFIPlugin(SourcePlugin): for rd in initrds: boot_conf += "initrd /%s\n" % rd - if source_params.get('create-unified-kernel-image') != "true": + if not unified_image: logger.debug("Writing systemd-boot config " "%s/hdd/boot/loader/entries/boot.conf", cr_workdir) cfg = open("%s/hdd/boot/loader/entries/boot.conf" % cr_workdir, "w") -- 2.35.3