From 2dcef689963d9f975b0d792e677c2d43cf3cc995 Mon Sep 17 00:00:00 2001
From: jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Sat, 5 Mar 2011 08:08:23 +0000
Subject: [PATCH] UnixPkg: Use build flag to prevent FatPkg from being required

In the default case we use FatBinPkg from the edk2 tree.
"-D COMPILE_BINS" can be used on the command line if FatPkg
is present and needs to be built.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11345 6f19259b-4bc3-4df7-8a09-765794883524
---
 UnixPkg/UnixPkg.dsc    | 4 +++-
 UnixPkg/UnixPkg.fdf    | 5 ++++-
 UnixPkg/UnixPkgX64.dsc | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc
index 7673a30730..76e0e9898a 100644
--- a/UnixPkg/UnixPkg.dsc
+++ b/UnixPkg/UnixPkg.dsc
@@ -327,5 +327,7 @@
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
   }
 
-  #FatPkg/EnhancedFatDxe/Fat.inf
+!if $(COMPILE_BINS)
+  FatPkg/EnhancedFatDxe/Fat.inf
+!endif
 
diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index 22c134f9a0..9548541442 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -247,8 +247,11 @@ INF  UnixPkg/UnixSnpDxe/UnixSnpDxe.inf
 #
 # Build from source or use checked in binary
 #
-#INF FatPkg/EnhancedFatDxe/Fat.inf
+!if $(COMPILE_BINS)
+INF FatPkg/EnhancedFatDxe/Fat.inf
+!else
 INF  RuleOverride = BINARY USE = IA32 FatBinPkg/EnhancedFatDxe/Fat.inf
+!endif
 
 # If  you build GccShellPkg you can source level debug shell
 #FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
diff --git a/UnixPkg/UnixPkgX64.dsc b/UnixPkg/UnixPkgX64.dsc
index 95a78773c7..2ff5b9d534 100644
--- a/UnixPkg/UnixPkgX64.dsc
+++ b/UnixPkg/UnixPkgX64.dsc
@@ -328,5 +328,7 @@
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
   }
 
+!if $(COMPILE_BINS)
   FatPkg/EnhancedFatDxe/Fat.inf
+!endif
 !endif