All of lore.kernel.org
 help / color / mirror / Atom feed
* [tisdk-setup-scripts] [master] [PATCH-V3 0/3] create-sdcard: Fix rootfs tarball search and selection
@ 2021-07-07  3:14 Priya N S
  2021-07-07  3:14 ` [tisdk-setup-scripts] [master] [PATCH-V3 1/3] create-sdcard.sh: fix regex used for rootfs tarball Priya N S
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Priya N S @ 2021-07-07  3:14 UTC (permalink / raw)
  To: meta-arago; +Cc: Priya N S, Sekhar Nori

From: Priya N S <priya.ns@ti.com>

Hi All,
Changes from previous version:
1. Fixed the rootfs tarball selection user input validation logic which
   failed for some cases.

Priya N S (3):
  create-sdcard.sh: fix regex used for rootfs tarball
  create-sdcard: Fix wrong rootfs tarball selection
  create-sdcard.sh: Stop using cylinder as unit for partition size

 create-sdcard.sh | 74 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 57 insertions(+), 17 deletions(-)

-- 
2.19.1.windows.1



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [tisdk-setup-scripts] [master] [PATCH-V3 1/3] create-sdcard.sh: fix regex used for rootfs tarball
  2021-07-07  3:14 [tisdk-setup-scripts] [master] [PATCH-V3 0/3] create-sdcard: Fix rootfs tarball search and selection Priya N S
@ 2021-07-07  3:14 ` Priya N S
  2021-07-07  3:14 ` [tisdk-setup-scripts] [master] [PATCH-V3 2/3] create-sdcard: Fix wrong rootfs tarball selection Priya N S
  2021-07-07  3:14 ` [tisdk-setup-scripts] [master] [PATCH-V3 3/3] create-sdcard.sh: Stop using cylinder as unit for partition size Priya N S
  2 siblings, 0 replies; 6+ messages in thread
From: Priya N S @ 2021-07-07  3:14 UTC (permalink / raw)
  To: meta-arago; +Cc: Priya N S, Sekhar Nori

From: Priya N S <priya.ns@ti.com>

Filesystem tarballs present in SDK are in the format
tisdk-<IMAGE_TYPE>-image-<MACHINE>.tar.xz. This is different from
earlier format where 'rootfs' was present in all the filesystem
tarball names. Update regex used for filesystem tarball search to
use "image" as the keyword.

Signed-off-by: Priya N S <priya.ns@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
---
 create-sdcard.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/create-sdcard.sh b/create-sdcard.sh
index 736cd42..264095a 100644
--- a/create-sdcard.sh
+++ b/create-sdcard.sh
@@ -752,10 +752,9 @@ if [ $FILEPATHOPTION -eq 1 ] ; then
 	BOOTUENV=`ls $BOOTFILEPATH | grep uEnv.txt | awk {'print $1'}`
 	#rootfs
 	ROOTFILEPARTH="$PARSEPATH/filesystem"
-	#ROOTFSTAR=`ls  $ROOTFILEPARTH | grep tisdk.*rootfs | awk {'print $1'}`
 
 	#Make sure there is only 1 tar
-	CHECKNUMOFTAR=`ls $ROOTFILEPARTH | grep "tisdk.*rootfs" | grep 'tar.xz' | grep -n '' | grep '2:' | awk {'print $1'}`
+	CHECKNUMOFTAR=`ls $ROOTFILEPARTH | grep "tisdk.*image" | grep 'tar.xz' | grep -n '' | grep '2:' | awk {'print $1'}`
 	if [ -n "$CHECKNUMOFTAR" ]
 	then
 cat << EOM
@@ -767,15 +766,15 @@ cat << EOM
 ################################################################################
 
 EOM
-		ls --sort=size $ROOTFILEPARTH | grep "tisdk.*rootfs" | grep 'tar.xz' | grep -n '' | awk {'print "	" , $1'}
+		ls --sort=size $ROOTFILEPARTH | grep "tisdk.*image" | grep 'tar.xz' | grep -n '' | awk {'print "	" , $1'}
 		echo ""
 		read -p "Enter Number of rootfs Tarball: " TARNUMBER
 		echo " "
-		FOUNDTARFILENAME=`ls --sort=size $ROOTFILEPARTH | grep "rootfs" | grep 'tar.xz' | grep -n '' | grep "${TARNUMBER}:" | cut -c3- | awk {'print$1'}`
+		FOUNDTARFILENAME=`ls --sort=size $ROOTFILEPARTH | grep "image" | grep 'tar.xz' | grep -n '' | grep "${TARNUMBER}:" | cut -c3- | awk {'print$1'}`
 		ROOTFSTAR=$FOUNDTARFILENAME
 
 	else
