[PATCH 0/5] setup-environment: minor wording/display cleanups

[PATCH 0/5] setup-environment: minor wording/display cleanups

[Trevor Woerner]

Before starting in on some "meatier" adjustments, I wanted to propose a couple
quick "clean-up" patches.

Trevor Woerner (5):
  setup-environment: clean up all variables
  setup-environment: specify script name correctly
  setup-environment: phraseology
  setup-environment: remove redundant information
  setup-environment: improve MACHINE display

 setup-environment | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

-- 
1.9.0

[PATCH 1/5] setup-environment: clean up all variables

[Trevor Woerner]

Add to the list of cleaned-up variables to include all the variables used by
this script.

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
---
 setup-environment | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup-environment b/setup-environment
index f2c91d7..5466103 100644
--- a/setup-environment
+++ b/setup-environment
@@ -45,6 +45,8 @@ clean_up()
 {
    unset EULA LIST_MACHINES VALID_MACHINE
    unset NCPU CWD TEMPLATES SHORTOPTS LONGOPTS ARGS PROGNAME
+   unset generated_config updated
+   unset MACHINE SDKMACHINE DISTRO OEROOT
 }
 
 # get command line options
-- 
1.9.0

[PATCH 2/5] setup-environment: specify script name correctly

[Trevor Woerner]

When giving an error message, be sure to specify the script name correctly
(otherwise it just names your shell).

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
---
 setup-environment | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup-environment b/setup-environment
