From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7000822935908777984 X-Received: by 2002:a19:655e:: with SMTP id c30mr6097747lfj.142.1630059937204; Fri, 27 Aug 2021 03:25:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8945:: with SMTP id b5ls1731311ljk.8.gmail; Fri, 27 Aug 2021 03:25:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUnGSBzTY8pXk8vOnV/n4i2duDxriANEdLuKb1eahDFJVkybWnylJ2KjGaQj1L1++gekmS X-Received: by 2002:a2e:b0e8:: with SMTP id h8mr6948829ljl.189.1630059936135; Fri, 27 Aug 2021 03:25:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630059936; cv=none; d=google.com; s=arc-20160816; b=oNQBd1Ok6lTmwPwp+6+1SJFkjOX7xtko3gaxZztJ/5XJHr4OGjEPz1z/zD/v0x6ScS FQd/xfPtZB0CjcvTDDQ4svjXEs21EgbE8ctR4pMPx4KWFb78/8b4n7douhynCdjP0fPK 4iFFLzjSO2BurfnmTiavPaJtOYmIhhjwe2ORsdsEgU4/yxjW0iwnqIw9sJFUsMTkMqVE AH93gJVXBvMrRqjxF659CA+HcYP3K/rzWohibyPJZib/FSJiJBofcl6k5WMaE9ZLv0yt Qt2dmyowdjXCSndejTMBo9Q/7DK+S53ahJgtem57AkzY4ok7kGmhtEAU6hivB16EZN6Z skAg== 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=SD2PrBlQt4MTmGOMSAh88gjxBRSFGU4BphxTjGOUqsM=; b=pzwFFUCKPxM//VWUbALbBZ/iaZK7jj60kh+eVdVoIJbCGVcotAtsZvjv/jes1nwjTK Inbp6bNQ41CrSXQkliYRmls35O3jZXVy/MTpH3HxcZOP/cXRKRUTJg5BnnHKZzhe+dYO kp94vq/jb+ezv/NZYQ6c3ozXwkqX6JHPQFsWpCqoCBZ3d993azVeetUoMzCwa534cR2Y Mppu1EynBhoVIPbU4/Mnx2iJBk43zt+/237cy4RZUGR1CbAdXzqPBsBzzQkzPlCdqa/A L+5LeBxa5jypt//fe8mo4iCH3Go2RhyY8PNB/WVDIt+IJhYcGUcuFthSFUHiWTFh50yD E5bA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id z4si393978lfr.2.2021.08.27.03.25.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Aug 2021 03:25:36 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 17RAPZqE018953 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 27 Aug 2021 12:25:35 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17RAPZZ6031573; Fri, 27 Aug 2021 12:25:35 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v2 1/3] git: reset our fork to OE upstream for re-forking Date: Fri, 27 Aug 2021 12:25:31 +0200 Message-Id: <20210827102533.11100-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210827102533.11100-1-henning.schild@siemens.com> References: <20210827102533.11100-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 6BjjnNm+HwGU 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 file from our current OE version in this tree as basis for later changes. Signed-off-by: Henning Schild --- .../wic/plugins/source/bootimg-pcbios-isar.py | 124 +++++++----------- 1 file changed, 47 insertions(+), 77 deletions(-) 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.31.1