From patchwork Wed Oct 14 04:30:41 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: 149 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:e04f:0:0:0:0:0 with SMTP id v15csp553148oos; Wed, 14 Oct 2020 06:31:22 -0700 (PDT) X-Received: by 2002:a17:902:bc8a:b029:d4:dc57:6c29 with SMTP id bb10-20020a170902bc8ab02900d4dc576c29mr4251005plb.77.1602682282126; Wed, 14 Oct 2020 06:31:22 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602682282; cv=pass; d=google.com; s=arc-20160816; b=LhJjq2/XujXxqUT9vhjBCwH7cZI28uH6PPvh58KHB0DYClw1RjowEmqI86/kcOSS3f 3V+NWDe5wc+p69sHSbbDC9TBW5gZ4NgVZRBPkLmpm1as8BiVHWhLfpjmSuqKqBxrCogI XaI0OklmFBIZts4jcSbPDxBAmHKFkS5GRn1+vjplY6IIx2C30HxM/kXsUAHWejNAZMEs xOGq68PjcKYng++mrYMbDEEt0O5RhE1cFxXZqN62ugdwip1AQMOFGAhuUjIGuUaJmq6Y w1+EZU+GOoEAnYf3NKk4BQk85jY5ZlytX5a3sSNJXC+hdr9wMubZN9WQEjqwG9ZE9YTK Bhgg== 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:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=GNYMQ2p78GggXWSTfnk8zVklJG2eBNtQ6veg6wedhBM=; b=svBTibib5f5Wy4matcYDLU5ydwaC37Ue47+5eELEt8BO3Bn6PQOGlSXLiM1cX9Iob8 3pKk3TtuYYIECxjO8FVK3VRaVFNHS4nSX/Cdbv8W/B4HV/5TjWf6ktbCyozDtS6Hzxcm yaLWRBmkyEQOuseAXnJLKSlHbiC8EdXpC+/8loRYACVRRnzO3fq1kpVjTMZyl7Y1kHLt A/s5fL2t97/gd13ngbyjDLn2+L3T3FTNXPVFOOumwHGnxv3hl47SyvFaeSbKn5RcJjOQ kFy1gZ9XOWRBSr+EVyl+fhjfZv0Unt9kBYzjJjHJTAicgYsVdZsQNTqmoXtNiAjjxfAf YKjQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="j+/H2g5v"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbkp3tp6akgqebe733ca@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBKP3TP6AKGQEBE733CA@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 f12sor1367763pju.12.2020.10.14.06.31.21 (Google Transport Security); Wed, 14 Oct 2020 06:31:22 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbkp3tp6akgqebe733ca@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="j+/H2g5v"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbkp3tp6akgqebe733ca@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBKP3TP6AKGQEBE733CA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1602682281; cv=pass; d=google.com; s=arc-20160816; b=bsoWfcinrviiFCdWlSAIWOXQ2AhFQCP5IguOwy6Jc9SO0l+C6lEXNq3qyM7R1BsC/s hc2mB9624I+M1vOoc795fK/j28SY9HkEQIgElFU5/Idz6riEF3BYIAYQLfIhhfMA29sr opgG0P9XPH2IbsRgKs3RQ48RTRslHdN9UWK2AqXqvgJfudjQxGD4wICNwxo21bgFVBUq h+A0q8/gvR2vr9DsUj+lk2/VkxeIHwTO+cVMeZ9zmBKihrSxz2lfp0XRj6lMZrZYqjtR SdjhhgaNdeNRij3lJ2urmCcMTfG6kdQXBh4jqQ79mhxl5c6SRGqj9TvhgB3zI0jxo0ZZ /iAg== 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:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=GNYMQ2p78GggXWSTfnk8zVklJG2eBNtQ6veg6wedhBM=; b=vSRvqmbvv7CKufAHUBjTWqoey+ndvZN5zWFThZ3fUBifvVCbcOZHNidL2mnnWDhiX3 uUos0HADw+B6RyWkiHB1ozyCiuE/xLQ4dIhdWe15gNe9O8/zkLAb14aNQXqmn8BHfr08 udou7ODoiMqfpxKHSw+3uWCJYx0e+/Vz4T6ENFzfKatz4TlAq2eK2mk/GYC/jLXP5Af5 fpqHsWdq/H/zzW3MnrD51aoqRZ98uMB3f2PRZGRQ9CK1mgIRrf0fBjXmBfDzKpZijYVc SUWh8uVOk+JLotHFkr42S6o6t74q+lNjggJav3drFifeR30wbTD7TX0srdn2HF57d0jW 0OgA== 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:cc: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=GNYMQ2p78GggXWSTfnk8zVklJG2eBNtQ6veg6wedhBM=; b=j+/H2g5vB3y7gpjVuoirJMCNctVizkDjc6xmOkuJVLqGavn7BLZZyHCVHS5kysWz9M jMspjqQ7p+RkbMppiyvAIAMFr0z+bdK9xvxYlnz+pVazkdKRwcGxR2dwKCfoXrcfZTfg zZ4oJwzjZeXoOYq+EIapgzyaC6OLv4we1iWE0/qaoaO/Wc8wvj68aJZ2RNexUgmI09St AlKyigXg3VBr+03gaIYMX8xD104ayfcfZUX/jOr6dNU1FuQljpAS1Ypv6Y+oGd5aMVk7 VVKN+LQSls3PrI1PsrvUl9pg+csJyVXw7+jQlYdUvlCSeYsfyoylP88yzuTDlAKqJ3f5 wIIQ== 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:cc :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=GNYMQ2p78GggXWSTfnk8zVklJG2eBNtQ6veg6wedhBM=; b=QM86cP0fUipsf5MVxvF/yseCm9w2EIfI0gZx4UXXDTWUpJAzTLuc8CqgKQduUp8bk3 jEqDK4b8C5MVPpMuOkM5a4+g/yq0mODUo7I2udrT50lph8A9MYhphDske3szssiY7IJJ lsrTt2WvlJCjocwjKS9oT+lfDpn+1CKuQPs99t90IOZz44kgzvlsd69ay+1UygcYG51W YrzWtTiadVjjJsL0YxFSIHRxhZkinRko5Ur04JX1Bi0guOw3smJVKfLS8Yh1VovZFHL4 ++Xye+xzOozD38Gc/9Q+LKqq/CAFPMk1kagphNVVyUCOcAKIfygRr+f3iokA7nQog1xR 8Zgg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532raNGZSJQzcslfbibZBsPFE3FyvE/dlFaM9VailX+8HpUKJ1xG FlOphEh7Sc1aiq5d6OJm0pQ= X-Google-Smtp-Source: ABdhPJyXROjXOAyRqSBsAWqfjF8yarNI0FgmHyAvCW8MMuqA2k0IQK2CZ0ucMUmHSwo5Ffmbdxs9Yw== X-Received: by 2002:a17:90a:db43:: with SMTP id u3mr3638527pjx.225.1602682281731; Wed, 14 Oct 2020 06:31:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:8046:: with SMTP id e6ls1376258pjw.3.canary-gmail; Wed, 14 Oct 2020 06:31:21 -0700 (PDT) X-Received: by 2002:a17:90a:17c9:: with SMTP id q67mr3628154pja.128.1602682281092; Wed, 14 Oct 2020 06:31:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602682281; cv=none; d=google.com; s=arc-20160816; b=al7zx9jLMB/5MVJH35ylRAoC7ynf5a4X0KuzCDlik5rJeJNAYQeY4LFzsWl0DaDoUi WBttChEmCTFUlukRtwrSdURmO6NgxmlsAtXcLuzEUjM70Fphvqq8qRgeUGpd4Y4GtxUu EWuAs5+a+AZ6Su0GEjPNpcTFk97qxsyXGU3TvW5PwaUSFaE5UnU2rVgjKut0Lx1YccF8 aFOpBo7PuAxe26Y8uH2x/FbCwRVPqEpyiOqQ6e0w4qhHIH7ds5BUzwDm63NfWygJjJQ5 QdbwKLaBYc/0gdmN2VRY3zgIZknMJSA1XpAoy5stO6vm9iCY2lwgyrxVd2i9VEsvB1ob U7nQ== 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:cc:to :from:ironport-sdr:ironport-sdr; bh=wjaDhTXrOhZdTOGF3TFcrssgiUDPkJDz+K0CkSh7SUk=; b=CCN9Y3h6TbETBakvkoyWxNnBcamVNiZfwrUvIEk9rOnLAL4nCXvxznTWRp5E/BVrSn aqrSD1Qxl9omWtgS2CyZjX+wWOdzS4YrM8prkSwRFmb+3VBq38vzsGrauZV9rfi3IJn+ kGsNDzY7GQciBlHRZYPmBcWZIR4WPdYCjCO9/m2jyh600J9PlASaqIElMSFgNXXOf7hj elChiCLuhUT2DeaRmlyBgz1uVCf5kx0jyiA/a02rJr2OMrcMmuweP9MpcduMaHsHvMWc tUd6o58jfjD95fOJg+eOsCxafQ5ynYMgAdeqze/7gOsDuVT/GWxYmh+6KnwLyOvHH/cf 2bSA== 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 i9si154075pjh.3.2020.10.14.06.31.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2020 06:31:20 -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: kt7xxF1eI3GQX/FgAmPIjmbZKJp8QfbiYyt5E4yTynsjoX/3Zled6zJDzM80K5Oqnuw1djqqGc dX11QosYBNrAK3jKv+FYVs4pU2YlOh+LWFiddfyaGD49euw89udDhboCCU+hlIOg2zdwIyC4wN ANI3TiGog+KmH0kJptFIVkCj5vNsaC2TAR6zaxyPvwTAzgImeOwyDqGLLOrTtY3ct4plx2l6tl OjCXWgpjmmVdpR+GjWibUI7vT2qfvaCyJoXBRc+oqEuLbGq0xMz5+I4XR+aBWKQcqfxMSSKmcn RDY= X-IronPort-AV: E=Sophos;i="5.77,374,1596528000"; d="scan'208";a="56200163" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 14 Oct 2020 05:31:20 -0800 IronPort-SDR: 17XczvHXwZGif4lpEKfp5v1Odj804IgUb236NieHeR9stTntBHRWUZXr9I0vxOYA8cW4CKgdRO 8Xbu5FwC2cbznLapAu+oNMimrdRIrR/0rrlYQRj56RP9xLVHJ+SAfyaOwfYxjUnh2plThGU4xR XQ0jQvreN0kEWHxiv1xOU+dk46A69X2BX9r+O81T0YcrWaEsbtNl9hNNsxFJwHLBpw+FIX7iKF mAcblAKCcmkcMBQbWAfpZadA4L8jy6B2aygi1KUJTDW9GYxXpleLiD+9MoHStWxyd5dkqH6sgJ Qcs= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 7/8] Fix legacy bios boot partition Date: Wed, 14 Oct 2020 19:00:41 +0530 Message-ID: <20201014133042.18753-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201014133042.18753-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201014132729.18571-5-Vijaikumar_Kanagarajan@mentor.com> <20201014133042.18753-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?1680534176705755004?= X-GMAIL-MSGID: =?utf-8?q?1680534176705755004?= 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 985137f..2275ebe 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" %