• Subject: [edk2] [Patch][edk2-platforms] Change GCC build script.
  • Author: lushifex
  • Date: July 12, 2017, 5 a.m.
  • Patches: 1 / 1
Changeset
Vlv2TbltDevicePkg/Build_IFWI.sh | 7 +++++--
Vlv2TbltDevicePkg/bld_vlv.sh    | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
Git apply log
Switched to a new branch 'b9c71d95-ffcc-436d-b265-6fc04527b3b8@SHWDEOPENPSI011.local'
Applying: Change GCC build script.
fatal: sha1 information is lacking or useless (Vlv2TbltDevicePkg/Build_IFWI.sh).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Change GCC build script.
The copy of the patch that failed is found in:
   /var/tmp/tmpsvvfzyrv/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Failed to apply patch:
[edk2] [Patch][edk2-platforms] Change GCC build script.
[edk2] [Patch][edk2-platforms] Change GCC build script.
Posted by lushifex, 10 weeks ago
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a.lu@intel.com>
---
 Vlv2TbltDevicePkg/Build_IFWI.sh | 7 +++++--
 Vlv2TbltDevicePkg/bld_vlv.sh    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Vlv2TbltDevicePkg/Build_IFWI.sh b/Vlv2TbltDevicePkg/Build_IFWI.sh
index 4a11a1c..0f7e155 100755
--- a/Vlv2TbltDevicePkg/Build_IFWI.sh
+++ b/Vlv2TbltDevicePkg/Build_IFWI.sh
@@ -6,7 +6,7 @@ function Usage ( ) {
   echo
   echo "Script to build BIOS firmware and stitch the entire IFWI."
   echo
-  echo "Usage: Build_IFWI.bat [options]  PlatformType  BuildTarget  "
+  echo "Usage: Build_IFWI.sh [options]  PlatformType  BuildTarget  "
   echo
   echo 
   echo "       /yL [option]  :   Enable SPI lock"
@@ -15,7 +15,8 @@ function Usage ( ) {
   echo
   echo "       See  Stitch/Stitch_Config.txt  for additional stitching settings."
   echo
-  echo
+  echo "Press any key......"
+  read
   exit 0
 }
 
@@ -71,6 +72,8 @@ for (( i=1; i<=$#; ))
 
 ## Require 2 input parameters
 if [ "$2" == "" ]; then
+  echo "Not Enough Arguments Provided"
+  echo "Please review the Help screen"
   Usage
 fi
 
diff --git a/Vlv2TbltDevicePkg/bld_vlv.sh b/Vlv2TbltDevicePkg/bld_vlv.sh
index 538b3ef..cba30c6 100755
--- a/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -7,7 +7,7 @@ function Usage() {
   echo "***************************************************************************"
   echo "Build BIOS rom for VLV platforms."
   echo
-  echo "Usage: bld_vlv.bat  PlatformType [Build Target]"
+  echo "Usage: bld_vlv.sh  PlatformType [Build Target]"
   echo
   echo
   echo "       Platform Types:  MNW2"
-- 
2.7.0.windows.1


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel