From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7107574654634557440 X-Received: by 2002:a05:6512:3d10:b0:478:f2ae:73c with SMTP id d16-20020a0565123d1000b00478f2ae073cmr34502920lfv.675.1654861183387; 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-Google-Smtp-Source: ABdhPJxptlYsZlbhNMW8Ax9ggCLJeENLFem7KhWMuOqMwnUXipuTaOTq2uzKVQJKE3wNGT60E9Mh 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com 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-TUID: f/06O29k1MDN 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" -- 2.25.1