InOsEmuPkg/Unix: Allow binary UEFI shell to be used

When using InOsEmuPkg/Unix/build64.sh -D USE_NEW_SHELL,
the UEFI shell binary will now be included in the firmware
image.

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

diff --git a/InOsEmuPkg/Unix/UnixX64.fdf b/InOsEmuPkg/Unix/UnixX64.fdf
index b0b64d4ec31fb24ced0dfb211bc875be6faa4dd5..4ded05fc6a732fb5b0f9a91d9ab235eeb8bfb17e 100644 (file)
--- a/InOsEmuPkg/Unix/UnixX64.fdf
+++ b/InOsEmuPkg/Unix/UnixX64.fdf
@@ -260,8 +260,12 @@ INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf
 !if $(BUILD_NEW_SHELL)\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
 !else\r
+!if $(USE_NEW_SHELL)\r
+INF  RuleOverride = BINARY ShellBinPkg/UefiShell/UefiShell.inf\r
+!else\r
 INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
 !endif\r
+!endif\r
 \r
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
   SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r