Changes to bash-isms for debian sh/dash config

Change-Id: Ia8825ed33610f11d75756e6e1abcdd9a23336d09
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12155
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 16 insertions, 10 deletions

diff --git a/src/build/mkrules/images.rules.mk b/src/build/mkrules/images.rules.mk
index f17d16939..d21dc8551 100644
--- a/src/build/mkrules/images.rules.mk
+++ b/src/build/mkrules/images.rules.mk
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2013,2014
+# Contributors Listed Below - COPYRIGHT 2013,2014
+# [+] International Business Machines Corp.
+#
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,15 +49,17 @@ $(IMGDIR)/%.bin: $(IMGDIR)/%.elf \
     $(wildcard $(IMGDIR)/*.so) $(addprefix $(IMGDIR)/, $($*_DATA_MODULES)) \
     $(CUSTOM_LINKER_EXE)
 	$(C2) "    LINKER     $(notdir $@)"
-	$(C1)set -o pipefail && $(CUSTOM_LINKER) $@ $< \
+	$(eval TMPFILE = $(shell mktemp))
+	$(C1)$(CUSTOM_LINKER) $@ $< \
               $(addprefix $(IMGDIR)/lib, $(addsuffix .so, $($*_MODULES))) \
 	      $(if $($*_EXTENDED_MODULES), \
                   --extended=0x40000 $(IMGDIR)/$*_extended.bin \
                   $(addprefix $(IMGDIR)/lib, \
 	              $(addsuffix .so, $($*_EXTENDED_MODULES))) \
 	      ) \
-              $(addprefix $(IMGDIR)/, $($*_DATA_MODULES)) \
-              | bzip2 -zc > $(IMGDIR)/.$*.lnkout.bz2
+              $(addprefix $(IMGDIR)/, $($*_DATA_MODULES)) > $(TMPFILE) && \
+              bzip2 -zc > $(IMGDIR)/.$*.lnkout.bz2 < $(TMPFILE)
+	rm $(TMPFILE)
 	$(C1)$(ROOTPATH)/src/build/tools/addimgid $@ $<
 
 $(IMGDIR)/%.list.bz2 $(IMGDIR)/%.syms: $(IMGDIR)/%.bin
diff --git a/src/build/vpo/VBU_Cacheline.pm b/src/build/vpo/VBU_Cacheline.pm
index 9adf3612e..c3f26aa99 100644
--- a/src/build/vpo/VBU_Cacheline.pm
+++ b/src/build/vpo/VBU_Cacheline.pm
@@ -6,7 +6,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2011,2014
+# Contributors Listed Below - COPYRIGHT 2011,2014
+# [+] International Business Machines Corp.
+#
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -124,10 +126,10 @@ my  $RUNCLKSCMD =   "simclock";
 #   "proc_thread_control: Thread Start failed: RAS Status Run bit is not on"
 # Temporary workaround is using only one thread as shown below.
 # Lance Karm is still investigating.
-my  $QUERYCMD   =   "sh -c \"$vbuProcsRoot/proc_thread_control_wrap.x86 -query  $CORE -tall -quiet | sed -n -e '/State/s/ *//gp'\"";
-my  $STARTCMD   =   "sh -c \"$vbuProcsRoot/proc_thread_control_wrap.x86 -start  $CORE -tall -quiet -warncheck \| sed -e '/ Using deprecated ReturnCode function to assign integer/d'\"";
-my  $STARTCMD_T0   =   "sh -c \"$vbuProcsRoot/proc_thread_control_wrap.x86 -start  $CORE -t0 -quiet -warncheck \| sed -e '/ Using deprecated ReturnCode function to assign integer/d'\"";
-my  $STOPCMD    =   "sh -c \"$vbuProcsRoot/proc_thread_control_wrap.x86 -stop   $CORE -tall -quiet \| sed -e '/ Using deprecated ReturnCode function to assign integer/d'\"";
+my  $QUERYCMD   =   "bash -c \"$vbuProcsRoot/proc_thread_control_wrap.x86 -query  $CORE -tall -quiet | sed -n -e '/State/s/ *//gp'\"";
+my  $STARTCMD   =   "bash -c \"$vbuProcsRoot/proc_thread_control_wrap.x86 -start  $CORE -tall -quiet -warncheck \| sed -e '/ Using deprecated ReturnCode function to assign integer/d'\"";
+my  $STARTCMD_T0   =   "bash -c \"$vbuProcsRoot/proc_thread_control_wrap.x86 -start  $CORE -t0 -quiet -warncheck \| sed -e '/ Using deprecated ReturnCode function to assign integer/d'\"";
+my  $STOPCMD    =   "bash -c \"$vbuProcsRoot/proc_thread_control_wrap.x86 -stop   $CORE -tall -quiet \| sed -e '/ Using deprecated ReturnCode function to assign integer/d'\"";
 my  $RESETCMD   =   "$vbuProcsRoot/proc_thread_control_wrap.x86 -sreset $CORE -tall -quiet";
 
 ##
@@ -151,7 +153,7 @@ sub readcacheline( $ )
 
     $cmd    =   "$GETMEMCMD $hexaddr 1 -f $CLfile -binmode -quiet $CORE";
     if ( $CLdebug )   {   print STDERR __LINE__,  "-- run $cmd ...\n";   }
-    ( system( "sh -c \"$cmd  \| sed -e '/ Using deprecated ReturnCode function to assign integer/d'\"" ) == 0)
+    ( system( "bash -c \"$cmd  \| sed -e '/ Using deprecated ReturnCode function to assign integer/d'\"" ) == 0)
         or die "$cmd failed $? : $! \n";
 
 }