[PATCH 0/2] Update wic to bring in fspassno feature

[PATCH 0/2] Update wic to bring in fspassno feature

[Vijai Kumar K]

The series has 2 patches.

P1: updates isar wks files to handle the uprev without breakage
P2: Uprev of wic

This uprevision is needed to bring in the fspassno feature from oe-core.

https://github.com/openembedded/openembedded-core/commit/20d43a2599d7622b96e2fb0da87a886da1a3794a
https://github.com/openembedded/openembedded-core/commit/b9b9f71e6f37bfbf954ade518391b242669481e3

Note: Targeting for the 0.9 release.

Thanks,
Vijai Kumar K

Vijai Kumar K (2):
  meta-isar/wks: prepare wks for wic uprev
  wic: Update to the latest revision

 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 +-
 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 +++--
 15 files changed, 22 insertions(+), 13 deletions(-)

-- 
2.25.1

[PATCH 1/2] meta-isar/wks: prepare wks for wic uprev

[Vijai Kumar K]

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 <Vijaikumar_Kanagarajan@mentor.com>
---
 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

[PATCH 2/2] wic: Update to the latest revision

[Vijai Kumar K]

Update to the latest wic from OE-core.

OE-core Revision: 06ed2aa93fc25a681e3a00ee120d9395b04845da

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
 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
-- 
2.25.1

Re: [PATCH 0/2] Update wic to bring in fspassno feature

[Jan Kiszka]

On 10.06.22 13:39, Vijai Kumar K wrote:
> The series has 2 patches.
> 
> P1: updates isar wks files to handle the uprev without breakage
> P2: Uprev of wic
> 
> This uprevision is needed to bring in the fspassno feature from oe-core.
> 
> https://github.com/openembedded/openembedded-core/commit/20d43a2599d7622b96e2fb0da87a886da1a3794a
> https://github.com/openembedded/openembedded-core/commit/b9b9f71e6f37bfbf954ade518391b242669481e3
> 
> Note: Targeting for the 0.9 release.
> 

Not being a fix, this is post 0.9 material.

But wasn't there another wic update for that time pending already?

Jan

> Thanks,
> Vijai Kumar K
> 
> Vijai Kumar K (2):
>   meta-isar/wks: prepare wks for wic uprev
>   wic: Update to the latest revision
> 
>  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 +-
>  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 +++--
>  15 files changed, 22 insertions(+), 13 deletions(-)
> 

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev

[Jan Kiszka]

On 10.06.22 13:39, Vijai Kumar K wrote:
> 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.
> 

Wrong patch ordering.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [PATCH 0/2] Update wic to bring in fspassno feature

[Anton Mikanovich]

13.06.2022 10:15, Jan Kiszka wrote:
> But wasn't there another wic update for that time pending already?
The latest WIC update from Felix was already merged to next at 03.06.22, 
but CI test for it is still pending.
Anyway both next WIC update and CI test for WIC will be applied after 
release.

RE: [PATCH 0/2] Update wic to bring in fspassno feature

[Kanagarajan, Vijaikumar]

> -----Original Message-----
> From: Jan Kiszka <jan.kiszka@siemens.com>
> Sent: 13 June 2022 12:45
> To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; isar-
> users@googlegroups.com
> Cc: henning.schild@siemens.com
> Subject: Re: [PATCH 0/2] Update wic to bring in fspassno feature
> 
> On 10.06.22 13:39, Vijai Kumar K wrote:
> > The series has 2 patches.
> >
> > P1: updates isar wks files to handle the uprev without breakage
> > P2: Uprev of wic
> >
> > This uprevision is needed to bring in the fspassno feature from oe-core.
> >
> > https://github.com/openembedded/openembedded-
> core/commit/20d43a2599d76
> > 22b96e2fb0da87a886da1a3794a
> > https://github.com/openembedded/openembedded-
> core/commit/b9b9f71e6f37b
> > fbf954ade518391b242669481e3
> >
> > Note: Targeting for the 0.9 release.
> >
> 
> Not being a fix, this is post 0.9 material.

Ah. I was really hoping this to get in. I missed the merge window for rc1.

That being said, it should be fine. I could still use the next branch.

> 
> But wasn't there another wic update for that time pending already?

The one from Felix[1] was already merged and is part of rc1. This patch just pulls two patches on top of it. But not a fix and has potentially breaking change.

I should put an entry in Changelog. With these changes we can no longer assume "/" mount point to be ignored by wic. We have to explicitly drop them.
So any downstream wks files that runs on this assumption should be fixed like P1 of this patch. If not we could potentially end up with duplicate entries for "/".

[1] https://groups.google.com/g/isar-users/c/5D-64v5qhWY/m/UW7uZJrCAAAJ

- Vijai Kumar K


> 
> Jan
> 
> > Thanks,
> > Vijai Kumar K
> >
> > Vijai Kumar K (2):
> >   meta-isar/wks: prepare wks for wic uprev
> >   wic: Update to the latest revision
> >
> >  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 +-
> >  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 +++--
> >  15 files changed, 22 insertions(+), 13 deletions(-)
> >
> 
> --
> Siemens AG, Technology
> Competence Center Embedded Linux

RE: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev

[Kanagarajan, Vijaikumar]