index 5466103..0ad1c11 100644
--- a/setup-environment
+++ b/setup-environment
@@ -124,7 +124,7 @@ for f in $CWD/sources/base/*; do
     fi
 done
 if [ "$updated" = "true" ]; then
-    echo "The project root content has been updated. Please run $0 again."
+    echo "The project root content has been updated. Please run $PROGNAME again."
     return
 fi
 
-- 
1.9.0

[PATCH 3/5] setup-environment: phraseology

[Trevor Woerner]

Minor wording/grammar fixes which hopefully add clarity and make the resulting
text more agreeable.

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
---
 setup-environment | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setup-environment b/setup-environment
index 0ad1c11..2b4fd3f 100644
--- a/setup-environment
+++ b/setup-environment
@@ -27,9 +27,9 @@ PROGNAME="setup-environment"
 usage()
 {
     echo -e "\nUsage: source $PROGNAME <build-dir>
-    <build-dir>: required option; specifies build directory location
+    <build-dir>: specifies the build directory location (required)
 
-By default the script will setup MACHINE to be imx6qsabresd.
+If undefined, this script will set \$MACHINE to 'imx6qsabresd'.
 
 Supported machines: `ls sources/*/conf/machine/*.conf \
 | sed s/\.conf//g | sed -r 's/^.+\///' | xargs echo`
@@ -89,7 +89,7 @@ fi
 LIST_MACHINES=`ls -1 $CWD/sources/*/conf/machine`
 VALID_MACHINE=`echo -e "$LIST_MACHINES" | grep ${MACHINE}.conf$ | wc -l`
 if [ "x$MACHINE" = "x" ] || [ "$VALID_MACHINE" = "0" ]; then
-    echo -e "\nSPECIFIED AN INVALID MACHINE TYPE !"
+    echo -e "\nThe \$MACHINE you have specified ($MACHINE) is not supported by this build setup"
     usage && clean_up
     return 1
 else
@@ -176,9 +176,9 @@ fi
 if [ "$EULA" = "ask" ]; then
     cat <<EOF
 
-Some SoC depends on libraries and packages that are covered by
-Freescale EULA. To have the right to use those binaries in your images
-you need to read and accept the EULA that will be displayed.
+Some BSPs depend on libraries and packages which are covered by Freescale's
+End User License Agreement (EULA). To have the right to use these binaries in
+your images, you need to read and accept the following...
 
 EOF
 
@@ -240,7 +240,7 @@ Your build environemnt has been configured with:
     EULA=$EULA
 EOF
 else
-    echo "Your configuration files at $1 has not been touched."
+    echo "Your configuration files at $1 have not been touched."
 fi
 
 clean_up
-- 
1.9.0

[PATCH 4/5] setup-environment: remove redundant information

[Trevor Woerner]

In an error message, this informational text is irrelevant.

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
---
 setup-environment | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setup-environment b/setup-environment
index 2b4fd3f..43b1489 100644
--- a/setup-environment
+++ b/setup-environment
@@ -36,8 +36,6 @@ Supported machines: `ls sources/*/conf/machine/*.conf \
 
 To build for a machine listed above, run this script as:
 MACHINE=<machine> source $PROGNAME <build-dir>
-
-The script sets PARALLEL_MAKE & BB_NUMBER_THREADS to $NCPU
 "
 }
 
-- 
1.9.0

[PATCH 5/5] setup-environment: improve MACHINE display

[Trevor Woerner]

If an invalid machine is specified, do a better job at listing the supported
MACHINEs.

was:
Supported machines: cgtqmx6 imx233-olinuxino-maxi imx233-olinuxino-micro
imx233-olinuxino-mini imx6qsabrelite nitrogen6x wandboard-dual wandboard-solo
imx23evk imx28evk imx31pdk imx35pdk imx51evk imx53ard imx53qsb imx6dlsabresd
imx6qsabreauto imx6qsabresd imx6slevk

now:
Supported machines:
        cfa10036
        cfa10037
        cfa10049
        cfa10055
        cfa10056
        cfa10057
        cfa10058
        cgtqmx6
        imx233-olinuxino-maxi
        imx233-olinuxino-micro
        imx233-olinuxino-mini
        imx6qsabrelite
        m28evk
        m53evk
        nitrogen6x-lite
        nitrogen6x
        wandboard-dual
        wandboard-quad
        wandboard-solo
        imx23evk
        imx28evk
        imx31pdk
        imx35pdk
        imx51evk
        imx53ard
        imx53qsb
        imx6dlsabreauto
        imx6dlsabresd
        imx6qsabreauto
        imx6qsabresd
        imx6slevk
        imx6solosabreauto
        imx6solosabresd
        twr-vf65gs10

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
---
 setup-environment | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup-environment b/setup-environment
index 43b1489..edb86f7 100644
--- a/setup-environment
+++ b/setup-environment
@@ -31,8 +31,8 @@ usage()
 
 If undefined, this script will set \$MACHINE to 'imx6qsabresd'.
 
-Supported machines: `ls sources/*/conf/machine/*.conf \
-| sed s/\.conf//g | sed -r 's/^.+\///' | xargs echo`
+Supported machines: `echo; ls sources/*/conf/machine/*.conf \
+| sed s/\.conf//g | sed -r 's/^.+\///' | xargs -I% echo -e "\t%"`
 
 To build for a machine listed above, run this script as:
 MACHINE=<machine> source $PROGNAME <build-dir>
-- 
1.9.0

Re: [PATCH 0/5] setup-environment: minor wording/display cleanups

[Daiane.Angolini]

> -----Original Message-----
> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> bounces@yoctoproject.org] On Behalf Of Trevor Woerner
> Sent: Sunday, March 30, 2014 7:05 PM
> To: meta-freescale@yoctoproject.org
> Cc: patches@linaro.org
> Subject: [meta-freescale] [PATCH 0/5] setup-environment: minor
> wording/display cleanups
> 
> Before starting in on some "meatier" adjustments, I wanted to propose a
> couple quick "clean-up" patches.
> 
> Trevor Woerner (5):
>   setup-environment: clean up all variables
>   setup-environment: specify script name correctly
>   setup-environment: phraseology
>   setup-environment: remove redundant information
>   setup-environment: improve MACHINE display
> 
>  setup-environment | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)

Thanks a lot, Trevor!

I have no comment on any patch.

I ack all 5 patches:
Ached-by: Daiane Angolini <Daiane.angolini@freescale.com>



Daiane
> 
> --
> 1.9.0
> 
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
> 

Re: [PATCH 0/5] setup-environment: minor wording/display cleanups

[Otavio Salvador]

Hello Trevor,

On Sun, Mar 30, 2014 at 7:04 PM, Trevor Woerner
<trevor.woerner@linaro.org> wrote:
> Before starting in on some "meatier" adjustments, I wanted to propose a couple
> quick "clean-up" patches.
>
> Trevor Woerner (5):
>   setup-environment: clean up all variables
>   setup-environment: specify script name correctly
>   setup-environment: phraseology
>   setup-environment: remove redundant information
>   setup-environment: improve MACHINE display

I am sorry for not looking at this before. I tried to apply those and
it seems you are missing a patch somewhere here as this does not
apply.

Could you rebase it on top of fsl-community-bsp-base's master branch
and resend? By the way, please use the --subject-prefix in git
format-patch next time when sending the patches so it is easier to
spot the project it is related.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 0/5] setup-environment: minor wording/display cleanups

[Trevor Woerner]

On 04/01/14 10:36, Otavio Salvador wrote:
> I am sorry for not looking at this before. I tried to apply those and
> it seems you are missing a patch somewhere here as this does not apply.

D'oh! Sorry about that. The default branch when checking
fsl-community-bsp-base out is denzil, so my patches were made on top of
that. Rebasing now...

Re: [PATCH 0/5] setup-environment: minor wording/display cleanups

[Otavio Salvador]

On Tue, Apr 1, 2014 at 12:53 PM, Trevor Woerner
<trevor.woerner@linaro.org> wrote:
>
> On 04/01/14 10:36, Otavio Salvador wrote:
>> I am sorry for not looking at this before. I tried to apply those and
>> it seems you are missing a patch somewhere here as this does not apply.
>
> D'oh! Sorry about that. The default branch when checking
> fsl-community-bsp-base out is denzil, so my patches were made on top of
> that. Rebasing now...

I don't think so; I checked it and in github interface 'master' is
chosen as default.

Anyway, good we found the culprit ;-)

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 0/5] setup-environment: minor wording/display cleanups

[Trevor Woerner]

On 04/01/14 12:16, Otavio Salvador wrote:
> I don't think so; I checked it and in github interface 'master' is
> chosen as default. Anyway, good we found the culprit ;-) 

Yes, you're right.

I wonder how I ended up on denzil... weird! Sorry for the noise.