Imported Upstream version 3.1.52-dfsgupstream/3.1.52-dfsg

1 files changed, 51 insertions, 46 deletions

diff --git a/Makefile.kmk b/Makefile.kmk
index c208c1367..e64c20e86 100644
--- a/Makefile.kmk
+++ b/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+# $Id: Makefile.kmk 29079 2010-05-05 13:19:35Z vboxsync $
 ## @file
 # Top level makefile.
 #
@@ -49,7 +49,7 @@ OTHER_CLEAN += \
 	$(PATH_OUT)/GCCConfig.kmk
 
 
-if !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_TESTSUITE) && !defined(VBOX_ONLY_DOCS) # -> line 400
+if !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_TESTSUITE) && !defined(VBOX_ONLY_DOCS) # -> line 412b ;-)
 
 ifndef VBOX_OSE
  #
@@ -317,62 +317,67 @@ buildserver-documentation-affinity-hack:
 endif # VBOX_WITH_DOCS_FROM_BUILD_SERVER
 
 
-#
-# Install EFI firmware image
-#
-ifdef VBOX_WITH_EFIFW_FROM_BUILD_SERVER
-#
-# Either from the build server.
-#
-INSTALLS += buildserver-efifw
-buildserver-efifw_INST = $(INST_BIN)
-buildserver-efifw_MODE = 0644
-buildserver-efifw_SOURCES = \
-	$(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd=>VBoxEFI32.fd \
-        $(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd=>VBoxEFI64.fd
-buildserver-efifw_CLEANS = \
-	$(buildserver-efifw_0_OUTDIR)/unpacked.ts \
-	$(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd \
-        $(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd \
-	$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip \
-	$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip.tmp
-## @todo rainy day: cleanup the output directory (zip contains lots more)
-
-## @todo Hack to get at TOOL_ZIP_UNPACK; see if this can be integrated somehow...
-include $(KBUILD_PATH)/tools/ZIP.kmk
-
-$$(buildserver-efifw_0_OUTDIR)/unpacked.ts +| $$(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd \
- $$(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd: $$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip
+ ifdef VBOX_WITH_EFI
+  #
+  # Install EFI firmware image
+  #
+  ifdef VBOX_WITH_EFIFW_FROM_BUILD_SERVER
+   #
+   # Either from the build server.
+   #
+   INSTALLS += buildserver-efifw
+   buildserver-efifw_INST = $(INST_BIN)
+   buildserver-efifw_MODE = 0644
+   buildserver-efifw_SOURCES = \
+   	$(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd=>VBoxEFI32.fd \
+           $(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd=>VBoxEFI64.fd
+   buildserver-efifw_CLEANS = \
+   	$(buildserver-efifw_0_OUTDIR)/unpacked.ts \
+   	$(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd \
+           $(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd \
+   	$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip \
+   	$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip.tmp
+   ## @todo rainy day: cleanup the output directory (zip contains lots more)
+
+   ## @todo Hack to get at TOOL_ZIP_UNPACK; see if this can be integrated somehow...
+   include $(KBUILD_PATH)/tools/ZIP.kmk
+
+   $$(buildserver-efifw_0_OUTDIR)/unpacked.ts \
+   +| $$(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd \
+      $$(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd: \
+   		$$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip
 	$(call MSG_L1,Unpacking EFI firmware)
 	$(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(buildserver-efifw_0_OUTDIR)
 	$(APPEND) -t $@ "done"
 
-$$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip: $(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/efi_firmware.sh | $$(dir $$@)
+   $$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip: \
+		$(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/efi_firmware.sh | $$(dir $$@)
 	$(RM) -f $@ $@.tmp
- ifneq ($(KBUILD_HOST),win)
+   ifneq ($(KBUILD_HOST),win)
 	$(SHELL) $(PATH_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename $@.tmp
- else
+   else
 	$(KMK) --affinity 1 -f $(MAKEFILE) VBOX_SINGLE_MAKEFILE= buildserver-efifw-affinity-hack
- endif
+   endif
 	$(CP) -f $@.tmp $@
 	$(RM) -f $@.tmp
 ## @todo kBuild: The $(CP)/$(RM) stuff can be replaced by a simple $(TOUCH) once that has been added to kBuild.
 
- ifeq ($(KBUILD_HOST),win)
-buildserver-efifw-affinity-hack:
+   ifeq ($(KBUILD_HOST),win)
+    buildserver-efifw-affinity-hack:
 	$(SHELL) $(PATH_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename $(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip.tmp
- endif
-else
-#
-# Or from the local copy
-#
-INSTALLS += local-efifw
-local-efifw_INST = $(INST_BIN)
-local-efifw_MODE = 0644
-local-efifw_SOURCES = \
-	$(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd=>VBoxEFI32.fd \
-        $(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd=>VBoxEFI64.fd
-endif # VBOX_WITH_EFIFW_FROM_BUILD_SERVER
+   endif
+  else # !VBOX_WITH_EFIFW_FROM_BUILD_SERVER
+   #
+   # Or from the local copy
+   #
+   INSTALLS += local-efifw
+   local-efifw_INST = $(INST_BIN)
+   local-efifw_MODE = 0644
+   local-efifw_SOURCES = \
+   	$(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd=>VBoxEFI32.fd \
+   	$(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd=>VBoxEFI64.fd
+  endif # !VBOX_WITH_EFIFW_FROM_BUILD_SERVER
+ endif # VBOX_WITH_EFI
 
 
 #