[edk2-test] [PATCH 1/3] uefi-sct/SctPkg: Fix build.sh when specifying GCC5 toolchain

[edk2-test] [PATCH 1/3] uefi-sct/SctPkg: Fix build.sh when specifying GCC5 toolchain

[Rebecca Cran]

build.sh usage indicates that "GCC5" can be specified, but it's currently
rejected due to a case statement only matching "GCC" or "gcc".
Fix this by adding a wildcard match.

Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
---
 uefi-sct/SctPkg/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh
index cad17ccd..be610deb 100755
--- a/uefi-sct/SctPkg/build.sh
+++ b/uefi-sct/SctPkg/build.sh
@@ -151,7 +151,7 @@ case `uname` in
 			TARGET_TOOLS=ARMGCC
 		;;
 		
-		GCC | gcc)
+		GCC* | gcc*)
             set_cross_compile
 	        CROSS_COMPILE="$TEMP_CROSS_COMPILE"
             export TARGET_TOOLS=`get_gcc_version "$CROSS_COMPILE"gcc`
-- 
2.26.2

[edk2-test] [PATCH 2/3] uefi-sct: Fix the mailing list address in Maintainers.txt and Readme.md

[Rebecca Cran]

The mailing list has changed from lists.01.org to groups.io.
Update Maintainers.txt and Readme.md to match.

Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
---
 uefi-sct/Maintainers.txt | 2 +-
 uefi-sct/Readme.md       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/uefi-sct/Maintainers.txt b/uefi-sct/Maintainers.txt
index c5f11c7d..cfad3b78 100644
--- a/uefi-sct/Maintainers.txt
+++ b/uefi-sct/Maintainers.txt
@@ -46,4 +46,4 @@ R: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>
 
 
 General questions on UEFI-SCT with the subject [edk2-test] can be sent to
-L: edk2-list <edk2-devel@lists.01.org>
+L: edk2-devel <devel@edk2.groups.io>
diff --git a/uefi-sct/Readme.md b/uefi-sct/Readme.md
index 8445f4d5..1a049b60 100644
--- a/uefi-sct/Readme.md
+++ b/uefi-sct/Readme.md
@@ -24,5 +24,5 @@ are listed in [Maintainers.txt](Maintainers.txt).
 # Resources
 * [TianoCore](http://www.tianocore.org)
 * [Getting Started with UEFI-SCT](https://github.com/tianocore/tianocore.github.io/wiki/UEFI-SCT)
-* [Mailing List](mailto:edk2-devel@lists.01.org?subject=[edk2-test])
+* [Mailing List](mailto:devel@edk2.groups.io?subject=[edk2-test])
 * [UEFI-SCT BugTracker](https://bugzilla.tianocore.org/)
-- 
2.26.2

[edk2-test] [PATCH 3/3] uefi-sct/SctPkg: Fix some indentation issues in build.sh

[Rebecca Cran]

build.sh contains a mixture of tabs and spaces, with differing
numbers of spaces used for indents. Update it so any single block only
uses one style of indentation.

Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
---
 uefi-sct/SctPkg/build.sh | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh
index be610deb..37667711 100755
--- a/uefi-sct/SctPkg/build.sh
+++ b/uefi-sct/SctPkg/build.sh
@@ -56,9 +56,9 @@ function get_gcc_version
 {
 	gcc_version=$($1 -dumpversion)
 
-    if [ ${gcc_version%%.*} -gt 5 ]; then
-        gcc_version=5
-    fi
+	if [ ${gcc_version%%.*} -gt 5 ]; then
+		gcc_version=5
+	fi
 
 	case $gcc_version in
 		4.6*|4.7*|4.8*|4.9*|5*)
@@ -152,10 +152,9 @@ case `uname` in
 		;;
 		
 		GCC* | gcc*)
-            set_cross_compile
-	        CROSS_COMPILE="$TEMP_CROSS_COMPILE"
-            export TARGET_TOOLS=`get_gcc_version "$CROSS_COMPILE"gcc`
-
+			set_cross_compile
+			CROSS_COMPILE="$TEMP_CROSS_COMPILE"
+			export TARGET_TOOLS=`get_gcc_version "$CROSS_COMPILE"gcc`
 		;;
 
 		*)
@@ -224,7 +223,7 @@ then
   status=$?
   if test $status -ne 0
   then
-  echo Error while building EDK tools
+    echo Error while building EDK tools
     exit -1
   fi
 else
@@ -239,7 +238,7 @@ make -C SctPkg/Tools/Source/GenBin
 status=$?
 if test $status -ne 0
 then
-echo Error while building GenBin
+  echo Error while building GenBin
   exit -1
 fi
 
@@ -258,8 +257,8 @@ build -p SctPkg/UEFI/UEFI_SCT.dsc -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_B
 status=$?
 if test $status -ne 0
 then
-echo Could not build the UEFI SCT package
-        exit -1
+  echo Could not build the UEFI SCT package
+  exit -1
 fi
 
 build -p SctPkg/UEFI/IHV_SCT.dsc -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_BUILD $3 $4 $5 $6 $7 $8 $9
@@ -268,8 +267,8 @@ build -p SctPkg/UEFI/IHV_SCT.dsc -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_BU
 status=$?
 if test $status -ne 0
 then
-echo Could not build the IHV SCT package
-        exit -1
+  echo Could not build the IHV SCT package
+  exit -1
 fi
 
 
@@ -299,8 +298,8 @@ pwd
 status=$?
 if test $status -ne 0
 then
-echo Could not generate UEFI SCT binary
-     exit -1
+  echo Could not generate UEFI SCT binary
+  exit -1
 else
 echo The SCT binary "SctPackage${SCT_TARGET_ARCH}" is located at "$EFI_SOURCE/Build/UefiSct/${SCT_BUILD}_${TARGET_TOOLS}"
 fi
@@ -315,8 +314,8 @@ pwd
 status=$?
 if test $status -ne 0
 then
-echo Could not generate IHV SCT binary
-     exit -1
+  echo Could not generate IHV SCT binary
+  exit -1
 else
 echo The IHV binary "SctPackage${SCT_TARGET_ARCH}" is located at "$EFI_SOURCE/Build/IhvSct/${SCT_BUILD}_${TARGET_TOOLS}"
 fi
-- 
2.26.2

[edk2-test] [PATCH 3/3] uefi-sct/SctPkg: Fix some indentation issues in build.sh

[Rebecca Cran]

build.sh contains a mixture of tabs and spaces, with differing
numbers of spaces used for indents. Update it so any single block only
uses one style of indentation.

Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
---
 uefi-sct/SctPkg/build.sh | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh
index be610debcf3c..37667711f3a5 100755
--- a/uefi-sct/SctPkg/build.sh
+++ b/uefi-sct/SctPkg/build.sh
@@ -56,9 +56,9 @@ function get_gcc_version
 {
 	gcc_version=$($1 -dumpversion)
 
-    if [ ${gcc_version%%.*} -gt 5 ]; then
-        gcc_version=5
-    fi
+	if [ ${gcc_version%%.*} -gt 5 ]; then
+		gcc_version=5
+	fi
 
 	case $gcc_version in
 		4.6*|4.7*|4.8*|4.9*|5*)
@@ -152,10 +152,9 @@ case `uname` in
 		;;
 		
 		GCC* | gcc*)
