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

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

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"