> -----Original Message-----
> From: Jan Kiszka <jan.kiszka@siemens.com>
> Sent: 13 June 2022 12:46
> To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; isar-
> users@googlegroups.com
> Cc: henning.schild@siemens.com
> Subject: Re: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev
> 
> On 10.06.22 13:39, Vijai Kumar K wrote:
> > 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.
> >
> 
> Wrong patch ordering.

The wks fixes are explicitly put before the wic uprev.  Because after uprev you would have duplicate entries for "/" as mentioned in this [1] comment of mine.

In the current wic version in isar these(/ mount points) are ignored and are safe to drop from wks files without affecting functionality.


[1] https://groups.google.com/g/isar-users/c/MoD4uYEAle8/m/YivS6uUKAwAJ

Thanks,
VIjai Kumar K



[1] 
> 
> Jan
> 
> --
> Siemens AG, Technology
> Competence Center Embedded Linux

Re: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev

[Henning Schild]

Am Fri, 10 Jun 2022 17:09:18 +0530
schrieb Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>:

> 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.

I would not do that, at least not for the wks files we have as forks,
like "common-isar.wks.inc". That second fstab line should win and if we
really dislike the duplication we should remove the first one from the
rootfs configure function.

Henning

> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> ---
>  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"

Re: [PATCH 0/2] Update wic to bring in fspassno feature

[Henning Schild]

Am Mon, 13 Jun 2022 09:15:05 +0200
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> On 10.06.22 13:39, Vijai Kumar K wrote:
> > The series has 2 patches.
> > 
> > P1: updates isar wks files to handle the uprev without breakage
> > P2: Uprev of wic
> > 
> > This uprevision is needed to bring in the fspassno feature from
> > oe-core.
> > 
> > https://github.com/openembedded/openembedded-core/commit/20d43a2599d7622b96e2fb0da87a886da1a3794a
> > https://github.com/openembedded/openembedded-core/commit/b9b9f71e6f37bfbf954ade518391b242669481e3
> > 
> > Note: Targeting for the 0.9 release.
> >   
> 
> Not being a fix, this is post 0.9 material.
> 
> But wasn't there another wic update for that time pending already?

There was a wic bump from Felix, which should be followed by this one.
This second bump deals with controlling rootfs flags in fstab coming
via wic.
Tobias needs it for some growfs aspects but i think he can wait until
after 0.9, and Vijai needs it for fspassno ... which can probably also
wait.

What Tobias proposed for growfs without fstab-flags is imho going into
0.9.

Henning

> Jan
> 
> > Thanks,
> > Vijai Kumar K
> > 
> > Vijai Kumar K (2):
> >   meta-isar/wks: prepare wks for wic uprev
> >   wic: Update to the latest revision
> > 
> >  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 +-
> >  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 +++--
> >  15 files changed, 22 insertions(+), 13 deletions(-)
> >   
> 

RE: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev

[Kanagarajan, Vijaikumar]

> -----Original Message-----
> From: Henning Schild <henning.schild@siemens.com>
> Sent: 13 June 2022 13:41
> To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>
> Cc: isar-users@googlegroups.com; jan.kiszka@siemens.com
> Subject: Re: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev
> 
> Am Fri, 10 Jun 2022 17:09:18 +0530
> schrieb Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>:
> 
> > 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.
> 
> I would not do that, at least not for the wks files we have as forks, like
> "common-isar.wks.inc". That second fstab line should win and if we really
> dislike the duplication we should remove the first one from the rootfs
> configure function.

Hi Henning,

My thought process was different on this matter. 
Some wks files use UUIDs to create the entry. I was aiming to keep the fstab output consistent with previous versions, as far as ISAR is concerned.
 
Downstream users can take a call based on their needs. I believe this approach will have minimal impact since the fstab output would be the same as before for those using wks files from ISAR.

Thanks,
Vijai Kumar K

> 
> Henning
> 
> > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> > ---
> >  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"

Re: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev

[Henning Schild]

Am Mon, 13 Jun 2022 08:35:42 +0000
schrieb "Kanagarajan, Vijaikumar" <Vijaikumar_Kanagarajan@mentor.com>:

> > -----Original Message-----
> > From: Henning Schild <henning.schild@siemens.com>
> > Sent: 13 June 2022 13:41
> > To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>
> > Cc: isar-users@googlegroups.com; jan.kiszka@siemens.com
> > Subject: Re: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev
> > 
> > Am Fri, 10 Jun 2022 17:09:18 +0530
> > schrieb Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>:
> >   
> > > 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.  
> > 
> > I would not do that, at least not for the wks files we have as
> > forks, like "common-isar.wks.inc". That second fstab line should
> > win and if we really dislike the duplication we should remove the
> > first one from the rootfs configure function.  
> 
> Hi Henning,
> 
> My thought process was different on this matter. 
> Some wks files use UUIDs to create the entry. I was aiming to keep
> the fstab output consistent with previous versions, as far as ISAR is
> concerned. Downstream users can take a call based on their needs. I
> believe this approach will have minimal impact since the fstab output
> would be the same as before for those using wks files from ISAR.

I get that and it might be a good idea to drop the static entry now
that wic brings another one. But that should probably go into OE first.

Our goal should be to eventually retire the forked files, not throw
more changes into them.

Henning

> Thanks,
> Vijai Kumar K
> 
> > 
> > Henning
> >   
> > > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> > > ---
> > >  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"  
>