From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6641861376070385664 X-Received: by 2002:a50:a5f1:: with SMTP id b46mr9327975edc.12.1546867379309; Mon, 07 Jan 2019 05:22:59 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:85d4:: with SMTP id i20-v6ls194483ejy.2.gmail; Mon, 07 Jan 2019 05:22:58 -0800 (PST) X-Google-Smtp-Source: AFSGD/XAJ8MDZm2C4zuVp/02tIdAho6rZtFneseTPe1ORfkfi+AXSnHq9ebhanU1QBPW6D8j4wy8 X-Received: by 2002:a17:906:2352:: with SMTP id m18-v6mr7983277eja.9.1546867378762; Mon, 07 Jan 2019 05:22:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546867378; cv=none; d=google.com; s=arc-20160816; b=Sknm19gZYFgquM2E4ueJwq7ojg6YhVZ2PSZaFJ2mcsIldQtIDA6Gt7RsIpE+c+nz5X 046MDDMpKMJ3eR1u9BdkNUcpOwYY2Rx1Qp5NKKsC3EKFH5Dyk+ZbBZfH8kBpnRd79Z0C BX8FbUKrihC49dGeVwn0dvA5KtJWq2vi0PVZ5DqafKoPgG5ypB7QE4HlV4ijCWhXOckn /juY6QWRbEq+cTJ7sIk2jWBJ4E+Vp56POuciZgLFjrUt8+05QLABVSfNm7IRY65U3LkO f/oI96ehu+6j51lnkyvG+txyz7C4tG50juFBTCrKiBY4y5YtFTfZrB4oPHPeTp3AkAlZ mfjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=CBXAcN2wjstLAZOiqJ4T0/oIVAMPU2meZUCIFRQ+4CI=; b=EScD67kCMrsWMcvMxj+ct5+dKQKGsToYHB5i+9nsnuYMD8EMWqM1M4N5n2BxxiUbVy w28gEa6NSSWGfJJb96Z2CbCt8ZeNX1X4Gxqg2F/pthpA44pUHkw9DTY++ZBS9x/tlZtm J2Y3utMG34U34GJfmqSJzwSqVCUSw7qtu3qtpjEIViEJUKuTlKYk1OgpqE7T0FrMPJjz FGAijz/vZ/1aOLuQ3PDFWQ9j01hEs3ukx/xYD/jh7wq5sfbdUdAMRcC+Z9wGgTHUf4rt tP0rhB2HJqK8KjYgqSKDhl/BVLHAbZAxF7YJGz9XQYGhQ3JgglFmTtwtvhLxmOBfyPK5 07Ag== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id m24si2263449edc.3.2019.01.07.05.22.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Jan 2019 05:22:58 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x07DMwsL031924 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 7 Jan 2019 14:22:58 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.158]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x07DMvhP016163; Mon, 7 Jan 2019 14:22:58 +0100 Date: Mon, 7 Jan 2019 14:22:56 +0100 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH 2/7] bootimg-efi-isar: Run grub-mkimage without own config Message-ID: <20190107142256.6471f846@md1za8fc.ad001.siemens.net> In-Reply-To: <11dba16a54299e2358ada5f6a8d27e3c03d780d8.1546428857.git.jan.kiszka@siemens.com> References: <11dba16a54299e2358ada5f6a8d27e3c03d780d8.1546428857.git.jan.kiszka@siemens.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: pcQ87OOjj7z4 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? 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 "