[tisdk-setup-scripts] [master] [PATCH-V2 0/3] create-sdcard: Fix rootfs tarball search and selection

[tisdk-setup-scripts] [master] [PATCH-V2 0/3] create-sdcard: Fix rootfs tarball search and selection

[Priya N S]

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

Hi All,
Changes from previous version:
1. Added the repo name in the subject.

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 | 75 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 58 insertions(+), 17 deletions(-)

-- 
2.19.1.windows.1

[tisdk-setup-scripts] [master] [PATCH-V2 1/3] create-sdcard.sh: fix regex used for rootfs tarball

[Priya N S]

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

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

Re: [tisdk-setup-scripts] [master] [PATCH-V2 1/3] create-sdcard.sh: fix regex used for rootfs tarball

[Nishanth Menon]

On 19:14-20210622, Priya N S wrote:
> From: Priya N S <priya.ns@ti.com>
> 
> 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'}`

Can we drop this? We should'nt have commented out code.

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

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

Re: [tisdk-setup-scripts] [master] [PATCH-V2 1/3] create-sdcard.sh: fix regex used for rootfs tarball

[Vigna Raja Priya N S]

On Wed, Jun 23, 2021 at 8:33 AM Nishanth Menon <nm@ti.com> wrote:
>
> On 19:14-20210622, Priya N S wrote:
> > From: Priya N S <priya.ns@ti.com>
> >
> > 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'}`
>
> Can we drop this? We should'nt have commented out code.
The commented-out code is already removed from the script.

[tisdk-setup-scripts] [master] [PATCH-V2 2/3] create-sdcard: Fix wrong rootfs tarball selection

[Priya N S]

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

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 | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/create-sdcard.sh b/create-sdcard.sh
index 264095a..8f99687 100644
--- a/create-sdcard.sh
+++ b/create-sdcard.sh
@@ -767,9 +767,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`
+		ENTERCORRECTLY="0"
+		while [ $ENTERCORRECTLY -ne 1 ]
+		do
+			read -p "Enter Number of rootfs Tarball: " TARNUMBER
+			echo " "
+			if [ -z "${TARNUMBER//[0-$COUNT]}" ] && [ -n "$TARNUMBER" ] ; then
+				ENTERCORRECTLY=1
+			else
+				echo "Invalid selection!"
+			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

Re: [tisdk-setup-scripts] [master] [PATCH-V2 2/3] create-sdcard: Fix wrong rootfs tarball selection

[Nishanth Menon]

On 19:14-20210622, Priya N S wrote:
> From: Priya N S <priya.ns@ti.com>
> 
> 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 | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/create-sdcard.sh b/create-sdcard.sh
> index 264095a..8f99687 100644
> --- a/create-sdcard.sh
> +++ b/create-sdcard.sh
> @@ -767,9 +767,19 @@ cat << EOM
>  
>  EOM
>  		ls --sort=size $ROOTFILEPARTH | grep "tisdk.*image" | grep 'tar.xz' | grep -n '' | awk {'print "	" , $1'}

Do you want to move this inside the while loop?

> -		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`
> +		ENTERCORRECTLY="0"
> +		while [ $ENTERCORRECTLY -ne 1 ]
> +		do
> +			read -p "Enter Number of rootfs Tarball: " TARNUMBER
> +			echo " "

just echo?

> +			if [ -z "${TARNUMBER//[0-$COUNT]}" ] && [ -n "$TARNUMBER" ] ; then

if COUNT=2 is '0' a valid entry? While the above might be a smart code,
I wonder if we could simplify for readability?


> +				ENTERCORRECTLY=1
'break' should simplify this loop?
> +			else
> +				echo "Invalid selection!"
Could we articulate this to be "Invalid selection: '$TARNUMBER'. Please use values from 1 to $COUNT"
> +			fi
> +			echo ""
"" is redundant.

I don't think the following is proper - does'nt handle 0 case, but..
maybe?
while :
do
	read -p "Enter Number of rootfs Tarball: " TARNUMBER
	echo
	if [ -z "${TARNUMBER//[0-$COUNT]}" ] && [ -n "$TARNUMBER" ] ; then
		break
	fi
	echo "Invalid selection: '$TARNUMBER'. Please use values from 1 to $COUNT"
done
> +		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
> 
> _______________________________________________
> 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

Re: [tisdk-setup-scripts] [master] [PATCH-V2 2/3] create-sdcard: Fix wrong rootfs tarball selection

[Vigna Raja Priya N S]

On Wed, Jun 23, 2021 at 8:49 AM Nishanth Menon <nm@ti.com> wrote:
>
> On 19:14-20210622, Priya N S wrote:
> > From: Priya N S <priya.ns@ti.com>
> >
> > 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 | 16 +++++++++++++---
> >  1 file changed, 13 insertions(+), 3 deletions(-)
> >
> > diff --git a/create-sdcard.sh b/create-sdcard.sh
> > index 264095a..8f99687 100644
> > --- a/create-sdcard.sh
> > +++ b/create-sdcard.sh
> > @@ -767,9 +767,19 @@ cat << EOM
> >
> >  EOM
> >               ls --sort=size $ROOTFILEPARTH | grep "tisdk.*image" | grep 'tar.xz' | grep -n '' | awk {'print "        " , $1'}
>
> Do you want to move this inside the while loop?
Moved inside the while loop in the V3 patch.

>
> > -             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`
> > +             ENTERCORRECTLY="0"
> > +             while [ $ENTERCORRECTLY -ne 1 ]
> > +             do
> > +                     read -p "Enter Number of rootfs Tarball: " TARNUMBER
> > +                     echo " "
>
> just echo?
>
> > +                     if [ -z "${TARNUMBER//[0-$COUNT]}" ] && [ -n "$TARNUMBER" ] ; then
>
> if COUNT=2 is '0' a valid entry? While the above might be a smart code,
> I wonder if we could simplify for readability?
>
>
> > +                             ENTERCORRECTLY=1
> 'break' should simplify this loop?
> > +                     else
> > +                             echo "Invalid selection!"
> Could we articulate this to be "Invalid selection: '$TARNUMBER'. Please use values from 1 to $COUNT"
> > +                     fi
> > +                     echo ""
> "" is redundant.
>
> I don't think the following is proper - does'nt handle 0 case, but..
> maybe?
The '0' input error is handled and updated in the V3 patch along with
the other review comments.

[tisdk-setup-scripts] [master] [PATCH-V2 3/3] create-sdcard.sh: Stop using cylinder as unit for partition size

[Priya N S]

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

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 8f99687..1114f70 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