From patchwork Mon Oct 5 07:55:42 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: 114 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp3889278ooj; Mon, 5 Oct 2020 09:56:37 -0700 (PDT) X-Received: by 2002:a2e:a590:: with SMTP id m16mr232604ljp.166.1601916997230; Mon, 05 Oct 2020 09:56:37 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601916997; cv=pass; d=google.com; s=arc-20160816; b=BRFoHTm0rnE5p6DSmMOMSLUILAG6sY6gXG/YSg9pu0sARSbX2TcEmvV3c7nDQn8Stz UsxGG48OPkvIbTvpSBrQszNRzxZ1Rpm842Z7EYLEwr95TsAXlKjHRxq8czn2N7785xkw 1PIaA4gq+aDLwb6iy5TOmqK0ffgBaDu+SojkwS5qTj+EZvXKA+L0DhPO/sItkc9sCbnL yILDFJHexeNp6F43cAbb3CJpVuCwH93BuKHG/Cw7rwb8V7Gm6KgyWYGY4uurhzBt2hRK oGpLmB7GOjMviVWX9zNMqQ/LmGuuO56ytB2Ym8k6X0NKHKwi/RW31cjB0RvMkmR0YSfb aT0w== 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=IQfowJ1HOrJzsK+cRuTC0PHSCIwpYsokMObkJNqClmI=; b=k4Uz19sWc4mX+VWdbZeXTEhwFP/LoJUZFo4WEjpLzrDqsxkfPPRtxOvJavnrOhoZof xMyfe4mGC3LyXTDL+e76DY69M0iS3ZkfjuaFM+5hy5Y8Y8AB2RDDPj6MWvMIMtyYMb1h RtWrSFMiYbZTtB5zZLvBI0VOdNtpydCAnGjOd85m3tIRU1lNj6m/3gz/EkX+OK1/WCK9 xyznCB/5anW1r2wFj1VGnC+CH7xybk+W5zQv4QGCeO+gxb7lPm1LYlcYlTBpRBIrqZOY NRINkv7AbBlSMOqP4z97/gfbKmxlkDjbgVbPd/maaLv1SxXVY9w7QcwrfbHCPkwBrUA+ JMtA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="ZgLsg/DC"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbrfa5x5qkgqentpsybi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBRFA5X5QKGQENTPSYBI@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 y10sor104539ljh.76.2020.10.05.09.56.36 (Google Transport Security); Mon, 05 Oct 2020 09:56:37 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbrfa5x5qkgqentpsybi@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="ZgLsg/DC"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbrfa5x5qkgqentpsybi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBRFA5X5QKGQENTPSYBI@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601916996; cv=pass; d=google.com; s=arc-20160816; b=oB6cHQUHJKzB1wbNZ4uA9dg2Me18SdF0EBM51WyYassAitYSPGHcbwROchjgxtv2ou T7iXjz8mtGUFlndX9Ln+WaEzSWfDzrjhE2PqLdT3KU6EczlYSNjUP8D1QSjTN8H1Wqcr I4TaR63vOQRx6LbI6qrQObgDB5n3Wu56x7Guo8xHR7lxVV1FyXNoflVUrlGy8M51VTw3 /gh4cZ6FHrMTccZGqWlrZ9S9WaX3Q6rLIUgdXvlnj85Kek/PJd0HSIEahx3eQqpXbr3+ fm4d18iPn/9HHHoIfmdprhQmjDwCnPOwAmSl+5PWoTLETGfoAosX+ax3H7hi45aAxjlx KWmg== 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=IQfowJ1HOrJzsK+cRuTC0PHSCIwpYsokMObkJNqClmI=; b=gTxdcIrhODmvc1MB5kfG8p41JM8mn7h4PGO6M9DZEpskSqRPfAQDsrT18ydYWTltbE 7b/XYI3Sh/eh0KtHZlFVLNVQupp1l0qjxxVXN9NaP+EkuYdu2VyCju80QS59qb3upBZk gZqbMOG1uRxiklNQ5D7ZtC7adIsHB/l6KAUNacnKGrlGmiqkjnS68novFSHRqy5uZNyV ehBuI8BAvhCX+AQf710GutZevrNAjJ6yPTqt9/gMLcOrtmA6YEtIj262VWP2vO0a83RL SK11o5igYLrZUCg5PaR/swYcf2QzHQkKQJXR3GrUSIihQfmIHvsGoZx3SXPARMA/56ER q1aw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 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=IQfowJ1HOrJzsK+cRuTC0PHSCIwpYsokMObkJNqClmI=; b=ZgLsg/DCYSpAldoPMpiKemRsQEkhLwq37UihOyJ/5I43675tP0ZjUwbBkyGL+rPogo mZ21WOLtX2JgX6nFt40W4RbFAKmKKS9ZDckgwRU7iBtuvtZXsDH+a3P2RRVScoDaLJ7o M7mvkKH22wFG9yAQKQeiwGAhPRKFwhqR9BTH04Fr30v/MsY8chJcN6C6PEkw2iASwYYz t/cRfMnU7rUgXgnvkupF2BGM+4l7HDV2pAZiOCN3Il82EaqCKUSdJtM45mHlbhlO6OMf M3Z5frMC1E9jTfqClc68xBlkqM0TGkdK5GUSySs4/KXqGGi48H0k+4amV9wmTdBUXjjU mmgQ== 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=IQfowJ1HOrJzsK+cRuTC0PHSCIwpYsokMObkJNqClmI=; b=O4iHPiJZ1u+6ANy/ExkoOI0hbDHJJDXqDt0tw/aWFotB4LRjMD0TbFnc2ZACGhouAV dl13a4USt9AaOienNKS6ZNLwbvejaBMDJY/YlGf94OIYLhyZHil5c/V589mc6DoJ/4z5 5tOrTo1N1Kpm3HVOU6sijbWJ42fJaOUn6ORhJmxyZtcbozVwrUZ0y9p11GR9BJSGFLPr 4/7gIkuwsYR8N9/k80klvvN/+pMhaBuTSwzVXBQTidToS0yt/zV2YXmb9ySCO9XFChKP +7sXmH/ZiFNi4BcbgweunocDkVjtOyH9rKCSd5pG6L2CMY5Dz0O2zlPmT1kDuXEjA2ZH flkQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5330eJC9BQpEbD1WbEw1p1LnIg0E9lcWkn1RePPXczv1g2bqY+5Y tbn/hfL85+9Fud/JLwtJFss= X-Google-Smtp-Source: ABdhPJyk5C5Od+5PEzkEESwKfOx3hrflRaI0U0qSDd54zl94id5KhBPjUfOee6cTgslueNmQYqm6Lw== X-Received: by 2002:a2e:9ada:: with SMTP id p26mr220607ljj.54.1601916996719; Mon, 05 Oct 2020 09:56:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a556:: with SMTP id e22ls1215807ljn.9.gmail; Mon, 05 Oct 2020 09:56:35 -0700 (PDT) X-Received: by 2002:a05:651c:1284:: with SMTP id 4mr240716ljc.76.1601916995600; Mon, 05 Oct 2020 09:56:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601916995; cv=none; d=google.com; s=arc-20160816; b=B73M4BbAYqYXpuVZb+WFLfmPcaM/aCTZDc4AVbs0VV2cOk6SaOxO0GLAEaB9O7hs/X O+hk73DHNFlbefSwlG1z6epCShDmUI4JETPTPRT/iMXB4hnhF7sQhjPTA6JJ7ODNdNWa 65euxef20wbbvxeFue16LTNhOkK6hbOx7de/rNF2SG9eEiiesYci1wAD/TMxWmhgVt9L lWAQgK9J0m+LmJBcuD5LPEA/EFR+VAG/JScQgmWXdUwmYwi556CfykTtApZGoCogJscM Hw/WAkMwuv13+j+1gY3N25oli7fYZ9ugFKn2hyCi496GAXwZhsXHGpJ0uD9C4qi4BxAU VnSg== 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=4ko7tqiYc9ivm52wUUjTVZZU+rM/3s5qVaSLwxt47ZM=; b=xZxc6FEYaHQiuRgUEA893SwaGT5gMoZMWHdlFhuG5kiR59AueFEJ/5tprM295zCbRe y5Yhg9NTzmumX0c+2egE51cbR/F69vI2B2kYkS9I/z+xCMV7l36zHaa03JWAYDcRQffp iQStWts8ObDLEA0sg28XKv2OfzaNr5fDmXK9xOc31WOLFdotdiXJvGkpMMp4itDvk6mf +XnUz8i/m3iB9d6095k7xFlEhZapqb3ctgOomcCt2ubO/1ecG2uND4nawtyxleRMMjKu 2+wICGHvkPoi0fcAhEKcFidBmCXO0sGa1yzW0XSAuIWnhdnTS9BsVmJZPFGXK55IFX5w KBpg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id y75si10311lfa.3.2020.10.05.09.56.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Oct 2020 09:56:35 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: 3tH455uMQg0R3cs/EEOkB03l5c/tj5iotcJqnZFrsFMA3TvIupTtg2/C0TaI8/5NlGQdE2guip 0xlE3ZalDaDe6QFCR0XEEPhlmqDnndWmrJ/CfJ377erld8v0HIRGyle0YyEfEXZSEMLYPINrcX wgOLVeBAblQo+3PQVJMpt3Zyjk4PJiujOQsgTyNPXEU6pXOyCtr83B94WyaJENca83XCArQL79 9udQGbzSlB8+knVAvsTmTYptBKSuWjXxS2VYE0omiK7IZQorKSVd4yddLEYE/DiNCaZXm1X7AG C2k= X-IronPort-AV: E=Sophos;i="5.77,340,1596528000"; d="scan'208";a="53722897" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 05 Oct 2020 08:56:34 -0800 IronPort-SDR: BhP3UsfPYQHA1TCw95WMDxdoNF7w9Oyz0jeM6NieqUZdUklf4mkwXKv+AWl4QmIgqqhn1Uy7Yx fBmCq4PQsKlp4XN55ggWSEuker3tOlqO7cGjQMbae7HHE+YonAJDWOkjgQaJ3mRHN9gRDOcLGq AFwoLhbgS3+AzkInRGzxEzs7qIZ95QlFSsGH8sr4QrNlLL/j8X7WZd7ehLtbcit7SWZ1M00UkV TF3f0mP2UUvwvYtEFPAXzBmzdQJAJmuBuKYTFc3Q+BGaCF4B59IJmnyinZlCIBKMrNVZl8GYtu /jA= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [PATCH v5 8/8] meta-isar/canned-wks: Remove unwanted /boot mountpoint Date: Mon, 5 Oct 2020 22:25:42 +0530 Message-ID: <20201005165542.14954-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201005165542.14954-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201005165307.14668-5-Vijaikumar_Kanagarajan@mentor.com> <20201005165542.14954-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) 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.137.252 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?1679731717363387489?= X-GMAIL-MSGID: =?utf-8?q?1679731717363387489?= In the older version of wic, the fstab entry for /boot mountpoint was skipped. However in the latest wic this is not the case. Adding a /boot mountpoint in part results in creating a fstab entry for automount. For machines that uses the kernel, initrd and related files from the root partition; having /boot now as mountpoint for bootloader partition would break the kernel update. Those original kernel files would no longer be available once the bootloader partition is auto-mounted onto /boot. For such machines, remove the bogus /boot mount point in wks files. Signed-off-by: Vijai Kumar K --- RECIPE-API-CHANGELOG.md | 26 +++++++++++++++++++ .../scripts/lib/wic/canned-wks/hikey.wks | 2 +- .../lib/wic/canned-wks/sdimage-efi.wks | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index ac9d8d6..da5734d 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -252,3 +252,29 @@ with ${D} which needs to be filled explicitly in do_install as before. ISARROOT variable is now removed from the bitbake environment. It is unset after the initial setup. It is replaced with dedicated variables like BITBAKEDIR, SCRIPTSDIR and TESTSUITEDIR. + +### Wic adds /boot mountpoint to fstab + +In the older version of wic, any mount point named /boot is skipped from adding +into the fstab entry. + +With the latest wic, this is not the case. /boot mount point, if any, is added +to /etc/fstab for automount. + +Any wks file which assumed that /boot would be skipped from /etc/fstab should +now be corrected. Otherwise, it might conflict with the original /boot contents, +i.e kernel initrd & config files will be unavailable after boot. + +Below is an example wks entry that might cause an issue. +The efi partition created using bootimg-efi-isar plugin has only the efi stub in +it. The kernel and initrd are present in the root(/) partition. +Now with the latest wic which adds the /boot mount point to fstab, the /boot +contents of "part /" would be unavailable after boot. This would break the +kernel updates done via apt-get. + +``` +part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024 +part / --source rootfs --ondisk sda --fstype ext4 --label platform --align 1024 --use-uuid +``` +In this case we can either drop the /boot mountpoint or use some other mountpoint +like /boot/efi to avoid such issues. diff --git a/meta-isar/scripts/lib/wic/canned-wks/hikey.wks b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks index 1e82f8c..840858e 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/hikey.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: MIT -part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk mmcblk1 --label efi --part-type EF00 --align 1024 +part --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk mmcblk1 --label efi --part-type EF00 --align 1024 part / --source rootfs --ondisk mmcblk1 --fstype ext4 --label platform --align 1024 --use-uuid diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks index 2afa016..e0fa7a1 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks @@ -2,7 +2,7 @@ # long-description: Creates a partitioned EFI disk image without any swap that # the user can directly dd to boot media. -part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024 +part --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024 part / --source rootfs --ondisk sda --fstype ext4 --label platform --align 1024 --use-uuid