From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7107574654634557440 X-Received: by 2002:a17:90b:395:b0:1e6:89bf:ae17 with SMTP id ga21-20020a17090b039500b001e689bfae17mr14686440pjb.140.1655109346295; Mon, 13 Jun 2022 01:35:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a65:6051:0:b0:3fd:4bf2:e5e7 with SMTP id a17-20020a656051000000b003fd4bf2e5e7ls2164655pgp.4.gmail; Mon, 13 Jun 2022 01:35:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsL3hEBw+5IvtiZ9XzCmW4V4g2Vz+VY1l+iwcUp59YuI0zpfqkxiyBhsGJIZxDgZxOtQ6J X-Received: by 2002:a63:2:0:b0:3f6:5b37:e94c with SMTP id 2-20020a630002000000b003f65b37e94cmr50637541pga.356.1655109345208; Mon, 13 Jun 2022 01:35:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655109345; cv=none; d=google.com; s=arc-20160816; b=cJE4TxAKgA5UFTAYPJbw06Y1+zso0G+69410wc/YYJIsgO5MF+7fVN6y4GNAWLfcRB M1cMPlg0NfUiHjXVAYj6+C+N1zWX24cqv/xz9ICaHf6RWn0Ya8JqVJ6rEH8SHhYcgfh8 oSw0mdowE9tn2HpyZWkMtR/oUBS2UiflGhrW6oMATgR5Bt7OztW37Ec/HMWJSzCEH8vT J3UmM0x98ZAIoYByla4mBJYvIPnOZz/hwO4JgwHLtHWRdFQaj6zgqCVc5HaWksdb5K/Q MwoCSVq9eKNj9fiNguYJ9HeEs9SB4K9OTr3EslZcIrts7HZbj8I34+mx6flPi9mMvjmL PddQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:ironport-sdr; bh=Fxhk7oGGzYs4dI/Sgf0pi0Zmw39SKx1c2VEAaQUE03M=; b=fquGeSDwnFfw9BYV01E2cWNgXqK+2agBOmd/mnUb886G9pG5zLTDP0+Ezwp/Aavse9 eOwOxWFAY5UuekfFq5jfUV7H2cDGAQkpsti3oSnGJ4Fxf65Yt7YWvJtskUJoySQLnoAf +FZlTJnDcYPK79t5rvllw+fbD/xgawNCvedfbYs9spI1oX1wbhzp8SlePkj560W3RTRB FgxCuynN1r+tozaS94oOcrbUfMNVET5wXvUTOcgsid8Qtb1Ve94BTMmsyJMtH9bJ2wha FaD1Fkh7SsBMCkDPfTxVEIOlV5Hw9wfw8JBu9YoSVaVG88EHhRHOYBUs6Iw7wvlMsWFi oYUw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com. [68.232.141.98]) by gmr-mx.google.com with ESMTPS id m3-20020a170902db0300b00163ebd072bcsi266068plx.6.2022.06.13.01.35.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jun 2022 01:35:45 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) client-ip=68.232.141.98; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com X-IronPort-AV: E=Sophos;i="5.91,296,1647331200"; d="scan'208";a="77171310" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 13 Jun 2022 00:35:44 -0800 IronPort-SDR: Z77OkxYLxmO+ocW+S+tIGikag6wy3XBZWuumY6wRpqQimwIrgV2sNsp0+NYYaND3UNpKReXEBk bZQtRtHxOTr87E4kQ211nPOO7a3xehC7tBOdwr50NccJ8PIuEgpw0pVHp4cUpxpB2+wa/qGgh6 7JS/HGsR47h/iY3gupeMJv079F7sTibO4PoHR6WNKLk2Bdv3uP7XmoN4AyRFKf1K+SsoLNyzbe DO3s0zcEmpZ1Ln6Yc69Dy6N4/dZ0aJZ56IOhwCkgV29xGeUaMktMDfEmV5SaPYOAVmBS0G3oYD kDw= From: "Kanagarajan, Vijaikumar" To: Henning Schild CC: "isar-users@googlegroups.com" , "jan.kiszka@siemens.com" Subject: RE: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev Thread-Topic: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev Thread-Index: AQHYfL7FddSZgc2XJEObVTx/KOEnTK1NdfmA//+NO7A= Date: Mon, 13 Jun 2022 08:35:42 +0000 Message-ID: References: <20220610113919.2051302-1-Vijaikumar_Kanagarajan@mentor.com> <20220610113919.2051302-2-Vijaikumar_Kanagarajan@mentor.com> <20220613101035.0f39fdd9@md1za8fc.ad001.siemens.net> In-Reply-To: <20220613101035.0f39fdd9@md1za8fc.ad001.siemens.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [147.34.91.1] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-TUID: HOxhKV3fR1fb > -----Original Message----- > From: Henning Schild > Sent: 13 June 2022 13:41 > To: Kanagarajan, Vijaikumar > Cc: isar-users@googlegroups.com; jan.kiszka@siemens.com > Subject: Re: [PATCH 1/2] meta-isar/wks: prepare wks for wic uprev >=20 > Am Fri, 10 Jun 2022 17:09:18 +0530 > schrieb Vijai Kumar K : >=20 > > 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. >=20 > I would not do that, at least not for the wks files we have as forks, lik= e > "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.=20 Some wks files use UUIDs to create the entry. I was aiming to keep the fsta= b output consistent with previous versions, as far as ISAR is concerned. =20 Downstream users can take a call based on their needs. I believe this appro= ach will have minimal impact since the fstab output would be the same as be= fore for those using wks files from ISAR. Thanks, Vijai Kumar K >=20 > Henning >=20 > > 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=3Dext4 --label platform --align 1024 --exclude-path=3Dboot > > --mkfs-extraopts "-T default" +part --source rootfs --use-uuid > > --fstype=3Dext4 --label platform --align 1024 --exclude-path=3Dboot > > --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=3D/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=3D"loader=3Dgrub-efi" --label boot --active --align 1024 > > -part / --source rootfs --ondisk sda --fstype=3Dext4 --mkfs-extraopts > > "-T default" --label platform --align 1024 --exclude-path=3Dboot +part > > --source rootfs --ondisk sda --fstype=3Dext4 --mkfs-extraopts "-T > > default" --label platform --align 1024 --exclude-path=3Dboot bootloader > > --ptable gpt --timeout 3 --append "rootwait console=3DttyS0,115200 > > console=3Dtty0" 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=3Dgrub-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=3D3 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=3D"loader=3Dgrub-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=3Dext4 --mkfs-extraopts "-T default" --label platform --align > > 1024 --exclude-path boot home --extra-space 1G +part --ondisk sda > > --source rootfs --fstype=3Dext4 --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=3D${IMAGE_ROOTFS}/home > > --fstype=3Dext4 --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=3D/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=3Dvfat > > --label boot --active --align 4096 --size 10 -part / --source rootfs > > --ondisk mmcblk0 --fstype=3Dext4 --mkfs-extraopts "-T default" --label > > root --align 4096 --exclude-path=3Dboot +part --source rootfs --ondisk > > mmcblk0 --fstype=3Dext4 --mkfs-extraopts "-T default" --label root > > --align 4096 --exclude-path=3Dboot 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=3Dsystemd-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=3DttyS0,115200 console=3Dtty0" > > 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=3Dgrub-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=3DttyS0,115200 console=3Dtty0" > > 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=3D/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=3Dyes,script_prepend=3Dsetenv 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=3Dyes,script_prepend=3Dsetenv 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=3D/usr/lib/optee- part teed --part-name teed --source rawcopy > > --sourceparams > > "file=3D/usr/lib/optee-os/${MACHINE}/tee-pageable_v2.stm32" > > --fstype=3Dext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size > > 512K part teex --part-name teex --source rawcopy --sourceparams > > "file=3D/usr/lib/optee-os/${MACHINE}/tee-pager_v2.stm32" --fstype=3Dext= 4 > > --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=3D"rootwait rw console=3DttySTM0,115200"