From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6641861376070385664 X-Received: by 2002:a50:ac53:: with SMTP id w19mr1010586edc.3.1547616751491; Tue, 15 Jan 2019 21:32:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:3484:: with SMTP id g4-v6ls899520ejb.8.gmail; Tue, 15 Jan 2019 21:32:30 -0800 (PST) X-Google-Smtp-Source: ALg8bN5/oNOUFXQTPTrzYsZigJ+UrBM2j6iPR3o1Qr17diitMNdNgM1tAWjhaQ9o2zdrxDRMp7Rk X-Received: by 2002:a17:906:6006:: with SMTP id o6-v6mr902372ejj.4.1547616750886; Tue, 15 Jan 2019 21:32:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547616750; cv=none; d=google.com; s=arc-20160816; b=MyoB2epqM257Ei3CMKf1EYWlXRKdfvsMg2reU98gJe4bTol9bFdNrUC+I36YNP/dmt WnQtUow1Rvu4t8oLmyu403oZZb3Kil7dSGlaQ8/6qYwr3v/+vkNO8RQYL//YxwOebG0g i4aUXWklg5//ZboYxIGTptb+R/05L5xTiJy/D6xAfBGu/eftGaTx1BpQidvuJgoXmaUp 9jGsAiEspKhRVnv7fvGr15fZmN3Wkz35b6hfGPvGGUlXxxMDgpSXbzG1f6Ja47mx/WgF LOXiNriKykMbYwMT0JT+eUSGhc/G5bq3cLNFEEb0RJDdcCedCdS0vYdN+cbgieqBb1sS K3iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from; bh=BYV75J3GHRijcwxYWmZIvezdzQ/UsfIuNjAoZEP7LJI=; b=wxLjS/l/vrFepbpInl2SjpaTcFhRwsaKEX33L4KbVvLnFldYMGGS19M1Az6XbLcg1F 8qU3MQQ3Nalt4nnAASoyBEjZGDmEeAH8PKDmR8++sMSW0Uxbx6RxPPniI253PXuq6s9U JKvO6uDr0WtUaCDf0+VXETIBLIUbm/igTJQi0GJ4TrOJbrLoklTJvqWAl5dYfahZPBQo b6/S6mIf/skM4iH5rbVYLxu6/2WpGlfIzmbvkXhxjRwY47Yms8D7y28e0qE0jxlV/ec3 PiRJ4qYYc5RS4bD3CMnX4rCkPMxb/Rn38/XAtsbwfzPaHsM0r2BZ9lQ9Bh8Ycy73IMBZ 8szg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id a3si734950eda.0.2019.01.15.21.32.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jan 2019 21:32:30 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x0G5WUaT001997 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 16 Jan 2019 06:32:30 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.33.125]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0G5WRoK011496; Wed, 16 Jan 2019 06:32:29 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH v3 02/14] bootimg-efi-isar: Run grub-mkimage without own config Date: Wed, 16 Jan 2019 06:32:15 +0100 Message-Id: <26b4cb73d5038bb9f41306bea161ca3476462262.1547616747.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: tHDEmd5MS8S8 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. 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 " -- 2.16.4