[edk2] [Patch] BaseTools: remove the hardcoded /bin/bash for PreBuild/PostBuild

Yonghong Zhu posted 1 patch 6 years, 10 months ago
Failed in applying to current master (apply log)
BaseTools/Source/Python/build/build.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[edk2] [Patch] BaseTools: remove the hardcoded /bin/bash for PreBuild/PostBuild
Posted by Yonghong Zhu 6 years, 10 months ago
This patch remove the hardcoded /bin/bash for PreBuild/PostBuild
scripts.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/build/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 45ccac1..bd14e27 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -1037,11 +1037,11 @@ class Build():
             if sys.platform == "win32":
                 args = ' && '.join((self.Prebuild, 'set > ' + PrebuildEnvFile))
                 Process = Popen(args, stdout=PIPE, stderr=PIPE)
             else:
                 args = ' && '.join((self.Prebuild, 'env > ' + PrebuildEnvFile))
-                Process = Popen(args, stdout=PIPE, stderr=PIPE, shell=True, executable="/bin/bash")
+                Process = Popen(args, stdout=PIPE, stderr=PIPE, shell=True)
 
             # launch two threads to read the STDOUT and STDERR
             EndOfProcedure = Event()
             EndOfProcedure.clear()
             if Process.stdout:
@@ -1079,11 +1079,11 @@ class Build():
         if self.Postbuild:
             EdkLogger.info("\n- Postbuild Start -\n")
             if sys.platform == "win32":
                 Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE)
             else:
-                Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE, shell=True, executable="/bin/bash")
+                Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE, shell=True)
             # launch two threads to read the STDOUT and STDERR
             EndOfProcedure = Event()
             EndOfProcedure.clear()
             if Process.stdout:
                 StdOutThread = Thread(target=ReadMessage, args=(Process.stdout, EdkLogger.info, EndOfProcedure))
-- 
2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] BaseTools: remove the hardcoded /bin/bash for PreBuild/PostBuild
Posted by Gao, Liming 6 years, 10 months ago
Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Yonghong Zhu
>Sent: Wednesday, May 03, 2017 5:21 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>
>Subject: [edk2] [Patch] BaseTools: remove the hardcoded /bin/bash for
>PreBuild/PostBuild
>
>This patch remove the hardcoded /bin/bash for PreBuild/PostBuild
>scripts.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/build/build.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/BaseTools/Source/Python/build/build.py
>b/BaseTools/Source/Python/build/build.py
>index 45ccac1..bd14e27 100644
>--- a/BaseTools/Source/Python/build/build.py
>+++ b/BaseTools/Source/Python/build/build.py
>@@ -1037,11 +1037,11 @@ class Build():
>             if sys.platform == "win32":
>                 args = ' && '.join((self.Prebuild, 'set > ' + PrebuildEnvFile))
>                 Process = Popen(args, stdout=PIPE, stderr=PIPE)
>             else:
>                 args = ' && '.join((self.Prebuild, 'env > ' + PrebuildEnvFile))
>-                Process = Popen(args, stdout=PIPE, stderr=PIPE, shell=True,
>executable="/bin/bash")
>+                Process = Popen(args, stdout=PIPE, stderr=PIPE, shell=True)
>
>             # launch two threads to read the STDOUT and STDERR
>             EndOfProcedure = Event()
>             EndOfProcedure.clear()
>             if Process.stdout:
>@@ -1079,11 +1079,11 @@ class Build():
>         if self.Postbuild:
>             EdkLogger.info("\n- Postbuild Start -\n")
>             if sys.platform == "win32":
>                 Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE)
>             else:
>-                Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE, shell=True,
>executable="/bin/bash")
>+                Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE,
>shell=True)
>             # launch two threads to read the STDOUT and STDERR
>             EndOfProcedure = Event()
>             EndOfProcedure.clear()
>             if Process.stdout:
>                 StdOutThread = Thread(target=ReadMessage, args=(Process.stdout,
>EdkLogger.info, EndOfProcedure))
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel