From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7003689951757860864 X-Received: by 2002:a05:651c:210d:: with SMTP id a13mr2736174ljq.247.1630673640240; Fri, 03 Sep 2021 05:54:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:503:: with SMTP id o3ls1176445ljp.0.gmail; Fri, 03 Sep 2021 05:53:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGA+TLXGKG2HDxTjlFZGIkuzu+0JlmYSH43at1HUslLrRnnpAwZb3f+JLfKKYOgO2ReOYd X-Received: by 2002:a2e:7814:: with SMTP id t20mr2848365ljc.13.1630673638994; Fri, 03 Sep 2021 05:53:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630673638; cv=none; d=google.com; s=arc-20160816; b=nO8L/61rYOmRwUjMKRKWndFOlD6kFWFOQdBaZAx2qUewsKMCb+IAQC5cz6rVXcjftt PeNefoUsy8LGPSNBiIKo0uDzqYc0VrG+iJt3vmVMKYmTZRZX/u+hYyyJEGYhGUCDSCHc 1ClTfnHmyHNJ+aauTxsiUAlGZuc0rmdyECvjNFsXCzFYHp7AtnAlUyp4hTtkwFsRtG69 jUGuxZdtKoB9/kFWaMPlLjoP9WcJlRW3BeC23AnHAugxZMxhYd2nzcSZ53Yd5o8c2pNz AsgrZm/NEpQAwG7jZcR7F7p9H50HIsX5ZpUBwTFlzjzX9euuBXi6nHoRjshCX8KBqCK2 mnMw== 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:date:subject:cc:to:from; bh=tAmZ0gN85y50hJyztalM3sCMnA/jf6nR14Jfk2U5NZ4=; b=N877+NIsL4q1rq48Es8crQZblxGV/I7gPXPgXkEpe4Q56HX/HE/Mfzkg8L5I4A+ZFL 0Bq70zccq/I9HFpvXun50MHGpVNa5iSC6/QhQeUi31QTPSmD5B6fYxrBhEP6gFq/lWu7 7DAxhxCVZREQeoEzl1q4WbaK4vqx7gBA2VswWMy0qvDd7iP8BPBWq1m/t91dYEU2PdHM qxZwPqqu1iIFt/0DMYJZAu2TyX+q+wOGQoePIdvHUHYuGetG3xJI/vUS6pPzj6WIIlGA HsaXgfVs+89fi7RcGWT07tVEGrH8EWT83milAxzEgpRGAa+Bnrmm998SulRwOP1GORZ0 mu0A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id bp17si162553lfb.0.2021.09.03.05.53.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Sep 2021 05:53:58 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 183Crwpa013614 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 3 Sep 2021 14:53:58 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 183CrvAx029234; Fri, 3 Sep 2021 14:53:58 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Florian Bezdeka , Vijai Kumar K , jan.kiszka@siemens.com, Henning Schild Subject: [PATCH v2 1/7] wic: reset our plugin forks to OE upstream for re-forking Date: Fri, 3 Sep 2021 14:53:49 +0200 Message-Id: <20210903125355.12279-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210903125355.12279-1-henning.schild@siemens.com> References: <20210903125355.12279-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ltZshA6foBr2 Note that this commit alone will not work. It is just to get back to a starting point for clean history. It takes the original files from our current OE version in this tree as basis for later changes. Signed-off-by: Henning Schild --- .../wic/plugins/source/bootimg-efi-isar.py | 242 +++++++++++------- .../wic/plugins/source/bootimg-pcbios-isar.py | 124 ++++----- 2 files changed, 199 insertions(+), 167 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 8094e8f74890..cdc72543c200 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -1,24 +1,10 @@ -# ex:ts=4:sw=4:sts=4:et -# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- # # Copyright (c) 2014, Intel Corporation. -# All rights reserved. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# SPDX-License-Identifier: GPL-2.0-only # # DESCRIPTION -# This implements the 'bootimg-efi-isar' source plugin class for 'wic' +# This implements the 'bootimg-efi' source plugin class for 'wic' # # AUTHORS # Tom Zanussi @@ -27,11 +13,15 @@ import logging import os import shutil +import re + +from glob import glob from wic import WicError from wic.engine import get_custom_config from wic.pluginbase import SourcePlugin -from wic.misc import (exec_cmd, get_bitbake_var, BOOTDD_EXTRA_SPACE) +from wic.misc import (exec_cmd, exec_native_cmd, + get_bitbake_var, BOOTDD_EXTRA_SPACE) logger = logging.getLogger('wic') @@ -41,10 +31,10 @@ class BootimgEFIPlugin(SourcePlugin): This plugin supports GRUB 2 and systemd-boot bootloaders. """ - name = 'bootimg-efi-isar' + name = 'bootimg-efi' @classmethod - def do_configure_grubefi(cls, creator, cr_workdir, bootpart): + def do_configure_grubefi(cls, hdddir, creator, cr_workdir, source_params): """ Create loader-specific (grub-efi) config """ @@ -61,29 +51,52 @@ class BootimgEFIPlugin(SourcePlugin): raise WicError("configfile is specified but failed to " "get it from %s." % configfile) + initrd = source_params.get('initrd') + + if initrd: + bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") + if not bootimg_dir: + raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") + + initrds = initrd.split(';') + for rd in initrds: + cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir) + exec_cmd(cp_cmd, True) + else: + logger.debug("Ignoring missing initrd") + if not custom_cfg: # Create grub configuration using parameters from wks file bootloader = creator.ks.bootloader + title = source_params.get('title') - kernel_initrd_path = "/" - if get_bitbake_var("DISTRO").startswith("ubuntu"): - kernel_initrd_path = "/boot/" - - grubefi_conf = "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n" - grubefi_conf += "terminal_input --append serial\n" - grubefi_conf += "terminal_output --append serial\n" - grubefi_conf += "\n" + grubefi_conf = "" + 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 - for part in creator.parts: - if part.mountpoint == "/": - grubefi_conf += "regexp --set bootdisk '(hd[0-9]*),' $prefix\n" - grubefi_conf += "set root=$bootdisk',gpt%d'\n" % part.realnum - grubefi_conf += "\n" - grubefi_conf += "menuentry 'boot'{\n" - grubefi_conf += " linux %svmlinuz root=%s rootwait %s\n" \ - % (kernel_initrd_path, creator.rootdev, bootloader.append or "") - grubefi_conf += " initrd %sinitrd.img\n" % kernel_initrd_path + grubefi_conf += "menuentry '%s'{\n" % (title if title else "boot") + + kernel = get_bitbake_var("KERNEL_IMAGETYPE") + if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1": + if get_bitbake_var("INITRAMFS_IMAGE"): + kernel = "%s-%s.bin" % \ + (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) + + label = source_params.get('label') + label_conf = "root=%s" % creator.rootdev + if label: + label_conf = "LABEL=%s" % label + + grubefi_conf += "linux /%s %s rootwait %s\n" \ + % (kernel, label_conf, bootloader.append) + + if initrd: + initrds = initrd.split(';') + grubefi_conf += "initrd" + for rd in initrds: + grubefi_conf += " /%s" % rd + grubefi_conf += "\n" + grubefi_conf += "}\n" logger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg", @@ -117,8 +130,10 @@ class BootimgEFIPlugin(SourcePlugin): if not bootimg_dir: raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") - cp_cmd = "cp %s/%s %s" % (bootimg_dir, initrd, hdddir) - exec_cmd(cp_cmd, True) + initrds = initrd.split(';') + for rd in initrds: + cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir) + exec_cmd(cp_cmd, True) else: logger.debug("Ignoring missing initrd") @@ -143,16 +158,30 @@ class BootimgEFIPlugin(SourcePlugin): if not custom_cfg: # Create systemd-boot configuration using parameters from wks file - kernel = "/vmlinuz" + kernel = get_bitbake_var("KERNEL_IMAGETYPE") + if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1": + if get_bitbake_var("INITRAMFS_IMAGE"): + kernel = "%s-%s.bin" % \ + (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) + + title = source_params.get('title') boot_conf = "" - boot_conf += "title boot\n" - boot_conf += "linux %s\n" % kernel - boot_conf += "options LABEL=Boot root=%s %s\n" % \ - (creator.rootdev, bootloader.append or "") + boot_conf += "title %s\n" % (title if title else "boot") + boot_conf += "linux /%s\n" % kernel + + label = source_params.get('label') + label_conf = "LABEL=Boot root=%s" % creator.rootdev + if label: + label_conf = "LABEL=%s" % label + + boot_conf += "options %s %s\n" % \ + (label_conf, bootloader.append) if initrd: - boot_conf += "initrd /%s\n" % initrd + initrds = initrd.split(';') + for rd in initrds: + boot_conf += "initrd /%s\n" % rd logger.debug("Writing systemd-boot config " "%s/hdd/boot/loader/entries/boot.conf", cr_workdir) @@ -175,14 +204,65 @@ class BootimgEFIPlugin(SourcePlugin): try: if source_params['loader'] == 'grub-efi': - cls.do_configure_grubefi(creator, cr_workdir, part) + cls.do_configure_grubefi(hdddir, creator, cr_workdir, source_params) elif source_params['loader'] == 'systemd-boot': cls.do_configure_systemdboot(hdddir, creator, cr_workdir, source_params) else: - raise WicError("unrecognized bootimg-efi-isar loader: %s" % source_params['loader']) + raise WicError("unrecognized bootimg-efi loader: %s" % source_params['loader']) except KeyError: - raise WicError("bootimg-efi-isar requires a loader, none specified") + raise WicError("bootimg-efi requires a loader, none specified") + if get_bitbake_var("IMAGE_EFI_BOOT_FILES") is None: + logger.debug('No boot files defined in IMAGE_EFI_BOOT_FILES') + else: + boot_files = None + for (fmt, id) in (("_uuid-%s", part.uuid), ("_label-%s", part.label), (None, None)): + if fmt: + var = fmt % id + else: + var = "" + + boot_files = get_bitbake_var("IMAGE_EFI_BOOT_FILES" + var) + if boot_files: + break + + logger.debug('Boot files: %s', boot_files) + + # list of tuples (src_name, dst_name) + deploy_files = [] + for src_entry in re.findall(r'[\w;\-\./\*]+', boot_files): + if ';' in src_entry: + dst_entry = tuple(src_entry.split(';')) + if not dst_entry[0] or not dst_entry[1]: + raise WicError('Malformed boot file entry: %s' % src_entry) + else: + dst_entry = (src_entry, src_entry) + + logger.debug('Destination entry: %r', dst_entry) + deploy_files.append(dst_entry) + + cls.install_task = []; + for deploy_entry in deploy_files: + src, dst = deploy_entry + if '*' in src: + # by default install files under their basename + entry_name_fn = os.path.basename + if dst != src: + # unless a target name was given, then treat name + # as a directory and append a basename + entry_name_fn = lambda name: \ + os.path.join(dst, + os.path.basename(name)) + + srcs = glob(os.path.join(kernel_dir, src)) + + logger.debug('Globbed sources: %s', ', '.join(srcs)) + for entry in srcs: + src = os.path.relpath(entry, kernel_dir) + entry_dst_name = entry_name_fn(entry) + cls.install_task.append((src, entry_dst_name)) + else: + cls.install_task.append((src, dst)) @classmethod def do_prepare_partition(cls, part, source_params, creator, cr_workdir, @@ -202,6 +282,23 @@ class BootimgEFIPlugin(SourcePlugin): hdddir = "%s/hdd/boot" % cr_workdir + kernel = get_bitbake_var("KERNEL_IMAGETYPE") + if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1": + if get_bitbake_var("INITRAMFS_IMAGE"): + kernel = "%s-%s.bin" % \ + (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) + + install_cmd = "install -m 0644 %s/%s %s/%s" % \ + (staging_kernel_dir, kernel, hdddir, kernel) + exec_cmd(install_cmd) + + if get_bitbake_var("IMAGE_EFI_BOOT_FILES"): + for src_path, dst_path in cls.install_task: + install_cmd = "install -m 0644 -D %s %s" \ + % (os.path.join(kernel_dir, src_path), + os.path.join(hdddir, dst_path)) + exec_cmd(install_cmd) + try: if source_params['loader'] == 'grub-efi': shutil.copyfile("%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir, @@ -211,52 +308,15 @@ class BootimgEFIPlugin(SourcePlugin): 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" - grub_modules = "multiboot efi_uga iorw ata " - elif distro_arch == "i386": - grub_target = 'i386-efi' - grub_image = "bootia32.efi" - grub_modules = "multiboot efi_uga iorw ata " - elif distro_arch == "arm64": - grub_target = 'arm64-efi' - grub_image = "bootaa64.efi" - grub_modules = "" - 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 += "-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 " - grub_cmd += "search efi_gop font gfxterm gfxmenu " - grub_cmd += "terminal minicmd test 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 regexp " + grub_modules - 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:]) exec_cmd(cp_cmd, True) else: - raise WicError("unrecognized bootimg-efi-isar loader: %s" % + raise WicError("unrecognized bootimg-efi loader: %s" % source_params['loader']) except KeyError: - raise WicError("bootimg-efi-isar requires a loader, none specified") + raise WicError("bootimg-efi requires a loader, none specified") startup = os.path.join(kernel_dir, "startup.nsh") if os.path.exists(startup): @@ -280,12 +340,14 @@ class BootimgEFIPlugin(SourcePlugin): # dosfs image, created by mkdosfs bootimg = "%s/boot.img" % cr_workdir - dosfs_cmd = "mkdosfs -n efi -i %s -C %s %d" % \ - (part.fsuuid, bootimg, blocks) - exec_cmd(dosfs_cmd) + label = part.label if part.label else "ESP" + + dosfs_cmd = "mkdosfs -n %s -i %s -C %s %d" % \ + (label, part.fsuuid, bootimg, blocks) + exec_native_cmd(dosfs_cmd, native_sysroot) mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) - exec_cmd(mcopy_cmd, True) + exec_native_cmd(mcopy_cmd, native_sysroot) chmod_cmd = "chmod 644 %s" % bootimg exec_cmd(chmod_cmd) diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py index 2dc90bd0cd30..f2639e700493 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py @@ -1,24 +1,10 @@ -# ex:ts=4:sw=4:sts=4:et -# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- # # Copyright (c) 2014, Intel Corporation. -# All rights reserved. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# SPDX-License-Identifier: GPL-2.0-only # # DESCRIPTION -# This implements the 'bootimg-pcbios-isar' source plugin class for 'wic' +# This implements the 'bootimg-pcbios' source plugin class for 'wic' # # AUTHORS # Tom Zanussi @@ -26,36 +12,40 @@ import logging import os +import re from wic import WicError from wic.engine import get_custom_config from wic.pluginbase import SourcePlugin from wic.misc import (exec_cmd, exec_native_cmd, - get_bitbake_var, BOOTDD_EXTRA_SPACE) + get_bitbake_var, BOOTDD_EXTRA_SPACE) logger = logging.getLogger('wic') -class BootimgPcbiosIsarPlugin(SourcePlugin): +class BootimgPcbiosPlugin(SourcePlugin): """ Create MBR boot partition and install syslinux on it. """ - name = 'bootimg-pcbios-isar' + name = 'bootimg-pcbios' @classmethod - def _get_syslinux_dir(cls, bootimg_dir): + def _get_bootimg_dir(cls, bootimg_dir, dirname): """ - Get path to syslinux from either default bootimg_dir - or wic-tools STAGING_DIR. + Check if dirname exists in default bootimg_dir or in STAGING_DIR. """ - for path in (bootimg_dir, get_bitbake_var("STAGING_DATADIR", "wic-tools")): - if not path: - continue - syslinux_dir = os.path.join(path, 'syslinux') - if os.path.exists(syslinux_dir): - return syslinux_dir + staging_datadir = get_bitbake_var("STAGING_DATADIR") + for result in (bootimg_dir, staging_datadir): + if os.path.exists("%s/%s" % (result, dirname)): + return result + + # STAGING_DATADIR is expanded with MLPREFIX if multilib is enabled + # but dependency syslinux is still populated to original STAGING_DATADIR + nonarch_datadir = re.sub('/[^/]*recipe-sysroot', '/recipe-sysroot', staging_datadir) + if os.path.exists(os.path.join(nonarch_datadir, dirname)): + return nonarch_datadir - raise WicError("Couldn't find syslinux directory, exiting") + raise WicError("Couldn't find correct bootimg_dir, exiting") @classmethod def do_install_disk(cls, disk, disk_name, creator, workdir, oe_builddir, @@ -64,11 +54,12 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): Called after all partitions have been prepared and assembled into a disk image. In this case, we install the MBR. """ - syslinux_dir = cls._get_syslinux_dir(bootimg_dir) + bootimg_dir = cls._get_bootimg_dir(bootimg_dir, 'syslinux') + mbrfile = "%s/syslinux/" % bootimg_dir if creator.ptable_format == 'msdos': - mbrfile = os.path.join(syslinux_dir, "mbr/mbr.bin") + mbrfile += "mbr.bin" elif creator.ptable_format == 'gpt': - mbrfile = os.path.join(syslinux_dir, "mbr/gptmbr.bin") + mbrfile += "gptmbr.bin" else: raise WicError("Unsupported partition table: %s" % creator.ptable_format) @@ -131,20 +122,11 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): syslinux_conf += "DEFAULT boot\n" syslinux_conf += "LABEL boot\n" - kernel_file = get_bitbake_var("KERNEL_FILE") - rootfs_dir = get_bitbake_var("IMAGE_ROOTFS") - kernel = os.path.basename(os.path.realpath(os.path.join(rootfs_dir, kernel_file))) - kernel_parts = kernel.split("-") - kernel_suffix = "-".join(kernel_parts[1:]) - initrd = "initrd.img" - - if kernel_suffix: - initrd += "-%s" % kernel_suffix - + kernel = "/vmlinuz" syslinux_conf += "KERNEL " + kernel + "\n" - syslinux_conf += "APPEND label=boot root=%s initrd=%s %s\n" % \ - (creator.rootdev, initrd, bootloader.append) + syslinux_conf += "APPEND label=boot root=%s %s\n" % \ + (creator.rootdev, bootloader.append) logger.debug("Writing syslinux config %s/hdd/boot/syslinux.cfg", cr_workdir) @@ -161,40 +143,28 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): 'prepares' the partition to be incorporated into the image. In this case, prepare content for legacy bios boot partition. """ - syslinux_dir = cls._get_syslinux_dir(bootimg_dir) - - kernel_file = get_bitbake_var("KERNEL_FILE") - rootfs_dir = rootfs_dir['ROOTFS_DIR'] - kernel = os.path.basename(os.path.realpath(os.path.join(rootfs_dir, kernel_file))) - kernel_parts = kernel.split("-") - kernel_suffix = "-".join(kernel_parts[1:]) - initrd = "initrd.img" - config = "config" - mapfile = "System.map" - - if kernel_suffix: - initrd += "-%s" % kernel_suffix - config += "-%s" % kernel_suffix - mapfile += "-%s" % kernel_suffix + bootimg_dir = cls._get_bootimg_dir(bootimg_dir, 'syslinux') + + staging_kernel_dir = kernel_dir hdddir = "%s/hdd/boot" % cr_workdir - cmds = ("install -m 0644 %s/%s/%s %s/%s" % - (rootfs_dir, "boot", kernel, hdddir, kernel), - "install -m 0644 %s/%s/%s %s/%s" % - (rootfs_dir, "boot", initrd, hdddir, initrd), - "install -m 0644 %s/%s/%s %s/%s" % - (rootfs_dir, "boot", config, hdddir, config), - "install -m 0644 %s/%s/%s %s/%s" % - (rootfs_dir, "boot", mapfile, hdddir, mapfile), - "install -m 444 %s/modules/bios/ldlinux.c32 %s/ldlinux.c32" % - (syslinux_dir, hdddir), - "install -m 0644 %s/modules/bios/vesamenu.c32 %s/vesamenu.c32" % - (syslinux_dir, hdddir), - "install -m 444 %s/modules/bios/libcom32.c32 %s/libcom32.c32" % - (syslinux_dir, hdddir), - "install -m 444 %s/modules/bios/libutil.c32 %s/libutil.c32" % - (syslinux_dir, hdddir)) + kernel = get_bitbake_var("KERNEL_IMAGETYPE") + if get_bitbake_var("INITRAMFS_IMAGE_BUNDLE") == "1": + if get_bitbake_var("INITRAMFS_IMAGE"): + kernel = "%s-%s.bin" % \ + (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) + + cmds = ("install -m 0644 %s/%s %s/vmlinuz" % + (staging_kernel_dir, kernel, hdddir), + "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" % + (bootimg_dir, hdddir), + "install -m 0644 %s/syslinux/vesamenu.c32 %s/vesamenu.c32" % + (bootimg_dir, hdddir), + "install -m 444 %s/syslinux/libcom32.c32 %s/libcom32.c32" % + (bootimg_dir, hdddir), + "install -m 444 %s/syslinux/libutil.c32 %s/libutil.c32" % + (bootimg_dir, hdddir)) for install_cmd in cmds: exec_cmd(install_cmd) @@ -214,14 +184,14 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): extra_blocks, part.mountpoint, blocks) # dosfs image, created by mkdosfs - bootimg = "%s/boot.img" % cr_workdir + bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno) dosfs_cmd = "mkdosfs -n boot -i %s -S 512 -C %s %d" % \ (part.fsuuid, bootimg, blocks) exec_native_cmd(dosfs_cmd, native_sysroot) mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) - exec_cmd(mcopy_cmd, native_sysroot) + exec_native_cmd(mcopy_cmd, native_sysroot) syslinux_cmd = "syslinux %s" % bootimg exec_native_cmd(syslinux_cmd, native_sysroot) -- 2.32.0