From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6543937367387930624 X-Received: by 2002:a19:5c0b:: with SMTP id q11-v6mr968811lfb.33.1523629149310; Fri, 13 Apr 2018 07:19:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.136.196 with SMTP id a4ls909459ljk.1.gmail; Fri, 13 Apr 2018 07:19:08 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+kLLnR/wDX/PCuU5rMriPoVZFFtxHcs+K7DY/+ypydbmme0DruJNCypocMjoVDvQ13IFTy X-Received: by 10.46.83.2 with SMTP id h2mr351130ljb.24.1523629148954; Fri, 13 Apr 2018 07:19:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523629148; cv=none; d=google.com; s=arc-20160816; b=Vl/ZR8XbJ4YWXwdCQW8khQ6AUV1YQTD6vK/qmI2uwCfXcaFALwpYSK0NP5R7LMKBd7 uGBDyP2dPvpdA5XrtQxQJmK1pPL6Rq/h9ksee0HRN0Ro9U4hCLCLfk50EVy9A/OhXykS XFZlpwiGF1xRR1HnkdfvWi2nM/siaEUtdwdzofa1KAfKK6uaYYdjk9wHqo1vYucV/V+e g/ZGyk1bQVisrQusNhcbMUMNYTyBSnuDWQN7zDaxG3baOY1pcY8WccnXsb//CoalUUQE y/KkU6dWGsHPp6v5qnc3MNazdrTf0HIbyHdOh3NJd4QJeODMzntc/uAL7sMttW1WqWRx /oRw== 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:arc-authentication-results; bh=cpSe//X6hK7HKWs74RLpoGwNJc40uLkRT8CRDjnYdM8=; b=oRT3OAORWxSq+DqTRL3rOouAQKCYaH8TECloSqOIn1PygJdJD6FzVu4WIfaKEIleR+ wGxe5y+JseF3bU/5Y6LXkntVhOeagr1Yc+Chygyfwd/O8TRrXcKBUccFALQgVwfjeMkL y4Q6bUOHkI+s0Puv4uwk0nUhVBOhuUQLK5BfhvZeRAELh8gb4w6U1Y9TQcwdAP/zeuB9 egz2QaAdcEO83PdPCxUHAWS7rTcYEENm6LotsEKWlhzj2GV6LJH9EOyE4M42cdvGlIis 9g8vZ1vV6nZs3HQLUxLyP6Pdo9iBtRCR9HOk89uoMdgLyfNkKJJbQrLNb7Kk7rYL8ssG 4Hgg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id k25si205245ljk.2.2018.04.13.07.19.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 07:19:08 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w3DEJ8NB005502 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Apr 2018 16:19:08 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3DEJ8Vr011006; Fri, 13 Apr 2018 16:19:08 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Cedric Hombourger , Andreas Reichel , Henning Schild Subject: [PATCH v2 01/17] Revert "wic: Make the bootimg-efi plugin generate usable images" Date: Fri, 13 Apr 2018 16:18:50 +0200 Message-Id: <79af25e1d5c7397f90f93e2ad3b9ecb0a1f22c1f.1523628814.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: References: In-Reply-To: References: X-TUID: 2RG2KpQG4YdU This reverts commit c8f10e3f541643f6ed6bb3c971bf36267519fba8. We will fork that plugin and leave the original as it is. Signed-off-by: Henning Schild --- scripts/lib/wic/plugins/source/bootimg-efi.py | 62 +++------------------------ 1 file changed, 6 insertions(+), 56 deletions(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 45635f3..f631e3f 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -69,20 +69,12 @@ class BootimgEFIPlugin(SourcePlugin): grubefi_conf += "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n" grubefi_conf += "default=boot\n" grubefi_conf += "timeout=%s\n" % bootloader.timeout - grubefi_conf += "set root='hd0,gpt2'\n" grubefi_conf += "menuentry 'boot'{\n" - kernel_image = get_bitbake_var("KERNEL_IMAGE") - kernel = "/boot/%s" % kernel_image - - grubefi_conf += "linux %s root=/dev/sda2 rootwait %s\n" \ - % (kernel, bootloader.append) - - initrd_image = get_bitbake_var("INITRD_IMAGE") - initrd = "/boot/%s" % initrd_image - - grubefi_conf += "initrd %s\n" % initrd + kernel = "/bzImage" + grubefi_conf += "linux %s root=%s rootwait %s\n" \ + % (kernel, creator.rootdev, bootloader.append) grubefi_conf += "}\n" logger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg", @@ -91,12 +83,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,gpt1'\n" - 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): """ @@ -148,8 +134,7 @@ class BootimgEFIPlugin(SourcePlugin): if not custom_cfg: # Create systemd-boot configuration using parameters from wks file - kernel_name = get_bitbake_var("KERNEL_IMAGE") - kernel = "/%s" % kernel_name + kernel = "/bzImage" boot_conf = "" boot_conf += "title boot\n" @@ -206,9 +191,8 @@ class BootimgEFIPlugin(SourcePlugin): hdddir = "%s/hdd/boot" % cr_workdir - kernel_name = get_bitbake_var("KERNEL_IMAGE") - install_cmd = "install -m 0644 %s/%s %s/%s" % \ - (staging_kernel_dir, kernel_name, hdddir, kernel_name) + install_cmd = "install -m 0644 %s/bzImage %s/bzImage" % \ + (staging_kernel_dir, hdddir) exec_cmd(install_cmd) @@ -216,45 +200,11 @@ 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) shutil.move("%s/grub.cfg" % cr_workdir, "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir) - - distro_arch = get_bitbake_var("DISTRO_ARCH") - if not distro_arch: - raise WicError("Couldn't find target architecture") - - if distro_arch == "amd64": - grub_target = 'x86_64-efi' - grub_image = "bootx64.efi" - elif distro_arch == "i386": - grub_target = 'i386-efi' - grub_image = "bootia32.efi" - else: - raise WicError("grub-efi is incompatible with target %s" % - distro_arch) - - bootimg_dir = "%s/hdd/boot" % cr_workdir - if not os.path.isfile("%s/EFI/BOOT/%s" \ - % (bootimg_dir, grub_image)): - - # 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 " - grub_cmd += "normal chain boot configfile linux multiboot " - grub_cmd += "search efi_gop efi_uga font gfxterm gfxmenu " - grub_cmd += "terminal minicmd test iorw loadenv echo help " - grub_cmd += "reboot serial terminfo iso9660 loopback tar " - grub_cmd += "memdisk ls search_fs_uuid udf btrfs xfs lvm " - grub_cmd += "reiserfs ata " - exec_cmd(grub_cmd) elif source_params['loader'] == 'systemd-boot': for mod in [x for x in os.listdir(kernel_dir) if x.startswith("systemd-")]: cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (kernel_dir, mod, hdddir, mod[8:]) -- 2.16.1