From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6517147827419742208 X-Received: by 10.223.152.204 with SMTP id w70mr3219758wrb.15.1517391723233; Wed, 31 Jan 2018 01:42:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.116.12 with SMTP id p12ls953368wmc.2.gmail; Wed, 31 Jan 2018 01:42:02 -0800 (PST) X-Google-Smtp-Source: AH8x226q8fDyPMJez2x43JX90FF+kFx+cVHnH5c/QkfFHcBlk1KKZA7d4kY5rorj7OA7a+ucQhSE X-Received: by 10.28.4.216 with SMTP id 207mr3291984wme.13.1517391722782; Wed, 31 Jan 2018 01:42:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517391722; cv=none; d=google.com; s=arc-20160816; b=VJwBt0puRYUzduXJ7u0WntiP53M2KfqElLrTzVm5JWeJftQB8wnDMwc1tKL9+OBhJi qOV460QshPtMa7xdTFlq6zhj/fdpdwDOgFEHxnIywIfxvWYGYSYNrPZ521iwN8K2Rr9x kU4k9nc/yyK7EC3uxGyP7gJ+WgyjmTf7bSJduER1gH1PghFH63U0D42l5X6bq8Z2nLTR vwtn5SfHimeesuD0M8b4wPyOFOu7APeQxZgdbOJuvb1UhcyoLcudijOvZxnFMvokXbou nkzs8rOPonjv8uC6/5p+RrNPBxMqUZ1FfdWG84/rddxCCeAkbtEqnTXe6X5ZsYvXvRBh fhGw== 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=VP1IJifkwsEt1p/Wa5B/HUHEPbexdUX/mDoG8mOvDNM=; b=k7kG11zkeji8VFjV7Fp7hc9jr2khigya9nbbbJQyEeKBViKzX3+ocyrWxUjEypluLx V3z2F7Hw5q1zRAAhuafoe8aBG3tSpiB/xZ1XTjZzUTEyB2vL68Exd/Brn9WIreuAs5+x X+/X4tGp+sCbf1sUkO2IvXrPpndXCt9zteYWwuU20ynFNKjCUiGSpjoGtreoe0mQXtxf T3oxXgNj7X5j4HPdNAIkSIoUT10z/HzreoRAdttCmawPmJvzAb8pvbzSB/ODSWMwA9zU +HBose3tQC7K26LDI/414go2mPqz5Ne+4SDJKcL9DNtw9fVVqR9yTzCWpgmveKbCjwNS h9hg== 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 f8si1131777wmc.2.2018.01.31.01.42.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jan 2018 01:42:02 -0800 (PST) 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 mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w0V9g2Pe029646 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 31 Jan 2018 10:42:02 +0100 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w0V9g1aY008484; Wed, 31 Jan 2018 10:42:02 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 4/9] Revert "wic: Make the bootimg-efi plugin generate usable images" Date: Wed, 31 Jan 2018 10:41:55 +0100 Message-Id: <37227b75b4c64456e7a035ac785b9866819990fe.1517390790.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: X-TUID: FvW5XuL2/DXV This reverts commit c8f10e3f541643f6ed6bb3c971bf36267519fba8. --- 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.13.6