From patchwork Wed Sep 16 06:50:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 56 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp518065ooj; Wed, 16 Sep 2020 07:51:22 -0700 (PDT) X-Received: by 2002:a1f:ed86:: with SMTP id l128mr5214299vkh.16.1600267882560; Wed, 16 Sep 2020 07:51:22 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600267882; cv=pass; d=google.com; s=arc-20160816; b=dOBZZxTfzVsK0TA6DaBQOuuntjCWVAS31q79BWv3c9k7wZdhYlQCgKjR7UqTwXAifN FmP0KzmgKO2N7wQUEPYAupImDBTLp7mvZI61RnM5m0tb5Iz1d1uj7fQfqKb1LRBCLGmR 8re/JLTYierjx3OAdoVE4CyPlRounKoNqa2rP1FXeeQ5Tssue+sCmYJ5JMKBD+tNdsVx ikhh72WynxiEDLsz18h3znlnr4D1Y0u7ugFCLNiqkg1Nf3fmGeh17QUJxGIglZInmfQ9 5AR/1bGDBUDVpAU+7IhzMq73IjGcA+XojyxbfUM9p32iIzrTq0TEXI483gA0SEXHOdV0 fUuQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=XxyuXmmu2LhZdTIcsB2A8dfk8RuBeWQ9nAsqVvl3chw=; b=TNeMk9D2IsvNYFQ6eLG1u7JZT7o02n1Iq5kevYHpa8iI4m2AMhpj+55ASx81TfqhZk 28CJtu62S2lSSIy3y+MHxssH8/JtlVtV5OCIykh/yegYJam6g8lwhEeVUShxH7WWKzno 5YHTw2iyJKpa4pjYF/z/fqceBwfwVjtxTLATi8V3DvVl5SYLReHZ7OVscKdjUv1PBKHH uRQuZvinzr9/o+kHZHK65WpMXYobN/lHvxPRt0WyMxgFsPXKj7Nf1BgPn1nLBzSXuGyR VqNINYTO83sJfXqPa5jdWhNcbv7BrpRR/mbq8sNjBwll2Ppxo4/TmXMXKs0GvXZC26+e 8Ugw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=s2jOtydo; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb2omrd5qkgqeo5647oi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB2OMRD5QKGQEO5647OI@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id q26sor4164642vsn.77.2020.09.16.07.51.22 (Google Transport Security); Wed, 16 Sep 2020 07:51:22 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrb2omrd5qkgqeo5647oi@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=s2jOtydo; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb2omrd5qkgqeo5647oi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB2OMRD5QKGQEO5647OI@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1600267882; cv=pass; d=google.com; s=arc-20160816; b=gFNfvh7WNayDi2HEahfR/R0BkCa49lNir9R8jJqPBOey8ECFWLdyhMWBnoNRvm88cs wHWRsjBlFcaFbTajm4V5JY3aVg7md1olAtRIteXHuDEm1kRj1QTXmf22ColvF6kHxf86 FW86e5c2GbyM9sFBcs+UY9DtegGyvy1m4eW2kXvKG4/MciF5sQjWw0vAjKsSARVnLGmj FD64RaJOHDUIaEExkUKkgYavydcDmnAQnmZlRzPKOcxukeKd06RcOc3L1Yp9rXhJ/oEf kN4JskzwCWZcEO9RLkbeW62/oJn7aAwIZjYflfcuqRpGb3a5ZK9vBjYqRIjvadajkNM2 ChRQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=XxyuXmmu2LhZdTIcsB2A8dfk8RuBeWQ9nAsqVvl3chw=; b=RUgntDNZIp8tOqQ97sAJVFyvH59pJ8kZw5oGvfcHruxw0dHru7h2w0g1xFa22rJ0K8 XtlUqgF2WVfpCAVkHSJEK/qzCmKK9bP/lpdKKJiYICHAcLnf0wF9P6cmurf2EXUvSO5y K7Co8J3YWz7e21J4XZz/QrzjYk7PJnv26Iq0a+f0RNBajEuWN9+/hpPSorv5EZd29R2t NUQ7f+efGCIBwBAbxl3sI23cLE1oUKe4DLZuRyamfXig16qCEeYWoJLWmA+ZbvdBUaRu GpDI3cmSlc0FDs98RswBH/gKsIaYWbOrJ6biBCgAcF1IwxQsGGO/IvWriinKGG5aQrul VKYw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=XxyuXmmu2LhZdTIcsB2A8dfk8RuBeWQ9nAsqVvl3chw=; b=s2jOtydowefBWuqM0NzY6pXTMQ93wKotnI27rK2IU1XRwAuz+5faeU6oX4SiJBewPM Abz7kIobOqYzTkI43m358DDXje/gg2UdpYUbjslqTMAXoGIxG63WO5kWwEq4L5qOE+6K APGfsbnN3eqj1VXmgtEcXI6Tt63IssGhmmXAv1QGvjDph6zPVLmC4pu15AZKSx0X1Xlu yvJh3otczLRHijpnGbZ+ahV2E0vruOHV+CupEEhZkdkVQnoXUi0q3+B2CMWvd2ZB6ax5 1FVXHcaD4JDBAT+5C3h9CSeTsXC4joxvZ9R6p15SywKZ1WtQfIPbXzDlHkS1BgXp433p 7VWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:subject :date:message-id:in-reply-to:references:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=XxyuXmmu2LhZdTIcsB2A8dfk8RuBeWQ9nAsqVvl3chw=; b=J2+bVhZbKNQ6NnK1hRZFOXk4hCkP0b8PkdwsO8d/f6KVGgQuwzAsSXX7VBh43pJ7bn d3EHIRG5KpvpN/Cc2OvMotOPx6D2aPWnerhp5kMW57Ack6aScUnvJiNRi2DFgEwD8Xxu IxCWlX8OP8DlyOmAA7S4vdGMrUh8nvOc29/uXLTChfMijEJmu7w8DNiAaqrePaqeNkjS DvNxSj2O7XcGEkejtvQpQGkU2pEq1Q6o2OwAuPw6xFtkSvXllabjz0kzsfWnVuzFS4gl dAJsC+h6hthOY1skdg+/DvoSdQaboVtbdLbGWvD9a06QZw6/nxnbhpvDBPjBbFtM+aZL bgCw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532oVT90YxY4wbOuxOcXTbAxv0LomaBYOBCqo7cIb82RRbNbk8MA 8ThaJ1V4Sc7rBIsj/5y8/j4= X-Google-Smtp-Source: ABdhPJzKBnembffD8YjIRW+tEyiTyjdMbvJFD+OrZmyd7sNyOoCvOYbt/onG8iglB+KywuTC5uYQ+A== X-Received: by 2002:a05:6102:22c1:: with SMTP id a1mr5299131vsh.44.1600267882177; Wed, 16 Sep 2020 07:51:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6122:554:: with SMTP id y20ls123358vko.2.gmail; Wed, 16 Sep 2020 07:51:21 -0700 (PDT) X-Received: by 2002:a1f:8d8a:: with SMTP id p132mr5019343vkd.14.1600267881599; Wed, 16 Sep 2020 07:51:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600267881; cv=none; d=google.com; s=arc-20160816; b=kTsUHg4+XUzVrBSlWamzBLLf1P6bjPrOU+wrtXR8GE4W/V1jgg31TZwCuf3xlXTYYb Vj7XXV5ngNrwW8CPnv5L0vZKBU8NJeg4TTYyBkWSi+E4IudCnAr59rt1uUGbsj9lROD0 R0qHrMU05BMgSFIpFqORm+pKMvgDesO9tuDe+ye1jE5TuLhWiWGbPhIjHnUdM7olEvbW bwQ/btkvTFsTDPgI6YdWaVkTRwLC7e4oxJ88nqzJwAMJRJWLI2J8koRZ52ffQo9Bqrer eWImsxaCmztR0YN5s1e2AAo9x4mK1ORF3dC5c7bjgOCQ/jzHTF0l/5+cy9oYrg3vOfbF ANYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:to:from :ironport-sdr:ironport-sdr; bh=UYEKBWEe5qoDxUZEg+f7jlNpYWmO9Zm7Oz63SGu5bTk=; b=nub5gVWEQYAI7XkGWz/esHIDoMsYE/v/sXHYd6b/3STxluzBgm8rr1SB+in7bbcQeG 7IlxrZxHHSjeVECwUlPtBq+1+77NNf+q9MlDy2J0va0fOq7EHjKiSeqhCjcaeqfh7ecC 3zBceHhWyeNOqfQD5cH/L2TnE+BRTsXLECDL7jAweQ2QvvdiRJOON6ezIpaJ2QFVCdTn RxO8vI0brbf13u5EOXqobOWyy4l5S7AlL6sSl0bDCMlyzh8fy/JKYy1P1pQLO0AaeVwR C92NEhRIOfdDkBBPnBJDdH6JqIhbR7gbwVSzabrC1IGDqfIOQYWy+6qCLArd7sHmlv/O yAIQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id s11si901191vsn.1.2020.09.16.07.51.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Sep 2020 07:51:21 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; IronPort-SDR: RXpyDaX/1R8HsN1QP1v/4D3lD58CshO6StUnXhNPZhvvQ4Re3+Zc3F3kscyqwgksVqeMSdw847 Q4Ob56bLQOGSvX5Ew5qab56tqjSNzVe1ZI2kJV7AC4sz7Eg9pDZHuJLatu0hfC4/0GCk2vzQDr wB/RcxuFrA9tStSJXS2cdvcMba4KljsuLNDSSSOx/NDDEWo2GdWLRUMkj9U69AWmpvm3UknuqI FjsTrZfVVqcjxNUPOmi0eBimjiB2bFwo48cHXTzVISI4Cd/CyFR9y9g1eB1uJyCWS3FaRebhlB y5Q= X-IronPort-AV: E=Sophos;i="5.76,433,1592899200"; d="scan'208";a="55173190" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 16 Sep 2020 06:51:20 -0800 IronPort-SDR: zJEECMCUtj9Utto+7spDn1BDPEwpI4SVzEqvCXkZNgc6qxqruA8ZM1kV52Qbssy5dwqVMCPukA qKLq1rACuLN+wXAeUkLjEPg3cRAu8ZVYD9OwSH+LthsktcDA35y2uxVEeprYKoE9B/BJbK9Bjn fWXn6NM7NJaiowarbSJp+gDY8msJ/3Yy7vv6g45lzDp67MQw5FPntBIgfn0btNTLwBB642pW63 cVGMWl7Re+i+G8P9BUC44Zey/+UrMwMBMxFtNuGSmMdWIPl4sREWt8WgfAGTiV8+OBm2Evrpg1 0fs= From: Vijai Kumar K To: , , Subject: [PATCH v4 7/8] Fix legacy bios boot partition Date: Wed, 16 Sep 2020 20:20:20 +0530 Message-ID: <20200916145021.5856-8-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200916145021.5856-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200916145021.5856-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1678002495387868230?= X-GMAIL-MSGID: =?utf-8?q?1678002495387868230?= In case of legacy bios, the kernel is required to be present in a seperate partition with necessary syslinux files. This was never mounted onto the target and standard kernel update via apt-get was impossible. Rename the existing kernel and initrd files in the syslinux partition to the standard debian naming format. Copy over System.map and config files to the partition and exclude the /boot in root partition. The latest wic automatically adds the necessary entry for /boot partition in fstab which automounts it during boot. Signed-off-by: Vijai Kumar K --- .../lib/wic/canned-wks/common-isar.wks.inc | 2 +- meta/classes/wic-img.bbclass | 3 +- .../wic/plugins/source/bootimg-pcbios-isar.py | 31 ++++++++++++++----- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc b/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc index c8ea4c2..cc38a01 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc +++ b/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc @@ -1,3 +1,3 @@ # This file is included into 3 canned wks files from this directory part /boot --source bootimg-pcbios-isar --ondisk sda --label boot --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 +part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --exclude-path=boot diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index b1a7259..0752d8f 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -95,7 +95,8 @@ WIC_CREATE_EXTRA_ARGS ?= "" WICVARS += "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ - ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH" + ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH \ + KERNEL_NAME KERNEL_FILE" # Isar specific vars used in our plugins WICVARS += "KERNEL_IMAGE INITRD_IMAGE DISTRO_ARCH" 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 4d916d6..493615b 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py @@ -131,8 +131,13 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): syslinux_conf += "DEFAULT boot\n" syslinux_conf += "LABEL boot\n" - kernel = get_bitbake_var("KERNEL_IMAGE") - initrd = get_bitbake_var("INITRD_IMAGE") + kernel_file = get_bitbake_var("KERNEL_FILE") + kernel_name = get_bitbake_var("KERNEL_NAME") + rootfs_dir = get_bitbake_var("IMAGE_ROOTFS") + kernel = os.path.basename(os.path.realpath(os.path.join(rootfs_dir, kernel_file))) + kernel_version = kernel.strip('-' + kernel_name).strip(kernel_file + '-') + initrd = "initrd.img-%s-%s" % (kernel_version, kernel_name) + syslinux_conf += "KERNEL " + kernel + "\n" syslinux_conf += "APPEND label=boot root=%s initrd=%s %s\n" % \ @@ -156,15 +161,25 @@ class BootimgPcbiosIsarPlugin(SourcePlugin): syslinux_dir = cls._get_syslinux_dir(bootimg_dir) staging_kernel_dir = kernel_dir - kernel = get_bitbake_var("KERNEL_IMAGE") - initrd = get_bitbake_var("INITRD_IMAGE") + kernel_file = get_bitbake_var("KERNEL_FILE") + kernel_name = get_bitbake_var("KERNEL_NAME") + rootfs_dir = rootfs_dir['ROOTFS_DIR'] + kernel = os.path.basename(os.path.realpath(os.path.join(rootfs_dir, kernel_file))) + kernel_version = kernel.strip('-' + kernel_name).strip(kernel_file + '-') + initrd = "initrd.img-%s-%s" % (kernel_version, kernel_name) + config = "config-%s-%s" % (kernel_version, kernel_name) + mapfile = "System.map-%s-%s" % (kernel_version, kernel_name) hdddir = "%s/hdd/boot" % cr_workdir - cmds = ("install -m 0644 %s/%s %s/%s" % - (staging_kernel_dir, kernel, hdddir, kernel), - "install -m 0644 %s/%s %s/%s" % - (staging_kernel_dir, initrd, hdddir, initrd), + 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" %