-		ROOTFSTAR=`ls  $ROOTFILEPARTH | grep "tisdk.*rootfs" | grep 'tar.xz' | awk {'print $1'}`
+		ROOTFSTAR=`ls  $ROOTFILEPARTH | grep "tisdk.*image" | grep 'tar.xz' | awk {'print $1'}`
 	fi
 
 	ROOTFSUSERFILEPATH=$ROOTFILEPARTH/$ROOTFSTAR
-- 
2.19.1.windows.1



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [tisdk-setup-scripts] [master] [PATCH-V3 2/3] create-sdcard: Fix wrong rootfs tarball selection
  2021-07-07  3:14 [tisdk-setup-scripts] [master] [PATCH-V3 0/3] create-sdcard: Fix rootfs tarball search and selection Priya N S
  2021-07-07  3:14 ` [tisdk-setup-scripts] [master] [PATCH-V3 1/3] create-sdcard.sh: fix regex used for rootfs tarball Priya N S
@ 2021-07-07  3:14 ` Priya N S
  2021-07-07  3:14 ` [tisdk-setup-scripts] [master] [PATCH-V3 3/3] create-sdcard.sh: Stop using cylinder as unit for partition size Priya N S
  2 siblings, 0 replies; 6+ messages in thread
From: Priya N S @ 2021-07-07  3:14 UTC (permalink / raw)
  To: meta-arago; +Cc: Priya N S, Sekhar Nori

From: Priya N S <priya.ns@ti.com>

* Validate user input of rootfs tarball selection.
* This will not allow the user to proceed with wrong rootfs
  tarball selection.

Signed-off-by: Priya N S <priya.ns@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
---
 create-sdcard.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/create-sdcard.sh b/create-sdcard.sh
index 264095a..d052312 100644
--- a/create-sdcard.sh
+++ b/create-sdcard.sh
@@ -766,10 +766,19 @@ cat << EOM
 ################################################################################
 
 EOM
-		ls --sort=size $ROOTFILEPARTH | grep "tisdk.*image" | grep 'tar.xz' | grep -n '' | awk {'print "	" , $1'}
-		echo ""
-		read -p "Enter Number of rootfs Tarball: " TARNUMBER
-		echo " "
+		COUNT=`ls $ROOTFILEPARTH | grep "tisdk.*image" | grep 'tar.xz' | grep -n '' | awk {'print $1'} | wc -l`
+		while :
+		do
+			ls --sort=size $ROOTFILEPARTH | grep "tisdk.*image" | grep 'tar.xz' | grep -n '' | awk {'print "	" , $1'}
+			read -p "Enter Number of rootfs Tarball: " TARNUMBER
+			echo
+			if [ -z "${TARNUMBER//[1-$COUNT]}" ] && [ -n "$TARNUMBER" ] ; then
+				break
+			else
+				echo "Invalid selection: '$TARNUMBER'. Please use values from 1 to $COUNT"
+			fi
+			echo
+		done
 		FOUNDTARFILENAME=`ls --sort=size $ROOTFILEPARTH | grep "image" | grep 'tar.xz' | grep -n '' | grep "${TARNUMBER}:" | cut -c3- | awk {'print$1'}`
 		ROOTFSTAR=$FOUNDTARFILENAME
 
-- 
2.19.1.windows.1



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [tisdk-setup-scripts] [master] [PATCH-V3 3/3] create-sdcard.sh: Stop using cylinder as unit for partition size
  2021-07-07  3:14 [tisdk-setup-scripts] [master] [PATCH-V3 0/3] create-sdcard: Fix rootfs tarball search and selection Priya N S
  2021-07-07  3:14 ` [tisdk-setup-scripts] [master] [PATCH-V3 1/3] create-sdcard.sh: fix regex used for rootfs tarball Priya N S
  2021-07-07  3:14 ` [tisdk-setup-scripts] [master] [PATCH-V3 2/3] create-sdcard: Fix wrong rootfs tarball selection Priya N S
@ 2021-07-07  3:14 ` Priya N S
  2021-07-07 15:08   ` Nishanth Menon
  2 siblings, 1 reply; 6+ messages in thread
From: Priya N S @ 2021-07-07  3:14 UTC (permalink / raw)
  To: meta-arago; +Cc: Priya N S, Sekhar Nori

From: Priya N S <priya.ns@ti.com>

* Cylinder size of sdcard is manufacturer dependent. To standardize
  sdcard partitioning remove the use of cylinder (cyl) unit.
* While at it shift to using fdisk for the partitioning the sdcard.
  fdisk is already used in the script and this reduces the dependencies
  of this script on available installed applications.
* This fixes cases where already partitioned cards were being detected
  as not partitioned because of size check elsewhere in the script
  failing.

Signed-off-by: Priya N S <priya.ns@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
---
 create-sdcard.sh | 50 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/create-sdcard.sh b/create-sdcard.sh
index d052312..546588b 100644
--- a/create-sdcard.sh
+++ b/create-sdcard.sh
@@ -501,11 +501,29 @@ SIZE=`fdisk -l $DRIVE | grep Disk | awk '{print $5}'`
 
 echo DISK SIZE - $SIZE bytes
 
-parted -s $DRIVE mklabel msdos
-parted -s $DRIVE unit cyl mkpart primary fat32 -- 0 9
-parted -s $DRIVE set 1 boot on
-parted -s $DRIVE unit cyl mkpart primary ext2 -- 9 310
-parted -s $DRIVE unit cyl mkpart primary ext2 -- 310 -2
+cat << END | fdisk $DRIVE
+n
+p
+1
+
++75M
+n
+p
+2
+
++2.4G
+n
+p
+3
+
+
+t
+1
+c
+a
+1
+w
+END
 
 
 cat << EOM
@@ -559,10 +577,24 @@ SIZE=`fdisk -l $DRIVE | grep Disk | awk '{print $5}'`
 
 echo DISK SIZE - $SIZE bytes
 
-parted -s $DRIVE mklabel msdos
-parted -s $DRIVE unit cyl mkpart primary fat32 -- 0 9
-parted -s $DRIVE set 1 boot on
-parted -s $DRIVE unit cyl mkpart primary ext2 -- 9 -2
+cat << END | fdisk $DRIVE
+n
+p
+1
+
++75M
+n
+p
+2
+
+
+t
+1
+c
+a
+1
+w
+END
 
 cat << EOM
 
-- 
2.19.1.windows.1



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [tisdk-setup-scripts] [master] [PATCH-V3 3/3] create-sdcard.sh: Stop using cylinder as unit for partition size
  2021-07-07  3:14 ` [tisdk-setup-scripts] [master] [PATCH-V3 3/3] create-sdcard.sh: Stop using cylinder as unit for partition size Priya N S