-            set_cross_compile
-	        CROSS_COMPILE="$TEMP_CROSS_COMPILE"
-            export TARGET_TOOLS=`get_gcc_version "$CROSS_COMPILE"gcc`
-
+			set_cross_compile
+			CROSS_COMPILE="$TEMP_CROSS_COMPILE"
+			export TARGET_TOOLS=`get_gcc_version "$CROSS_COMPILE"gcc`
 		;;
 
 		*)
@@ -224,7 +223,7 @@ then
   status=$?
   if test $status -ne 0
   then
-  echo Error while building EDK tools
+    echo Error while building EDK tools
     exit -1
   fi
 else
@@ -239,7 +238,7 @@ make -C SctPkg/Tools/Source/GenBin
 status=$?
 if test $status -ne 0
 then
-echo Error while building GenBin
+  echo Error while building GenBin
   exit -1
 fi
 
@@ -258,8 +257,8 @@ build -p SctPkg/UEFI/UEFI_SCT.dsc -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_B
 status=$?
 if test $status -ne 0
 then
-echo Could not build the UEFI SCT package
-        exit -1
+  echo Could not build the UEFI SCT package
+  exit -1
 fi
 
 build -p SctPkg/UEFI/IHV_SCT.dsc -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_BUILD $3 $4 $5 $6 $7 $8 $9
@@ -268,8 +267,8 @@ build -p SctPkg/UEFI/IHV_SCT.dsc -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_BU
 status=$?
 if test $status -ne 0
 then
-echo Could not build the IHV SCT package
-        exit -1
+  echo Could not build the IHV SCT package
+  exit -1
 fi
 
 
@@ -299,8 +298,8 @@ pwd
 status=$?
 if test $status -ne 0
 then
-echo Could not generate UEFI SCT binary
-     exit -1
+  echo Could not generate UEFI SCT binary
+  exit -1
 else
 echo The SCT binary "SctPackage${SCT_TARGET_ARCH}" is located at "$EFI_SOURCE/Build/UefiSct/${SCT_BUILD}_${TARGET_TOOLS}"
 fi
@@ -315,8 +314,8 @@ pwd
 status=$?
 if test $status -ne 0
 then
-echo Could not generate IHV SCT binary
-     exit -1
+  echo Could not generate IHV SCT binary
+  exit -1
 else
 echo The IHV binary "SctPackage${SCT_TARGET_ARCH}" is located at "$EFI_SOURCE/Build/IhvSct/${SCT_BUILD}_${TARGET_TOOLS}"
 fi
-- 
2.26.2

Re: [edk2-devel] [edk2-test] [PATCH 3/3] uefi-sct/SctPkg: Fix some indentation issues in build.sh

[Samer El-Haj-Mahmoud]

Reviewed-By: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca
> Cran via groups.io
> Sent: Thursday, September 24, 2020 5:22 PM
> To: devel@edk2.groups.io
> Cc: Eric Jin <eric.jin@intel.com>; G Edhaya Chandran
> <Edhaya.Chandran@arm.com>; Samer El-Haj-Mahmoud <Samer.El-Haj-
> Mahmoud@arm.com>; Rebecca Cran <rebecca@nuviainc.com>
> Subject: [edk2-devel] [edk2-test] [PATCH 3/3] uefi-sct/SctPkg: Fix some
> indentation issues in build.sh
>
> build.sh contains a mixture of tabs and spaces, with differing numbers of
> spaces used for indents. Update it so any single block only uses one style of
> indentation.
>
> Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
> ---
>  uefi-sct/SctPkg/build.sh | 33 ++++++++++++++++-----------------
>  1 file changed, 16 insertions(+), 17 deletions(-)
>
> diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh index
> be610deb..37667711 100755
> --- a/uefi-sct/SctPkg/build.sh
> +++ b/uefi-sct/SctPkg/build.sh
> @@ -56,9 +56,9 @@ function get_gcc_version  {
>  gcc_version=$($1 -dumpversion)
>
> -    if [ ${gcc_version%%.*} -gt 5 ]; then
> -        gcc_version=5
> -    fi
> +if [ ${gcc_version%%.*} -gt 5 ]; then
> +gcc_version=5
> +fi
>
>  case $gcc_version in
>  4.6*|4.7*|4.8*|4.9*|5*)
> @@ -152,10 +152,9 @@ case `uname` in
>  ;;
>
>  GCC* | gcc*)
> -            set_cross_compile
> -        CROSS_COMPILE="$TEMP_CROSS_COMPILE"
> -            export TARGET_TOOLS=`get_gcc_version "$CROSS_COMPILE"gcc`
> -
> +set_cross_compile
> +CROSS_COMPILE="$TEMP_CROSS_COMPILE"
> +export TARGET_TOOLS=`get_gcc_version
> "$CROSS_COMPILE"gcc`
>  ;;
>
>  *)
> @@ -224,7 +223,7 @@ then
>    status=$?
>    if test $status -ne 0
>    then
> -  echo Error while building EDK tools
> +    echo Error while building EDK tools
>      exit -1
>    fi
>  else
> @@ -239,7 +238,7 @@ make -C SctPkg/Tools/Source/GenBin  status=$?
>  if test $status -ne 0
>  then
> -echo Error while building GenBin
> +  echo Error while building GenBin
>    exit -1
>  fi
>
> @@ -258,8 +257,8 @@ build -p SctPkg/UEFI/UEFI_SCT.dsc -a
> $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_B  status=$?
>  if test $status -ne 0
>  then
> -echo Could not build the UEFI SCT package
> -        exit -1
> +  echo Could not build the UEFI SCT package  exit -1
>  fi
>
>  build -p SctPkg/UEFI/IHV_SCT.dsc -a $SCT_TARGET_ARCH -t
> $TARGET_TOOLS -b $SCT_BUILD $3 $4 $5 $6 $7 $8 $9
> @@ -268,8 +267,8 @@ build -p SctPkg/UEFI/IHV_SCT.dsc -a
> $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_BU
>  status=$?
>  if test $status -ne 0
>  then
> -echo Could not build the IHV SCT package
> -        exit -1
> +  echo Could not build the IHV SCT package
> +  exit -1
>  fi
>
>
> @@ -299,8 +298,8 @@ pwd
>  status=$?
>  if test $status -ne 0
>  then
> -echo Could not generate UEFI SCT binary
> -     exit -1
> +  echo Could not generate UEFI SCT binary
> +  exit -1
>  else
>  echo The SCT binary "SctPackage${SCT_TARGET_ARCH}" is located at
> "$EFI_SOURCE/Build/UefiSct/${SCT_BUILD}_${TARGET_TOOLS}"
>  fi
> @@ -315,8 +314,8 @@ pwd
>  status=$?
>  if test $status -ne 0
>  then
> -echo Could not generate IHV SCT binary
> -     exit -1
> +  echo Could not generate IHV SCT binary
> +  exit -1
>  else
>  echo The IHV binary "SctPackage${SCT_TARGET_ARCH}" is located at
> "$EFI_SOURCE/Build/IhvSct/${SCT_BUILD}_${TARGET_TOOLS}"
>  fi
> --
> 2.26.2
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#65579): https://edk2.groups.io/g/devel/message/65579
> Mute This Topic: https://groups.io/mt/77067562/1945644
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [samer.el-haj-
> mahmoud@arm.com]
> -=-=-=-=-=-=
>

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.