[PATCH] nanopi-neo.wks.in: use partition uuid instead of providing mmcblk2 disk

[Badrikesh]

Observing boot failure on nanopi, if booted from external sd-card
From FriendlyElec documentation, mmcblk2 is used as internal emmc,
while mmcblk0 is used for external sd-card.
Some nanopi's doesn't support emmc, instead uses ext sd for booting
With this change it will allow booting from external sd-card. Also,
the image can be copied to emmc to boot from emmc as well

Signed-off-by: Badrikesh Prusty <badrikes...@siemens.com>
---
 meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 af5b6f08..9489bd12 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 mmcblk2 --fstype ext4 --mkfs-extraopts "-T default" --sourceparams "builtin_dt=yes" --label platform --align 1024 --active
+part / --source rootfs-u-boot --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --sourceparams "builtin_dt=yes" --label platform --align 1024 --active

 bootloader --append "rw rootwait"
--
2.39.2

[MOESSBAUER, Felix]

On Sun, 2023-11-26 at 12:09 -0800, 'Badrikesh' via isar-users wrote:
> Observing boot failure on nanopi, if booted from external sd-card
> From FriendlyElec documentation, mmcblk2 is used as internal emmc,
> while mmcblk0 is used for external sd-card.
> Some nanopi's doesn't support emmc, instead uses ext sd for booting
> With this change it will allow booting from external sd-card. Also,
> the image can be copied to emmc to boot from emmc as well

Hi Badrikesh,

thanks for this fix. I also wanted to send it, but you were faster.
Once merged, the following issue can be closed:
https://github.com/ilbers/isar/issues/100

Acked-by: Felix Moessbauer <felix.mo...@siemens.com>

Happy Coding!
Felix

[Uladzimir Bely]

On Sun, 2023-11-26 at 12:09 -0800, 'Badrikesh' via isar-users wrote:

Hello

This patch looks broken since long lines are splitted in two lines. The
same situation is observed in the patchwork. Probably, it is related to
windows-style line endings in the email.

See also the patch at
https://patchwork.isar-build.org/project/isar/patch/9ed33d28-4442-480d...@googlegroups.com/

Could you resend v2 with the fix? Of course, we could fix it when
merging, but it would better to have a proper version in the maillist.

>  bootloader --append "rw rootwait"
> --
> 2.39.2

> --
> You received this message because you are subscribed to the Google
> Groups "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it,
> send an email to isar-users+...@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/isar-users/9ed33d28-4442-480d-aa3c-0d68d216905en%40googlegroups.com
> .

[Badrikesh Prusty]

From: Badrikesh Prusty <badrikes...@siemens.com>

Observing boot failure on nanopi-neo, if booted from external sd-card
due to dev/mmcblk2p1 not found.

From FriendlyElec documentation, mmcblk2 is used as internal emmc,
while mmcblk0 is used for external sd-card.

Some nanopi-neo's doesn't support emmc, instead uses external sd-card
as a boot device.

With this change it will allow booting from external sd-card and the
image can be copied to emmc to boot from emmc as well.

Signed-off-by: Badrikesh Prusty <badrikes...@siemens.com>
---
meta-isar/scripts/lib/wic/canned-wks/nanopi-neo.wks.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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 af5b6f08..9489bd12 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 mmcblk2 --fstype ext4 --mkfs-extraopts "-T default" --sourceparams "builtin_dt=yes" --label platform --align 1024 --active
+part / --source rootfs-u-boot --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --sourceparams "builtin_dt=yes" --label platform --align 1024 --active

[Badrikesh Prusty]

Hi all,

The cause of windows style code was likely caused due to copy pasting the patch in windows system browser itself via new conversation. Now, I updated the commit and sent via git send-mail from linux host.

Thanks

[Uladzimir Bely]

Applied to next, thanks.