@ 2021-07-07 15:08   ` Nishanth Menon
  2021-07-29 12:44     ` Vigna Raja Priya N S
  0 siblings, 1 reply; 6+ messages in thread
From: Nishanth Menon @ 2021-07-07 15:08 UTC (permalink / raw)
  To: Priya N S; +Cc: meta-arago, Priya N S, Sekhar Nori

On 08:44-20210707, Priya N S wrote:
> From: Priya N S <priya.ns@ti.com>
> 
> * Cylinder size of sdcard is manufacturer dependent. To standardize
>   sdcard partitioning remove the use of cylinder (cyl) unit.
> * While at it shift to using fdisk for the partitioning the sdcard.
>   fdisk is already used in the script and this reduces the dependencies
>   of this script on available installed applications.
> * This fixes cases where already partitioned cards were being detected
>   as not partitioned because of size check elsewhere in the script
>   failing.
> 
> Signed-off-by: Priya N S <priya.ns@ti.com>
> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
> ---
>  create-sdcard.sh | 50 +++++++++++++++++++++++++++++++++++++++---------
>  1 file changed, 41 insertions(+), 9 deletions(-)
> 
> diff --git a/create-sdcard.sh b/create-sdcard.sh
> index d052312..546588b 100644
> --- a/create-sdcard.sh
> +++ b/create-sdcard.sh
> @@ -501,11 +501,29 @@ SIZE=`fdisk -l $DRIVE | grep Disk | awk '{print $5}'`
>  
>  echo DISK SIZE - $SIZE bytes
>  
> -parted -s $DRIVE mklabel msdos
> -parted -s $DRIVE unit cyl mkpart primary fat32 -- 0 9
> -parted -s $DRIVE set 1 boot on
> -parted -s $DRIVE unit cyl mkpart primary ext2 -- 9 310
> -parted -s $DRIVE unit cyl mkpart primary ext2 -- 310 -2
> +cat << END | fdisk $DRIVE
> +n
> +p
> +1
> +
> ++75M

https://lists.yoctoproject.org/g/meta-ti/topic/83851299#13855
Should we make boot partition 128MB as default to make sure it is in
sync with wic image sizes?

> +n
> +p
> +2
> +
> ++2.4G
> +n
> +p
> +3
> +
> +
> +t
> +1
> +c
> +a
> +1
> +w
> +END
>  
>  
>  cat << EOM
> @@ -559,10 +577,24 @@ SIZE=`fdisk -l $DRIVE | grep Disk | awk '{print $5}'`
>  
>  echo DISK SIZE - $SIZE bytes
>  
> -parted -s $DRIVE mklabel msdos
> -parted -s $DRIVE unit cyl mkpart primary fat32 -- 0 9
> -parted -s $DRIVE set 1 boot on
> -parted -s $DRIVE unit cyl mkpart primary ext2 -- 9 -2
> +cat << END | fdisk $DRIVE
> +n
> +p
> +1
> +
> ++75M
same ^^ ?

> +n
> +p
> +2
> +
> +
> +t
> +1
> +c
> +a
> +1
> +w
> +END
>  
>  cat << EOM
>  
> -- 
> 2.19.1.windows.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D)/Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [tisdk-setup-scripts] [master] [PATCH-V3 3/3] create-sdcard.sh: Stop using cylinder as unit for partition size
  2021-07-07 15:08   ` Nishanth Menon
@ 2021-07-29 12:44     ` Vigna Raja Priya N S
  0 siblings, 0 replies; 6+ messages in thread
From: Vigna Raja Priya N S @ 2021-07-29 12:44 UTC (permalink / raw)
  To: Nishanth Menon; +Cc: meta-arago, Priya N S, Sekhar Nori

On Wed, Jul 7, 2021 at 8:38 PM Nishanth Menon <nm@ti.com> wrote:
>
> On 08:44-20210707, Priya N S wrote:
> > From: Priya N S <priya.ns@ti.com>
> >
> > * Cylinder size of sdcard is manufacturer dependent. To standardize
> >   sdcard partitioning remove the use of cylinder (cyl) unit.
> > * While at it shift to using fdisk for the partitioning the sdcard.
> >   fdisk is already used in the script and this reduces the dependencies
> >   of this script on available installed applications.
> > * This fixes cases where already partitioned cards were being detected
> >   as not partitioned because of size check elsewhere in the script
> >   failing.
> >
> > Signed-off-by: Priya N S <priya.ns@ti.com>
> > Signed-off-by: Sekhar Nori <nsekhar@ti.com>
> > ---
> >  create-sdcard.sh | 50 +++++++++++++++++++++++++++++++++++++++---------
> >  1 file changed, 41 insertions(+), 9 deletions(-)
> >
> > diff --git a/create-sdcard.sh b/create-sdcard.sh
> > index d052312..546588b 100644
> > --- a/create-sdcard.sh
> > +++ b/create-sdcard.sh
> > @@ -501,11 +501,29 @@ SIZE=`fdisk -l $DRIVE | grep Disk | awk '{print $5}'`
> >
> >  echo DISK SIZE - $SIZE bytes
> >
> > -parted -s $DRIVE mklabel msdos
> > -parted -s $DRIVE unit cyl mkpart primary fat32 -- 0 9
> > -parted -s $DRIVE set 1 boot on
> > -parted -s $DRIVE unit cyl mkpart primary ext2 -- 9 310
> > -parted -s $DRIVE unit cyl mkpart primary ext2 -- 310 -2
> > +cat << END | fdisk $DRIVE
> > +n
> > +p
> > +1
> > +
> > ++75M
>
> https://lists.yoctoproject.org/g/meta-ti/topic/83851299#13855
> Should we make boot partition 128MB as default to make sure it is in
> sync with wic image sizes?
The partition size increase to 128MB is updated in the V4 patch.
>
> > +n
> > +p
> > +2
> > +
> > ++2.4G
> > +n
> > +p
> > +3
> > +
> > +
> > +t
> > +1
> > +c
> > +a
> > +1
> > +w
> > +END
> >
> >
> >  cat << EOM
> > @@ -559,10 +577,24 @@ SIZE=`fdisk -l $DRIVE | grep Disk | awk '{print $5}'`
> >
> >  echo DISK SIZE - $SIZE bytes
> >
> > -parted -s $DRIVE mklabel msdos
> > -parted -s $DRIVE unit cyl mkpart primary fat32 -- 0 9
> > -parted -s $DRIVE set 1 boot on
> > -parted -s $DRIVE unit cyl mkpart primary ext2 -- 9 -2
> > +cat << END | fdisk $DRIVE
> > +n
> > +p
> > +1
> > +
> > ++75M
> same ^^ ?
The partition size increase to 128MB is updated in the V4 patch.


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-07-29 12:44 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-07  3:14 [tisdk-setup-scripts] [master] [PATCH-V3 0/3] create-sdcard: Fix rootfs tarball search and selection Priya N S
2021-07-07  3:14 ` [tisdk-setup-scripts] [master] [PATCH-V3 1/3] create-sdcard.sh: fix regex used for rootfs tarball Priya N S
2021-07-07  3:14 ` [tisdk-setup-scripts] [master] [PATCH-V3 2/3] create-sdcard: Fix wrong rootfs tarball selection Priya N S
2021-07-07  3:14 ` [tisdk-setup-scripts] [master] [PATCH-V3 3/3] create-sdcard.sh: Stop using cylinder as unit for partition size Priya N S
2021-07-07 15:08   ` Nishanth Menon
2021-07-29 12:44     ` Vigna Raja Priya N S

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.