From patchwork Fri Jun 10 03:39:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 1869 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 10 Jun 2022 13:39:49 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f185.google.com (mail-lj1-f185.google.com [209.85.208.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 25ABdmiA013995 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 10 Jun 2022 13:39:49 +0200 Received: by mail-lj1-f185.google.com with SMTP id u9-20020a2e91c9000000b0025569a92731sf5107092ljg.3 for ; Fri, 10 Jun 2022 04:39:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654861183; cv=pass; d=google.com; s=arc-20160816; b=Z0kK7gVNK3KCoHQuP5WoYuHseqBBsDV58lVk5Km89fYrSXULt4aV6aBtC20jWcWME3 TCrTng85bxmf30+kBiWSy+m4M6VoYYn76wQ4pegV7weMwF8GABsii6NG+L/IXAtheezB 3CdJGkxzFLejZGGd2V+h8AsQdeTnGaNZcovPDcUAjr0EPXXfa37i9uvGjxEQILU3K19O b3HqdVov1ObhFtIM3nwMua1jxSVK0fSmCJ/3qMPXwGnwH47TS86jl5EF1IxNiQ1TAoTq RZyZZW4epFEj0EFIWthKVFfyraicxL6MOFH6nqxl7r8+s+8eBaHZuWaAiBZlDRq/w1E6 Dfug== 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:sender :dkim-signature; bh=Ze9gHG6RZcNsOpNnk6dtEEo5mhNYwzdjdpBf5vIG9bA=; b=tEk4SfVSFc5xSIk9veSAObhxxHRyme52gIZP7rpPU9uW96//r4N5wWOVG2miY7JC4L MwIwE3v/Iil+zxuPjbZHP3IjsaC+N1zDOXArylDzaJdWckaGjC8YuHDf827ZMnXTFDud P1TmyTqetRLtdpH0WSw2Fv7H0qzdFrz6ViUGjQbbkHAcmayOCsrqXeAKgeZSfW742E71 MG754HSL5yUdSo8//uGSyKSzzWRX1NwjGecUD4XvJOwSCjbR3YTkgfWAiTdsN6MPwqMC Z5qL5NiiEkRMxRJHMxFaAWgIC/x1lZYIOC2KkpKNmHBPKUse22STpbDTIV/VO7nB8Pq9 qmzw== 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=20210112; h=sender: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=Ze9gHG6RZcNsOpNnk6dtEEo5mhNYwzdjdpBf5vIG9bA=; b=ahqtEcaNhEWAJcjPvydb+r19SvAicxFljiH9fDIPVClNvZPoPhLWBH4STOn/9HbfvN 7QpP7dayB1Y3GjTVMhJj9yKp9p9bkcJOqaYpFAYRbzzsjWbOk9IDl2Hm2q0nmrQKKMo0 cHc9ctOtiWSRrTMOo1/NM/uQxFxyKS86pKIIh1/ayaBDxWM5wvj5SRbNtihyvQ//yFAI LX50E6BaMshC46gtJ7YlSbx+C/jZviI5wtvrPwpEJYHXZWDOfZ+eZ+S+f10iTqrjONg5 gDqag0HcYz0nCIgdFdE6tUt7NoOH7Y0Vmc9hbZ5kBE65nG2GEK/jgeOoRVmCTmTmNP5s yYdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state: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=Ze9gHG6RZcNsOpNnk6dtEEo5mhNYwzdjdpBf5vIG9bA=; b=pr4d1GMZuUL2So8AG+t/rkfXfhccGTovxq1KUnAGtG4DsW+WuDfTRu3wq0rHKjCiIe I1xfdqTeKjXdxW0J2qAXOyuOFfNz8lT1xCPwZSxZuKxGwDHnLpIHauJ+mNI1YsdC8YDZ 8NAakpXnYxXZF1kGGj0bSnh2c0U8nkkoej8zrYTqRqf2Wo1DXQ7H9kaUlHvY6YXMLsRH 2F8fqyH+oiIQ2plt1uFuUcs+aB8XepximdRu8ea680O84QSVClwbSoDxjXXJiYU9qqzr qQ36Mg82LqMfkuZtHJ5WrnCJ5P4kdtT9XttNoXV6YmcvoGbuWBhJl6NEtLEbFsAagkR7 s/tQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530Wdan5QlsmWeiTVeZBCg1/QU4iYZFCpZIJQnKc4aVfbVT5IJZU xU9O80Y8DgAZoF3CDtDZMuU= X-Google-Smtp-Source: ABdhPJwnGdILBfyqt9tU5MzBU4+abfD6K3q6MTiVyw3Cm3cbssa0m5x+HKbeYt18eVD8xROaIQR68Q== X-Received: by 2002:a05:6512:234c:b0:479:3bb1:8d77 with SMTP id p12-20020a056512234c00b004793bb18d77mr17029119lfu.637.1654861183311; Fri, 10 Jun 2022 04:39:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:b1c:b0:472:38f0:bc75 with SMTP id w28-20020a0565120b1c00b0047238f0bc75ls214849lfu.0.gmail; Fri, 10 Jun 2022 04:39:42 -0700 (PDT) X-Received: by 2002:a05:6512:401c:b0:479:7232:5444 with SMTP id br28-20020a056512401c00b0047972325444mr9708569lfb.403.1654861181983; Fri, 10 Jun 2022 04:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654861181; cv=none; d=google.com; s=arc-20160816; b=WcvNzHRgL2elx51yL7jN1WRM9PshhDdBev/vjC5Fws7W1/MA+0Uo1nfXlnsMYfHrIh pDacfY6qj8Xr0g7MA+DzfNo4cnYkxfbsW7UAdWiU8il8Mp8h/q66pBqoxtYfGvHsmwz5 viZ2C42UpPGGEtyL3F115WkHI/Vozi4x0pUdNrIQjPx0VJgc30X9/t2p4I0scqMgBvoN DRVCry16LiUp6ouAUw7tnT3TTPzlKrrlfQtEjXP902RyVPyODvzsbhCJiUSsLv5E5tUU NyBaoKBRaESi8RzhdJOBdu8jvXb2ED89wIRYn4nV37ns19W4ejzZhH8morOjDm2dBlyk yeGw== 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:ironport-sdr; bh=dyXHNXKc0YCMPULuFiOT+wilrmvpBy7iPVsQgIz1OCc=; b=rt9EQpPXKrCMXRiFRBCPVT2xndY28COSy2FHK6e2pZGd2dsdUKFBD5T5n2pdrAa4JU KEHpLrjmcHohrfpiFzsYG+RSvi3vV4gorpe6y3hGFf6RM04I7sK+epasGxjX/8ke2DNm if561s/876tRWlRxHUe2m7Pm+r5MJwxSivk73RTyS7CcdC4Fvzebw5G9o5HQQlhe2AmW kVPbJxWKMdNzUL/HirNH7IIZf29AEJ8Yb6aHMZohYwM0tgOQL9wdmllOLK2hLjZ4WOOp 2tYZIxHdS3LhJ2JzF867mGB60BpfPTAKF2IWJID3uTRIhooIwoDhOQZ9TxBxRzHHGT6R blFw== 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 6-20020a2eb946000000b00255889ba526si682577ljs.5.2022.06.10.04.39.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 04:39:41 -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; X-IronPort-AV: E=Sophos;i="5.91,290,1647331200"; d="scan'208";a="77081590" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 10 Jun 2022 03:39:42 -0800 IronPort-SDR: R9H4daH2ziiNGRInPRQd84ffj5Ykj4eEdl45PVNWFnSMHs+ywIIaueEv06swevhMRhRMiUwVI3 aBYmbeAbfeefLPxMCs1Azr4TGrYi0SJeD+DSsI+XGQf6VLRYOd9EkonlurcXSnmg+iucBloGw0 AymIvDUzLAM8mdw8ezTSp8HKMweDbpMLSZCHTj6HgvcmSjbJkUbLldAMGc2iEyIZO9nqCnHilp WBjFkY7J/iwVzD2XoY9gNt/lcjtNkNpLlzyru3V2hPlVk+1DtaU2CGBSwPh4jE9kHIbzLll6d7 1sc= From: Vijai Kumar K To: CC: , , Vijai Kumar K Subject: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev Date: Fri, 10 Jun 2022 17:09:18 +0530 Message-ID: <20220610113919.2051302-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220610113919.2051302-1-Vijaikumar_Kanagarajan@mentor.com> References: <20220610113919.2051302-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-02.mgc.mentorg.com (147.34.90.202) To svr-orw-mbx-12.mgc.mentorg.com (147.34.90.212) 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-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX In the current version of wic we use, "/" mount points are ignored and their entries are not added to fstab. But in the latest version of wic available in oe-core, this is not the case. "/" mountpoints are respected and are added to fstab. ISAR already creates the necessary fstab. With the new version we will end up with 2 entries for "/". One from ISAR's image_configure_fstab and the other one appended by wic. Explicitly drop "/" mountpoint args in wks files to avoid this. Signed-off-by: Vijai Kumar K --- meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc | 2 +- meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in | 2 +- meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/hikey.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in | 2 +- meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks | 2 +- meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in | 2 +- 11 files changed, 11 insertions(+), 11 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 fe028b5..32a358e 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 --use-uuid --fstype=ext4 --label platform --align 1024 --exclude-path=boot --mkfs-extraopts "-T default" +part --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024 --exclude-path=boot --mkfs-extraopts "-T default" diff --git a/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in b/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in index 0794a2f..15dab79 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks.in @@ -5,6 +5,6 @@ part --source rawcopy --sourceparams "file=/usr/lib/u-boot/${MACHINE}/${U_BOOT_BIN}" --system-id 0xa2 --align 1 -part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active +part --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active bootloader --append "rw rootwait" diff --git a/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks b/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks index 0392891..9bff6aa 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/efi-plus-pcbios.wks @@ -1,6 +1,6 @@ # Example to show how to create an efi + pcbios image # Note, that the loader argument is mandatory. But systemd-boot also works. part /boot --source bootimg-biosplusefi-isar --sourceparams="loader=grub-efi" --label boot --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --exclude-path=boot +part --source rootfs --ondisk sda --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --exclude-path=boot bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" diff --git a/meta-isar/scripts/lib/wic/canned-wks/hikey.wks b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks index 0c966e6..28bfa22 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/hikey.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks @@ -5,6 +5,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk mmcblk1 --label efi --part-type EF00 --align 1024 -part / --source rootfs --ondisk mmcblk1 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +part --source rootfs --ondisk mmcblk1 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ bootloader --ptable gpt --timeout=3 diff --git a/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks b/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks index b3abb3d..3f524d5 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/multipart-efi.wks @@ -1,7 +1,7 @@ # Example showing how to split a single rootfs across partitions part /boot --ondisk sda --source bootimg-efi-isar --sourceparams="loader=grub-efi" --label boot --active --align 1024 # when excluding paths, just specify --exclude-path once and separate paths using spaces -part / --ondisk sda --source rootfs --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --exclude-path boot home --extra-space 1G +part --ondisk sda --source rootfs --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --exclude-path boot home --extra-space 1G # put home last to support auto-expand of this partition part /home --ondisk sda --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --mkfs-extraopts "-T default" --label platform --align 1024 diff --git a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in index de1c92c..7df6ae8 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in @@ -5,6 +5,6 @@ part u-boot --source rawcopy --sourceparams "file=/usr/lib/u-boot/nanopi_neo/u-boot-sunxi-with-spl.bin" --no-table --align 8 -part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active +part --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active bootloader --append "rw rootwait" diff --git a/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks b/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks index e5a3668..c76013f 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/rpi-sdimg.wks @@ -1,5 +1,5 @@ part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 10 -part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --mkfs-extraopts "-T default" --label root --align 4096 --exclude-path=boot +part --source rootfs --ondisk mmcblk0 --fstype=ext4 --mkfs-extraopts "-T default" --label root --align 4096 --exclude-path=boot bootloader diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks index 754fbc4..43e6dc1 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks @@ -4,6 +4,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --ondisk sda --label efi --part-type EF00 --align 1024 -part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +part --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" 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 f3addbc..530304f 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks @@ -4,6 +4,6 @@ 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 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +part --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" diff --git a/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks b/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks index 9cd0e66..f63b06a 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sifive-fu540.wks @@ -5,6 +5,6 @@ part --source rawcopy --sourceparams "file=/usr/lib/opensbi/sifive-fu540/fw_payload.bin" --ondisk mmcblk0 --fixed-size 8M --align 1 --part-type 2e54b353-1271-4842-806f-e436d6af6985 -part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --active --align 1024 --sourceparams "no_initrd=yes,script_prepend=setenv fdtfile sifive/hifive-unleashed-a00.dtb" +part --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --active --align 1024 --sourceparams "no_initrd=yes,script_prepend=setenv fdtfile sifive/hifive-unleashed-a00.dtb" bootloader --ptable gpt --append "rootwait" diff --git a/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in b/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in index 4ed4ee8..2fa8ebf 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in @@ -11,6 +11,6 @@ part teeh --part-name teeh --source rawcopy --sourceparams "file=/usr/lib/optee- part teed --part-name teed --source rawcopy --sourceparams "file=/usr/lib/optee-os/${MACHINE}/tee-pageable_v2.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 512K part teex --part-name teex --source rawcopy --sourceparams "file=/usr/lib/optee-os/${MACHINE}/tee-pager_v2.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 256K -part / --source rootfs-u-boot --fstype ext4 --mkfs-extraopts "-T default" --label root --align 1024 --active --use-uuid +part --source rootfs-u-boot --fstype ext4 --mkfs-extraopts "-T default" --label root --align 1024 --active --use-uuid bootloader --ptable gpt --append="rootwait rw console=ttySTM0,115200" From patchwork Fri Jun 10 03:39:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 1870 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 10 Jun 2022 13:39:51 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f63.google.com (mail-lf1-f63.google.com [209.85.167.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 25ABdpVv013998 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 10 Jun 2022 13:39:51 +0200 Received: by mail-lf1-f63.google.com with SMTP id e13-20020a19674d000000b0047944c80861sf7004413lfj.19 for ; Fri, 10 Jun 2022 04:39:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654861186; cv=pass; d=google.com; s=arc-20160816; b=0djqcbv+yC0Xa0L1hnf3UPWEqzfkF5uRJkkI1ZinENWfmTdEp6lRvGE81X2aiGmS/+ sIScePgOTk8n9PJqPY1JEt1Nd91kzmMsIh7lTfEypPpnkGhXsr1LLHK5CQ98sosM0gSU 2RrwtkS03Yfwep+bL8w87B/9mYEqsEubbn+nXLeH519W6B5d/hmXZI/Wi0Q/xmqUKNYe FAhlcnIilLw/kBrYNUaYJ20UGONkyW881xA0IpnLUXqiw4uSt2AdZ0tnJBkUeL6QRuSh 2lhQXFPGE6HugKC51PSZC013XEL4pP0L1S9mf67VgnikGzPiSy9hvVOWlVdSAg04U04h VPfg== 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:sender :dkim-signature; bh=qyfJCE+eK4XBi16QUmsJE4JLEedUNJ1aOfhXtyYhai0=; b=x/Jr8UvPW2YsiW7HAzfFdcMnYXAgeQ14VX92fMY/oeS27UHUw9vA+21BaMicIzLDTt zF23zaW9swwm2c8aXxY9G8SZB+iQHkxXxmKVHKaSjQoSNBBjAny9mT46G1GWtjgeMlRQ gFtlEL8cYXIjVmGs/0qE0/+7G/0OHmi30SYYfb195KARJCFmuV1Zf/z6r5ZGaKadiwDt Bnjs2KbNa8m1UYpi7eJXWe4yV6eAoEr4VTfci+wIbNxtKyg0Ekv9uP5thmUIiFMT/yoV VcNvnol9Kxo8n4+FnmasEw5ZtgovxKPPoaCPIqrokuKoC3hq0E/rA3LDH6rgY2vJ5Dnt +pwA== 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=20210112; h=sender: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=qyfJCE+eK4XBi16QUmsJE4JLEedUNJ1aOfhXtyYhai0=; b=Bq4ea87yENmOFCiZC9CJixSxJed3ZnecITTdj+SfvOf0XfOERANvJGYHB0m/KckvCF DdW39SLFun0Ktwm3DGLUvLngL1VOEd+8giTA2DEtdwDR2/IrE9XwhCSx982FX946TVom yeZt3IVUQjHi4U+MbIMcj/MPX4HBbiUkJ7YrpBQtUHxBIj/++RO1+OydEVbbmgtUdky6 LQYkx1Wuo74LLi0D7bRai7XR/7mCPdt3qm771OErlkBnco7+ImX+0+xnbnh9xeZvbklf 8h8QzEwYIcnQZ/xer65D2TJ/qURu7UeceNEeM3RARSubtwI+f5XQ5PWJrqLzHLpxseoK 5lmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state: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=qyfJCE+eK4XBi16QUmsJE4JLEedUNJ1aOfhXtyYhai0=; b=SNKd3G3MWCX8HEkPb+F/x6zlKmCH/QFqqudJd9J7G3QLH3j06XyOAhhmRwJTXEayXd NDClsKjjqLdjX8Hd78mcSlWqrMLtNvR3HdwDS/Kk7lxc9U/PHnTK4oaioSMTuGYJ9fEo OJ866PSSZMDTJ89LaVwRrw2VR2+SrBuvEgwAACuSbmupU0sOg0+ucUlvUda5NxaTZsXm uUOYMZJtSHzwMEfSXraYGMYwUibxbBAP17h5t4FerCjd4kb0t6YkHiR9sB8rxEDxDMkQ O0TW+cHXw+wIZtgZyybDMv7ve3ALWt7PZapuqyEIrZ3eI/Uvcg4CfwyVG32TU9w0Wvus 7IHA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532ErpjPSxL363wLiq2GK1xCLiSY1ArfIgsws6fzr6v5sg100eoE +sm76pmGiYpU41u/HouZl78= X-Google-Smtp-Source: ABdhPJwyJbPwqsJD1LKSEOgqZin0yXUT9Vr1oParFvk7dDWyVnjnq2tV6tV+r8h85dNP3gbMQMXJhw== X-Received: by 2002:a05:6512:3f92:b0:447:769c:1b2c with SMTP id x18-20020a0565123f9200b00447769c1b2cmr77073129lfa.387.1654861186178; Fri, 10 Jun 2022 04:39:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8857:0:b0:255:80fd:9161 with SMTP id z23-20020a2e8857000000b0025580fd9161ls1382960ljj.3.gmail; Fri, 10 Jun 2022 04:39:44 -0700 (PDT) X-Received: by 2002:a2e:934f:0:b0:24f:ea1:6232 with SMTP id m15-20020a2e934f000000b0024f0ea16232mr63751196ljh.135.1654861184656; Fri, 10 Jun 2022 04:39:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654861184; cv=none; d=google.com; s=arc-20160816; b=Wl0g42NmOA0wVICjA9iJQtepKsrRo9COhfdn1vF4wCMmAaCyvZwSs/sFE6FGxorvl7 1a+NyK3sXoLyFMkc6jA9HUFoJfJtaEZSOQuU7WDJOw2P/ce3piU/4TrF0LojIMX2cMIt BRP3EvWfliHPhuPOv8GC5i35woRAsZhmtH/aEneDfYXmpOV9sKaZvTZa0ZS+SsrQQ/MB NIVX5fXN80F1tlUxB+rTdP7mIE21Hv2NhRcX2n0W8UO3rMzvTcye6HmV8XbYpW2EqR5P mnr2lv2/5BO94umhGU6hgnMl1je2rJBo+/T3YqZ92StjsoLb63SVi8p155u5gXd6h1yj hpXw== 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:ironport-sdr; bh=5LLuhYE8wPT9V+Y2tRmGoft77mr98l1QN9KFZdyCYME=; b=uQsSrkE/Z1OGLg9Pmvbtuk+vMpTcs68q7fuW4VZFdOVLkW8tcK6arKXRWLJ1orF44X RQ4hRFx/DpRj4HQUwamNvAz+Roo9fDHkpZaFi7c+nwEeMfuKwSob/DzQIjsa/g7+Zj8/ sxSHM9kdlBRL1Ew8390bW3Vqixz9EGIz5U1Mpd+b9Ubfv25XqwqfwX9oJIo5uZiFyZYw vbBfM6f//pB2gcSg0YgCEPXB2M+LqVckQKLLwdl2WkH2E6D8XbQg7yo3heMxLinjp8Pq /UL/OiH/nTRY0yQgaEMUY6Q+i3p7xA4v3J/0Yfq8VC9VzJTWQy5h/YScEbcB0eE5QWM/ Gv5w== 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 6-20020a2eb946000000b00255889ba526si682577ljs.5.2022.06.10.04.39.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 04:39:44 -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; X-IronPort-AV: E=Sophos;i="5.91,290,1647331200"; d="scan'208";a="77081593" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 10 Jun 2022 03:39:44 -0800 IronPort-SDR: V+wnEcDaf3wAe+IK+8Oyg3tpIMTADidn/XnsfxhgYsC8y0XQxOwj/xUheXAikY28pdguqwa64r +VHW7K0UadkAE2L0KNv4mHeWIJ+fkz35sFSS7sKkyofoGBBeucUR/YMqgUPOeQLazhWK7uXpPK 8Y5FZ/iLBCS+N9eA6k0iFOQTCg6TRIC/0/I7fEXbbEMIChXdNMDQvRHnx81YsFuV/Uvx0QXKQe b/GQVYbXdTz0Y3QqotrYceu8URwRPgJO/tcVWOBsCQ5UPxsa6zRNvnwrhj9DXYr1PHzYFfWkq3 s6g= From: Vijai Kumar K To: CC: , , Vijai Kumar K Subject: [PATCH 2/2] wic: Update to the latest revision Date: Fri, 10 Jun 2022 17:09:19 +0530 Message-ID: <20220610113919.2051302-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220610113919.2051302-1-Vijaikumar_Kanagarajan@mentor.com> References: <20220610113919.2051302-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-02.mgc.mentorg.com (147.34.90.202) To svr-orw-mbx-12.mgc.mentorg.com (147.34.90.212) 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-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX Update to the latest wic from OE-core. OE-core Revision: 06ed2aa93fc25a681e3a00ee120d9395b04845da Signed-off-by: Vijai Kumar K --- scripts/lib/wic/help.py | 6 ++++++ scripts/lib/wic/ksparser.py | 1 + scripts/lib/wic/partition.py | 1 + scripts/lib/wic/plugins/imager/direct.py | 5 +++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 4ff7470..73e3380 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py @@ -940,6 +940,12 @@ DESCRIPTION quotes. If not specified, the default string is "defaults". + --fspassno: Specifies the order in which filesystem checks are done + at boot time by fsck. See fs_passno parameter of + fstab(5). This parameter will be copied into the + /etc/fstab file of the installed system. If not + specified the default value of "0" will be used. + --label label: Specifies the label to give to the filesystem to be made on the partition. If the given label is already in use by another filesystem, diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 0df9eb0..a49b7b9 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -155,6 +155,7 @@ class KickStart(): part.add_argument('--change-directory') part.add_argument("--extra-space", type=sizetype("M")) part.add_argument('--fsoptions', dest='fsopts') + part.add_argument('--fspassno', dest='fspassno') part.add_argument('--fstype', default='vfat', choices=('ext2', 'ext3', 'ext4', 'btrfs', 'squashfs', 'vfat', 'msdos', 'erofs', diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 09e491d..e50871b 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -33,6 +33,7 @@ class Partition(): self.include_path = args.include_path self.change_directory = args.change_directory self.fsopts = args.fsopts + self.fspassno = args.fspassno self.fstype = args.fstype self.label = args.label self.use_label = args.use_label diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 4d0b836..c44159b 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -117,7 +117,7 @@ class DirectPlugin(ImagerPlugin): updated = False for part in self.parts: if not part.realnum or not part.mountpoint \ - or part.mountpoint == "/" or not part.mountpoint.startswith('/'): + or not part.mountpoint.startswith('/'): continue if part.use_uuid: @@ -138,8 +138,9 @@ class DirectPlugin(ImagerPlugin): device_name = "/dev/%s%s%d" % (part.disk, prefix, part.realnum) opts = part.fsopts if part.fsopts else "defaults" + passno = part.fspassno if part.fspassno else "0" line = "\t".join([device_name, part.mountpoint, part.fstype, - opts, "0", "0"]) + "\n" + opts, "0", passno]) + "\n" fstab_lines.append(line) updated = True