InOsEmuPkg: Make sure to skip DXE IPL on emulator build, and don't double build every...

Signed-off-by: andrewfish
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11868 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/InOsEmuPkg/Unix/UnixX64.dsc b/InOsEmuPkg/Unix/UnixX64.dsc
index 995e0e53f09af7de370f82f428e24ef416702410..4012acfdebdd951c4d8fdce460bdf3e6d074609b 100644 (file)
--- a/InOsEmuPkg/Unix/UnixX64.dsc
+++ b/InOsEmuPkg/Unix/UnixX64.dsc
@@ -274,12 +274,14 @@
 #\r
 ###################################################################################################\r
 \r
+!ifndef $(SKIP_MAIN_BUILD)\r
 [Components.X64]\r
   MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {\r
     <LibraryClasses>\r
       # turn off CR3 write so that DXE IPL will not crash emulator\r
       BaseLib|UnixPkg/Library/UnixBaseLib/UnixBaseLib.inf\r
   }\r
+!endif\r
 \r
 [Components.IA32]\r
   MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf \r

diff --git a/InOsEmuPkg/Unix/build.sh b/InOsEmuPkg/Unix/build.sh
index 4e2add8b35d83107191ce23f9ac17c775181051c..24440de48e82faabd84a22055a3f282358c1d6fb 100755 (executable)
--- a/InOsEmuPkg/Unix/build.sh
+++ b/InOsEmuPkg/Unix/build.sh
@@ -121,7 +121,7 @@ done
 #
 echo $PATH
 echo `which build`
-build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc      -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -D BUILD_32 -n 3 $1 $2 $3 $4 $5 $6 $7 $8  modules
+build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc      -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -D BUILD_32 -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8  modules
 build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc      -a IA32 -t  $UNIXPKG_TOOLS -D BUILD_32 $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
 cp $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$TARGET_TOOLS"/IA32/SecMain $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$UNIXPKG_TOOLS"/IA32
 exit $?