From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6641861376070385664 X-Received: by 2002:a17:906:698c:: with SMTP id i12-v6mr5154387ejr.10.1546428859854; Wed, 02 Jan 2019 03:34:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:994d:: with SMTP id l13ls8658523edb.1.gmail; Wed, 02 Jan 2019 03:34:19 -0800 (PST) X-Google-Smtp-Source: AFSGD/XqZ3qyuOvkvqeydd6fsBXpE89vS/KnOkX8sJBdlSLFsI7+FRa7p6PBNUwhCXu+4uuIjQjS X-Received: by 2002:a50:90f5:: with SMTP id d50mr6048726eda.9.1546428859356; Wed, 02 Jan 2019 03:34:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546428859; cv=none; d=google.com; s=arc-20160816; b=0tD9F1yApsAMzrvtSWvzIphjZxewxZpY5X8efvIFDraEndFfB+Ds4ew6DEmr1XPS0b GHItpTECyH5P4BEkOB5Myw09HUYpp8SlF10VCuKN26oq0QxaVE2qVTdpi4TwxI+3Qtou Fd0I+lo2m+CHQPW71cLpOIDAb61FCUwm+DoBXlz3DqKrtCHQEfOV77QCeFojZygN3CD1 vYoXA25QPGOCmEQ/PCFHIAiDayKSoER5NzscWf3Vsb5ggG6wd9Cq+alpQI0XgM/zoO/k EIvr/zwu1qplmmHLzWZqeGLwJD10az3NMT3RUq56qZc02Uc3LwfFpu1RZxTN96fm2FQH Ic4w== 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=bSaJ7ptx2OApmxeC6Wu8mjTcMVOHV96n+Fd3Xn6YwJ19hONHXfXacEwW8PJRzJpLTc Fyb1IIMHUbdEzS+CxGD/OpqF0SsR+SgGkJTuirxISQo+v4wvkH4BFwgJx7bGcouw9q1g FY8BzMq2s0gqNlL+aS1lG7XYpsGn4LOCyws7y9/2ymDGXDGzFTBRvFxhSNMwLRuBKZzH +7roLottBYw0vydltxkER3YV+mcg4aaLqsVSC5filoxArA7VIVfeuanNPmctOdoaCSE3 lrujszeVZ86xjuVoRbHucvnPg3GMKdEXnMb2XLFbfXxdk9WcaI60cMR4s2hw9mHrIV54 nnDg== 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 a3si1837493eda.0.2019.01.02.03.34.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jan 2019 03:34:19 -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 x02BYItp005160 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 2 Jan 2019 12:34:18 +0100 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x02BYIYM009562; Wed, 2 Jan 2019 12:34:18 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 2/7] bootimg-efi-isar: Run grub-mkimage without own config Date: Wed, 2 Jan 2019 12:34:12 +0100 Message-Id: <11dba16a54299e2358ada5f6a8d27e3c03d780d8.1546428857.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: IwCynNRTdwU0 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