From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6641861376070385664 X-Received: by 2002:a19:740a:: with SMTP id v10mr3397268lfe.16.1546869761597; Mon, 07 Jan 2019 06:02:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8ec8:: with SMTP id e8-v6ls60710ljl.5.gmail; Mon, 07 Jan 2019 06:02:41 -0800 (PST) X-Google-Smtp-Source: ALg8bN6JPFKvoFJzAaxZy7rqdNxtgn13/mmLnxlKMx+6Smc8tQXbLn1/5erEhlqQysms9O8eBGMp X-Received: by 2002:a2e:9119:: with SMTP id m25-v6mr3984568ljg.22.1546869761026; Mon, 07 Jan 2019 06:02:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546869760; cv=none; d=google.com; s=arc-20160816; b=Mbe5I5+hHIdaGzrL2rukj22mzc3Tr/X2AUFr7tw83R8Q3sZhEZdQc2VP/dE3oH55Y/ 8YUzxhWOFSl4CkQ9tEg6FH3wU/Q5PARD4QEdMHNLaC0t3j6SvlOLMjG8vrYlfUr0kkPv 9GraoJxd/QMNT+EgG6FLgBDKtEWnjHgqfEFWC+xtXMXgwuy0QqvljQzc5MNxCKeD03SL /TLS6KCqFMBABE1paHMvaEeBKJA+gxemRLYvlOl5TiHGR8gglHe8GjdZ5cJBlH+YMI3o vDWJyxtlUd5uDJcbBEEAhig3H3l51mQOtkPnrXM/dOT+dYUUlp7Xe5vFXqNmTY/EFc6x MXMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=IOi/EZwPfvw8yPlxUDfeWqc682cigUWuW1O6EvTSDRc=; b=NBwsMOUdnUfYATdTOyYU00QIwc42r8lsMSjIZGWJ3rVXhC0ANxK/Zp/O7hAHfXZfR5 //yJKbsr5JyTGLf1MjYuiJWneFuY41vJfEoP+uzonExGbd+kJStMvFZDbpy3Ngi3U7og C5+zBJT4nuc7eH27H1FxGclrf3AwWGI1R43Ru88LwdqUyHY8UhnTQ8zvv4imtmMGlYmf HCbJHv1TFAEbkfyKtqzzFaC4Cyn0Gy9UNye04c4xkafHHSB2JGQnl+rxiKwxhR/yp8Oa 9ijAaY4KYow1HW29ESYmoWiOsLctPghJ3swAWD5BG/OXqIfHaQqlUzyhLqVANcgoTIQT d2CQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id e17-v6si2628180ljg.5.2019.01.07.06.02.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Jan 2019 06:02:40 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x07E2ed0031989 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 7 Jan 2019 15:02:40 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x07E2d4i026075; Mon, 7 Jan 2019 15:02:40 +0100 Subject: Re: [PATCH 2/7] bootimg-efi-isar: Run grub-mkimage without own config To: Henning Schild Cc: isar-users References: <11dba16a54299e2358ada5f6a8d27e3c03d780d8.1546428857.git.jan.kiszka@siemens.com> <20190107142256.6471f846@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: <702a6e21-d401-8807-880d-39b0b242ea2d@siemens.com> Date: Mon, 7 Jan 2019 15:02:39 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20190107142256.6471f846@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: GcBwH08jsxeK On 07.01.19 14:22, Henning Schild wrote: > Am Wed, 2 Jan 2019 12:34:12 +0100 > schrieb Jan Kiszka : > >> From: Jan Kiszka >> >> This avoids hard-coding hd0 into the generated image. Rather rely on >> grub automatically setting 'prefix' to 'cmdpath', the location where >> the firmware started the grub executable. > > This is a fork of a file from upstream wic, probably with minimal > changes. Could you double check the diff against the original file, and > check if a wic update would fix that? Upstream never had a grub-mkimage.cfg, that was already local deviation. But upstream shares many of the deficits that my follow-up patches address. Jan > > Henning > >> CC: Henning Schild >> Signed-off-by: Jan Kiszka >> --- >> meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 9 --------- >> 1 file changed, 9 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 >> 44ce399..0d5d018 100644 --- >> a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ >> b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -91,12 >> +91,6 @@ class BootimgEFIPlugin(SourcePlugin): cfg.write(grubefi_conf) >> cfg.close() >> >> - cfg = open("%s/hdd/boot/EFI/BOOT/grub-mkimage.cfg" % >> cr_workdir, "w") >> - mkimage_conf = "set root='hd0,gpt%d'\n" % bootpart.realnum >> - mkimage_conf += "set prefix=($root)/EFI/BOOT\n" >> - cfg.write(mkimage_conf) >> - cfg.close() >> - >> @classmethod >> def do_configure_systemdboot(cls, hdddir, creator, cr_workdir, >> source_params): """ >> @@ -211,8 +205,6 @@ class BootimgEFIPlugin(SourcePlugin): >> if source_params['loader'] == 'grub-efi': >> shutil.copyfile("%s/hdd/boot/EFI/BOOT/grub.cfg" % >> cr_workdir, "%s/grub.cfg" % cr_workdir) >> - >> shutil.copyfile("%s/hdd/boot/EFI/BOOT/grub-mkimage.cfg" % cr_workdir, >> - "%s/grub-mkimage.cfg" % cr_workdir) >> for mod in [x for x in os.listdir(kernel_dir) if >> x.startswith("grub-efi-")]: cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % >> (kernel_dir, mod, hdddir, mod[9:]) exec_cmd(cp_cmd, True) >> @@ -245,7 +237,6 @@ class BootimgEFIPlugin(SourcePlugin): >> >> # TODO: check that grub-mkimage is available >> grub_cmd = "grub-mkimage -p /EFI/BOOT " >> - grub_cmd += "-c %s/grub-mkimage.cfg " % >> cr_workdir grub_cmd += "-O %s -o %s/EFI/BOOT/%s " \ >> % (grub_target, bootimg_dir, >> grub_image) grub_cmd += "part_gpt part_msdos ntfs ntfscomp fat ext2 " > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux