path: root/libre/virtualbox-libre/libre.patch

--- VirtualBox-4.2.0.orig/Config.kmk	2012-09-13 05:26:16.000000000 -0300
+++ VirtualBox-4.2.0/Config.kmk		2012-09-18 21:35:33.118487052 -0300
@@ -56,9 +56,6 @@
 PROPS_SYSMODS_ACCUMULATE_L   += INTERMEDIATES
 PROPS_MISCBINS_ACCUMULATE_L  += INTERMEDIATES
 
-# Misc names used bye the install paths below.
-VBOX_PUEL_MANGLED_NAME := Oracle_VM_VirtualBox_Extension_Pack
-
 # Install paths
 ## @todo This will change after 4.1 is branched off!
 # What is now 'bin' and 'lib' will be moved down under 'staged/', except on
@@ -129,9 +126,6 @@
 endif
 
 INST_DOC              = doc/
-INST_EXTPACK          = $(INST_BIN)ExtensionPacks/
-INST_EXTPACK_CERTS    = $(INST_BIN)ExtPackCertificates/
-INST_EXTPACK_PUEL     = $(INST_EXTPACK)$(VBOX_PUEL_MANGLED_NAME)/
 INST_PACKAGES         = packages/
 
 VBOX_PATH_SDK         = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK))
@@ -140,7 +134,6 @@
 VBOX_PATH_ADDITIONS   = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS))
 VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))
 VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB))
-VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL))
 VBOX_PATH_PACKAGES    = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES))
 
 
@@ -215,7 +208,6 @@
  export VBOX_ADDITIONS_SH_MODE     = release
  export VBOX_DOCUMENTATION_SH_MODE = release
  export VBOX_EFI_SH_MODE           = release
- export VBOX_EXTPACKS_SH_MODE      = release
 endif
 
 # Some info on the vendor
@@ -368,8 +360,6 @@
 VBOX_WITH_USB = 1
 # Enable the USB 1.1 controller plus virtual USB HID devices.
 VBOX_WITH_VUSB = 1
-# Enable the USB 2.0 controller.
-VBOX_WITH_EHCI = 1
 # Enable the ISCSI feature.
 VBOX_WITH_ISCSI = 1
 # Enable INIP support in the ISCSI feature.
@@ -439,9 +429,6 @@
 ifdef VBOX_WITH_USB
  VBOX_WITH_VUSB = 1
 endif
-ifdef VBOX_WITH_EHCI
- VBOX_WITH_EHCI_IMPL = 1
-endif
 ifdef VBOX_WITH_PCI_PASSTHROUGH
  VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
 endif
@@ -609,17 +596,6 @@
 endif
 ## @}
 
-
-## @name Extension pack
-## @{
-# Enables the extension pack feature.
-VBOX_WITH_EXTPACK = 1
-# Enables separating code into the Oracle VM VirtualBox Extension Pack, dubbed PUEL.
-VBOX_WITH_EXTPACK_PUEL = 1
-# Enables building+packing the Oracle VM VirtualBox Extension Pack, includes VBOX_WITH_EXTPACK_PUEL
-VBOX_WITH_EXTPACK_PUEL_BUILD = 1
-## @}
-
 ## @name Misc
 ## @{
 # Enable Seamless mode
@@ -810,14 +786,6 @@
 # Skip stuff.
 #
 
-ifdef VBOX_ONLY_EXTPACKS
- # Clear some VBOX_WITH_XXX variables instead of adding ifdefs all over the place.
- VBOX_WITH_DEBUGGER =
- VBOX_WITH_ADDITIONS =
- VBOX_WITH_VBOXDRV =
- VBOX_WITH_TESTCASES =
-endif
-
 # VBOX_QUICK can be used by core developers to speed to the build
 ifdef VBOX_QUICK
  # undefine variables by assigning blank.
@@ -872,7 +840,6 @@
  VBOX_WITH_TESTSUITE=
  VBOX_WITH_QTGUI=
  VBOX_WITH_USB=
- VBOX_WITH_EHCI=
  VBOX_WITH_DOCS=
  VBOX_WITH_PDM_ASYNC_COMPLETION=
  VBOX_WITH_KCHMVIEWER=
@@ -894,7 +861,6 @@
  VBOX_WITH_CROGL=
  VBOX_WITH_DEBUGGER=
  VBOX_WITH_DOCS=
- VBOX_WITH_EHCI=
  VBOX_WITH_HARDENING=
  VBOX_WITH_HEADLESS=
  VBOX_WITH_HGCM=
@@ -985,9 +951,6 @@
 #
 ifdef VBOX_OSE
  VBOX_WITH_VRDP=
- VBOX_WITH_EHCI_IMPL=
- VBOX_WITH_EXTPACK_PUEL=
- VBOX_WITH_EXTPACK_PUEL_BUILD=
  VBOX_WITH_PCI_PASSTHROUGH_IMPL=
  VBOX_WITH_OS2_ADDITIONS_BIN=
  VBOX_WITH_SECURELABEL=
@@ -1118,10 +1081,6 @@
  VBOX_WITH_KCHMVIEWER=
 endif
 
-ifdef VBOX_WITH_EXTPACK_PUEL_BUILD
- VBOX_WITH_EXTPACK_PUEL = 1
-endif
-
 #
 # Mark OSE builds clearly, helps figuring out limitations more easily.
 #
@@ -1744,9 +1703,6 @@
 # bin2c (convert binary files into C arrays)
 VBOX_BIN2C      ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
 
-# RTManifest (extension pack manifest utility)
-VBOX_RTMANIFEST ?= $(PATH_OBJ)/bldRTManifest/bldRTManifest$(HOSTSUFF_EXE)
-
 # VBoxCmp (simple /bin/cmp with more sensible output)
 VBOX_VBOXCMP    ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE)
 
@@ -2638,13 +2594,6 @@
  SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)
 endif
 
-SDK_VBoxOpenSslExtPack                 = Internal use only.
-SDK_VBoxOpenSslExtPack_INCS            = $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
-SDK_VBoxOpenSslExtPack_ORDERDEPS       = $(crypto-headers_1_TARGET)
-SDK_VBoxOpenSslExtPack_LIBS    = \
-	$(PATH_STAGE_LIB)/VBoxExtPack-libssl$(VBOX_SUFF_LIB) \
-	$(PATH_STAGE_LIB)/VBoxExtPack-libcrypto$(VBOX_SUFF_LIB)
-
 SDK_VBOX_BLD_OPENSSL      = .
 SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
 SDK_VBOX_BLD_OPENSSL_LIBS ?= \
@@ -4100,99 +4049,6 @@
 TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
 
 
-
-#
-# Templates used for building the extension packs.
-#
-ifdef VBOX_WITH_EXTPACK
- # Base templates (native or portable).
- TEMPLATE_VBoxR3ExtPack = For the ring-3 context extension pack modules.
- if 1 # Native for now.
-  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXR3DLLNOXCPT
-  TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXR3DLLNOXCPT_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3
- else
-  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXNOCRTGCC
-  TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXNOCRTGCC_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3 IPRT_NO_CRT IN_RING3
-  TEMPLATE_VBoxR3ExtPack_INCS = $(PATH_ROOT)/include/iprt/nocrt $(TEMPLATE_VBOXR3DLLNOXCPT_INCS)
- endif
- ifneq ($(KBUILD_TARGET),win)
-  TEMPLATE_VBoxR3ExtPack_CXXFLAGS = $(TEMPLATE_VBOXR3DLLNOXCPT_CXXFLAGS) -fno-rtti
- endif
- TEMPLATE_VBoxR3ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
- ifeq ($(KBUILD_TARGET),linux)
-  TEMPLATE_VBoxR3ExtPack_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
- else
-  if !defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
-   TEMPLATE_VBoxR3ExtPack_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
-  endif
- endif
- ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
-  if1of ($(KBUILD_TARGET), win os2)
-   TEMPLATE_VBoxR3ExtPack_LIBS = \
-   	$(TEMPLATE_LIBS_VBOXR3) \
-   	$(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_LIB) \
-   	$(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_LIB)
-  else
-   TEMPLATE_VBoxR3ExtPack_LIBS = \
-   	$(TEMPLATE_LIBS_VBOXR3) \
-   	$(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_DLL) \
-   	$(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_DLL)
-  endif
- else
-  TEMPLATE_VBoxR3ExtPack_LIBS = \
-  	$(TEMPLATE_LIBS_VBOXR3) \
-  	$(LIB_RUNTIME) \
-  	$(LIB_VMM)
- endif
-
- TEMPLATE_VBoxR0ExtPack = For the ring-0 context extension pack modules.
- TEMPLATE_VBoxR0ExtPack_EXTENDS = VBoxR0
- TEMPLATE_VBoxR0ExtPack_EXTENDS_BY = appending
- TEMPLATE_VBoxR0ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
- TEMPLATE_VBoxR0ExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R0
- if1of ($(VBOX_LDR_FMT), pe lx)
-  TEMPLATE_VBoxR0ExtPack_LIBS = \
-	$(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
-	$(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
- endif
-
- TEMPLATE_VBoxRcExtPack = For the raw-mode context extension pack modules.
- TEMPLATE_VBoxRcExtPack_EXTENDS = VBoxRc
- TEMPLATE_VBoxRcExtPack_EXTENDS_BY = appending
- TEMPLATE_VBoxRcExtPack_SYSSUFF = .rc
- TEMPLATE_VBoxRcExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
- TEMPLATE_VBoxRcExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_RC
- if1of ($(VBOX_LDR_FMT32), pe lx)
-  TEMPLATE_VBoxRcExtPack_LIBS = \
-	$(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
-	$(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
- endif
-
- TEMPLATE_VBoxInsExtPack = For the install targets of an extension pack.
- TEMPLATE_VBoxInsExtPack_MODE = 0644
- TEMPLATE_VBoxInsExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
-
- # For each individual extension pack
- ifdef VBOX_WITH_EXTPACK_PUEL
-  TEMPLATE_VBoxR3ExtPackPuel = For the ring-3 context modules in the PUEL extension pack.
-  TEMPLATE_VBoxR3ExtPackPuel_EXTENDS = VBoxR3ExtPack
-  TEMPLATE_VBoxR3ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
-
-  TEMPLATE_VBoxR0ExtPackPuel = For the ring-0 context modules in the PUEL extension pack.
-  TEMPLATE_VBoxR0ExtPackPuel_EXTENDS = VBoxR0ExtPack
-  TEMPLATE_VBoxR0ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
-
-  TEMPLATE_VBoxRcExtPackPuel = For the raw-mode context modules in the PUEL extension pack.
-  TEMPLATE_VBoxRcExtPackPuel_EXTENDS = VBoxRcExtPack
-  TEMPLATE_VBoxRcExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
-
-  TEMPLATE_VBoxInsExtPackPuel = For the install targets of an extension pack.
-  TEMPLATE_VBoxInsExtPackPuel_EXTENDS = VBoxR0ExtPack
-  TEMPLATE_VBoxInsExtPackPuel_INST = $(INST_EXTPACK_PUEL)
-endif
-endif # VBOX_WITH_EXTPACK
-
-
 #
 # Qt 4
 # Qt 4
--- VirtualBox-4.2.0.orig/Makefile.kmk	2012-08-29 11:13:46.000000000 -0300
+++ VirtualBox-4.2.0/Makefile.kmk	2012-09-18 23:43:54.750454776 -0300
@@ -378,7 +378,6 @@
 	include/VBox \
 	include/VBox/vmm \
 	include/VBox/com \
-	include/VBox/ExtPack \
 	include/VBox/HostServices \
 	include/VBox/GuestHost \
 	include/VBox/HGSMI \
@@ -990,200 +989,6 @@
 
 
 #
-# Build the extension packs, all of them.
-#
-# This is tailored (hardcoded) for the extension pack build box.
-#
-# The fetching must be done in serial fashion, while the building should be
-# more flexible wrt to -jN.
-#
-extpacks-fetch:
-	+ $(KMK) -C tools fetch VBOX_ONLY_EXTPACKS=1
-	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=amd64 BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
-	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=x86   BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
-#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
-#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=x86   BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
-	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux   BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
-	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=linux   BUILD_TARGET_ARCH=x86   BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
-#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=os2     BUILD_TARGET_ARCH=x86   BUILD_TARGET=os2      VBOX_ONLY_EXTPACKS=1
-	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=amd64 BUILD_TARGET=solaris  VBOX_ONLY_EXTPACKS=1
-	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=solaris BUILD_TARGET_ARCH=x86   BUILD_TARGET=solaris  VBOX_ONLY_EXTPACKS=1
-	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win     BUILD_TARGET_ARCH=amd64 BUILD_TARGET=win	     VBOX_ONLY_EXTPACKS=1
-	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=win     BUILD_TARGET_ARCH=x86   BUILD_TARGET=win	     VBOX_ONLY_EXTPACKS=1
-
-
-extpacks-build: \
-	extpacks-build-win.amd64 \
-	extpacks-build-win.x86 \
-	extpacks-build-solaris.amd64 \
-	extpacks-build-solaris.x86 \
-	extpacks-build-os2.x86 \
-	extpacks-build-linux.amd64 \
-	extpacks-build-linux.x86 \
-	extpacks-build-darwin.amd64 \
-	extpacks-build-darwin.x86 \
-	extpacks-build-freebsd.amd64 \
-	extpacks-build-freebsd.x86
-
-VBOX_EXTPACKS_BUILD.amd64 = VBOX_ONLY_EXTPACKS=1 \
-	KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
-	KBUILD_TARGET_ARCH=amd64 BUILD_TARGET_ARCH=amd64 \
-	VBOX_SVN_REV=$(VBOX_SVN_REV)
-
-VBOX_EXTPACKS_BUILD.x86 = VBOX_ONLY_EXTPACKS=1 \
-	KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
-	KBUILD_TARGET_ARCH=x86 BUILD_TARGET_ARCH=x86 \
-	VBOX_SVN_REV=$(VBOX_SVN_REV)
-
-# Automatically determine the extpack build subdir name. Used for figuring out
-# directory names inside the extension pack building VMs.
-VBOX_EXTPACKS_BUILD_SUBDIRNAME := $(lastword $(subst /, ,$(PATH_ROOT)))
-
-# When building in parallel on a Windows host, make sure we finish the host
-# bit before kicking off any UNIX guest or we'll run into file sharing issues.
-ifeq ($(KBUILD_TARGET),win)
-VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST = extpacks-build-win.x86 extpacks-build-win.amd64
-else
-VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST =
-endif
-
-extpacks-build-win.amd64:
-ifeq ($(KBUILD_TARGET),win)
-	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-	$(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 extension packs)
-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
-	$(call VBOX_BLD_VM_MSG_END__,Windows/amd64 extension packs)
-endif
-
-extpacks-build-win.x86:
-ifeq ($(KBUILD_TARGET),win)
-	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-	$(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 extension packs)
-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all"
-	$(call VBOX_BLD_VM_MSG_END__,Windows/x86 extension packs)
-endif
-
-ifeq ($(KBUILD_TARGET),solaris)
-extpacks-build-solaris.amd64:
-	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-
-extpacks-build-solaris.x86: extpacks-build-solaris.amd64
-	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-
-else
-# Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
-extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
-
-extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
-	$(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 extension packs)
-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
-	$(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 extension packs)
-	$(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 extension packs)
-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
-	$(call VBOX_BLD_VM_MSG_END__,Solaris/x86 extension packs)
-
-extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
-	$(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
-	$(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
-
-.NOTPARALLEL: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm
-.PHONY:       extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it
-
-extpacks-build-solaris.amd64: extpacks-build-solaris.rsync-out-of-vm
-extpacks-build-solaris.x86: extpacks-build-solaris.rsync-out-of-vm
-endif
-
-extpacks-build-os2.x86:
-#ifeq ($(KBUILD_TARGET),os2)
-#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-#else
-#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_OS2_IP) " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "
-#endif
-
-extpacks-build-linux.amd64:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
-	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-	$(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs)
-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
-	$(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs)
-endif
-
-extpacks-build-linux.x86:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
-	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-	$(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs)
-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
-	$(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs)
-endif
-
-extpacks-build-freebsd.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
-#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-#else
-#	$(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/amd64 extension packs)
-#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
-#	$(call VBOX_BLD_VM_MSG_END__,FreeBSD/amd64 extension packs)
-#endif
-
-extpacks-build-freebsd.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86)
-#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-#else
-#	$(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/x86 extension packs)
-#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
-#	$(call VBOX_BLD_VM_MSG_END__,FreeBSD/x86 extension packs)
-#endif
-
-extpacks-build-darwin.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64)
-	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-	$(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 extension packs)
-	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
-	$(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
-	$(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 extension packs)
-endif
-
-extpacks-build-darwin.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
-	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-	$(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 extension packs)
-	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
-	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
-	$(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
-	$(call VBOX_BLD_VM_MSG_END__,Darwin/x86 extension packs)
-endif
-
-
-extpacks-packing:
-	+ $(KMK) VBOX_ONLY_EXTPACKS=1 \
-		VBOX_WITH_EXTPACK_OS_ARCHS="darwin.amd64 darwin.x86 linux.amd64 linux.x86 solaris.amd64 solaris.x86 win.amd64 win.x86" \
-		packing
-# +++ freebsd.amd64 freebsd.x86 os2.x86 ^^^
-
-.PHONY: \
-	extpacks-build-win.x86 \
-	extpacks-build-win.amd64 \
-	extpacks-build-solaris.amd64 \
-	extpacks-build-solaris.x86 \
-	extpacks-build-os2.x86 \
-	extpacks-build-linux.amd64 \
-	extpacks-build-linux.x86 \
-	extpacks-build-freebsd.amd64 \
-	extpacks-build-freebsd.x86 \
-	extpacks-build-darwin.amd64 \
-	extpacks-build-darwin.x86 \
-	extpacks-packing
-
-
-#
 # Build the test suite, all of it.
 #
 # This is currently tailored (hardcoded) for the additions build box just like
--- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.cpp		2012-06-20 10:15:51.000000000 -0300
+++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.cpp			2012-07-24 16:18:03.964493454 -0300
@@ -132,11 +132,6 @@
     if (RT_FAILURE(rc))
         return rc;
 #endif
-#ifdef VBOX_WITH_EHCI_IMPL
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEHCI);
-    if (RT_FAILURE(rc))
-        return rc;
-#endif
 #ifdef VBOX_ACPI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceACPI);
     if (RT_FAILURE(rc))
--- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.h		2012-06-20 10:15:51.000000000 -0300
+++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.h			2012-07-24 16:20:35.939205389 -0300
@@ -62,7 +62,6 @@
 extern const PDMDEVREG g_DeviceICH6_HDA;
 extern const PDMDEVREG g_DeviceAudioSniffer;
 extern const PDMDEVREG g_DeviceOHCI;
-extern const PDMDEVREG g_DeviceEHCI;
 extern const PDMDEVREG g_DeviceACPI;
 extern const PDMDEVREG g_DeviceDMA;
 extern const PDMDEVREG g_DeviceFloppyController;
--- VirtualBox-4.1.18.orig/include/Makefile.kmk		2012-06-20 10:07:49.000000000 -0300
+++ VirtualBox-4.1.18/include/Makefile.kmk		2012-07-24 21:11:57.007068865 -0300
@@ -51,7 +51,6 @@
 	VBox/vd-cache-plugin.h \
 	VBox/vmm/uvm.h \
 	VBox/vscsi.h \
-	$(wildcard VBox/ExtPack/*.h ) \
 	iprt/alloca.h \
 	iprt/tcp.h \
 	iprt/localipc.h \
--- VirtualBox-4.2.0.orig/src/Makefile.kmk	2012-08-03 09:28:25.000000000 -0300
+++ VirtualBox-4.2.0/src/Makefile.kmk		2012-09-19 03:01:57.588337894 -0300
@@ -23,10 +23,8 @@
 if !defined(VBOX_ONLY_ADDITIONS)
  include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
 endif
-if defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && defined(VBOX_WITH_REM)
- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
 
-else if !defined(VBOX_ONLY_BUILD)
+if !defined(VBOX_ONLY_BUILD)
  # Normal build.
  if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
   ifdef VBOX_WITH_REM
--- VirtualBox-4.2.0.orig/src/VBox/Makefile.kmk		2012-05-30 07:39:32.000000000 -0300
+++ VirtualBox-4.2.0/src/VBox/Makefile.kmk		2012-09-19 00:03:08.577726965 -0300
@@ -33,19 +33,6 @@
  include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
  include $(PATH_SUB_CURRENT)/Frontends/Makefile.kmk
 
-else ifdef VBOX_ONLY_EXTPACKS
- include $(PATH_SUB_CURRENT)/Runtime/Makefile.kmk
- include $(PATH_SUB_CURRENT)/Devices/Makefile.kmk
- include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
- ifdef VBOX_WITH_VRDP
-  include $(PATH_SUB_CURRENT)/RDP/Makefile.kmk
- endif
- include $(PATH_SUB_CURRENT)/VMM/Makefile.kmk
- ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
-  include $(PATH_SUB_CURRENT)/Disassembler/Makefile.kmk
- endif
-
 else ifdef VBOX_ONLY_SDK
  include $(PATH_SUB_CURRENT)/Main/Makefile.kmk
  ifdef VBOX_WITH_VRDP
@@ -92,7 +79,6 @@
  if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
   include $(PATH_SUB_CURRENT)/NetworkServices/Makefile.kmk
  endif
- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
  ifdef VBOX_WITH_INSTALLER
   include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk 		        # Keep this last.
  endif
--- VirtualBox-4.1.18.orig/src/libs/Makefile.kmk	2012-07-24 21:23:26.938013023 -0300
+++ VirtualBox-4.1.18/src/libs/Makefile.kmk		2012-07-24 21:43:42.557911752 -0300
@@ -48,13 +48,6 @@
  include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk
 endif
 
-# OpenSSL.
-if !defined(VBOX_ONLY_SDK) \
- && (   "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
-     || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
- include $(PATH_SUB_CURRENT)/openssl-0.9.8t/Makefile.kmk
-endif
-
 # libjpeg for VRDP video redirection
 if defined(VBOX_WITH_VRDP) && defined(VBOX_WITH_VRDP_VIDEO_CHANNEL)
  include $(PATH_SUB_CURRENT)/jpeg-8a/Makefile.kmk
--- VirtualBox-4.2.0.orig/src/VBox/Devices/Makefile.kmk		2012-08-03 09:28:25.000000000 -0300
+++ VirtualBox-4.2.0/src/VBox/Devices/Makefile.kmk		2012-09-19 02:54:35.912748288 -0300
@@ -25,9 +25,7 @@
 
 # Include sub-makefiles.
 include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
-if defined(VBOX_WITH_INTEL_PXE) || defined(VBOX_ONLY_EXTPACKS)
- include $(PATH_SUB_CURRENT)/PC/PXE/Makefile.kmk
-else if defined(VBOX_WITH_PXE_ROM)
+if defined(VBOX_WITH_PXE_ROM)
  if !defined(VBOX_WITHOUT_ETHERBOOT)
   include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
  endif
@@ -71,9 +69,6 @@
  ifdef VBOX_WITH_USB
   VBoxDDU_DEFS           += VBOX_WITH_USB IN_USBLIB
   VBoxDDU_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
-  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-   VBoxDDU_DEFS          += VBOX_WITH_EHCI_IMPL
-  endif
   ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
    VBoxDDU_DEFS.darwin   += VBOX_WITH_NEW_USB_CODE_ON_DARWIN
   endif
@@ -326,15 +321,7 @@
    	Storage/UsbMsd.cpp
   endif
 
-  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
-  endif
   VBoxDD_DEFS           += VBOX_WITH_USB
-  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
-   VBoxDD_SOURCES       += \
- 	USB/DevEHCI.cpp
-  endif
 
  endif # VBOX_WITH_USB
 
@@ -869,11 +856,6 @@
 
   ifdef VBOX_WITH_USB
    VBoxDDGC_DEFS        += VBOX_WITH_USB
-   if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-    VBoxDDGC_DEFS       += VBOX_WITH_EHCI_IMPL
-    VBoxDDGC_SOURCES    += \
-  	USB/DevEHCI.cpp
-   endif
   endif
 
   ifdef VBOX_WITH_VIDEOHWACCEL
@@ -1020,11 +1002,6 @@
  endif
  ifdef VBOX_WITH_USB
  VBoxDDR0_DEFS          += VBOX_WITH_USB
-  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-   VBoxDDR0_DEFS        += VBOX_WITH_EHCI_IMPL
-   VBoxDDR0_SOURCES     += \
- 	USB/DevEHCI.cpp
-  endif
  endif
 
  if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
@@ -1163,50 +1140,5 @@
 endif # !VBOX_ONLY_EXTPACKS
 
 
-if defined(VBOX_WITH_EXTPACK_PUEL) && defined(VBOX_WITH_EXTPACK_PUEL_BUILD)
- #
- # The EHCI (USB 2.0) Extension Pack Modules.
- #
- if defined(VBOX_WITH_USB)
-  DLLS += VBoxEhciR3
-  VBoxEhciR3_TEMPLATE = VBoxR3ExtPackPuel
-  VBoxEhciR3_SOURCES  = USB/DevEHCI.cpp
-
-  SYSMODS += VBoxEhciR0
-  VBoxEhciR0_TEMPLATE = VBoxR0ExtPackPuel
-  VBoxEhciR0_SOURCES  = USB/DevEHCI.cpp
-
-  ifdef VBOX_WITH_RAW_MODE
-   SYSMODS += VBoxEhciRC
-   VBoxEhciRC_TEMPLATE = VBoxRcExtPackPuel
-   VBoxEhciRC_SOURCES  = USB/DevEHCI.cpp
-  endif
- endif
-
- if defined(VBOX_WITH_PCI_PASSTHROUGH)
-  DLLS += VBoxPciRawR3
-  VBoxPciRawR3_TEMPLATE = VBoxR3ExtPackPuel
-  VBoxPciRawR3_SOURCES  = Bus/DevPciRaw.cpp
-
-  DLLS += VBoxPciRawDrv
-  VBoxPciRawDrv_TEMPLATE = VBoxR3ExtPackPuel
-  VBoxPciRawDrv_SOURCES = Bus/DrvPciRaw.cpp
-
-  SYSMODS += VBoxPciRawR0
-  VBoxPciRawR0_TEMPLATE = VBoxR0ExtPackPuel
-  VBoxPciRawR0_SOURCES  = Bus/DevPciRaw.cpp
-
-  Bus/DevPciRaw.cpp_INCS   = Bus
- endif
-
-
- #
- # The Intel PXE rom.
- #
- INSTALLS += VBoxExtPackPuelInsRoms
- VBoxExtPackPuelInsRoms_TEMPLATE = VBoxInsExtPackPuel
- VBoxExtPackPuelInsRoms_SOURCES = PC/PXE/PXE-Intel.rom=>PXE-Intel.rom
-endif # VBOX_WITH_EXTPACK_PUEL
-
 include $(FILE_KBUILD_SUB_FOOTER)
 
--- VirtualBox-4.2.0.orig/src/VBox/Main/Makefile.kmk	2012-09-04 09:48:44.000000000 -0300
+++ VirtualBox-4.2.0/src/VBox/Main/Makefile.kmk		2012-09-19 00:46:39.251763337 -0300
@@ -233,14 +233,12 @@
 	$(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
 	$(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) \
 	$(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
-	$(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
 	$(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
 	$(if $(VBOX_WITH_S3),VBOX_WITH_S3,) \
 	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,)
 ifdef VBOX_WITH_USB
  VBoxSVC_DEFS += \
 	VBOX_WITH_USB \
-	$(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,) \
 	$(if $(VBOX_WITH_NEW_USB_CODE_ON_DARWIN),VBOX_WITH_NEW_USB_CODE_ON_DARWIN,)
 endif
 VBoxSVC_DEFS.win += VBOX_COM_OUTOFPROC_MODULE
@@ -293,7 +291,6 @@
 	src-all/SharedFolderImpl.cpp \
 	src-all/VirtualBoxBase.cpp \
 	src-all/VirtualBoxErrorInfoImpl.cpp \
-	$(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
 	src-server/ApplianceImpl.cpp \
 	src-server/ApplianceImplExport.cpp \
 	src-server/ApplianceImplImport.cpp \
@@ -538,8 +535,6 @@
 	$(if $(VBOX_WITH_DRAG_AND_DROP),VBOX_WITH_DRAG_AND_DROP,) \
 	$(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) \
 	$(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
-	$(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,) \
-	$(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
 	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
 	$(if $(VBOX_WITH_VPX),VBOX_WITH_VPX,)
 
@@ -605,7 +600,6 @@
 	src-all/SharedFolderImpl.cpp \
 	src-all/VirtualBoxBase.cpp \
 	src-all/VirtualBoxErrorInfoImpl.cpp \
-	$(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
 	$(if $(VBOX_WITH_USB_VIDEO),src-client/UsbWebcamInterface.cpp,) \
 	$(if $(VBOX_WITH_USB_CARDREADER),src-client/UsbCardReader.cpp,) \
 	src-client/Nvram.cpp \
@@ -733,22 +727,6 @@
 	$(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
 
 
-#
-# The VBoxExtPackHelperApp.
-#
-ifdef VBOX_WITH_EXTPACK
- PROGRAMS += VBoxExtPackHelperApp
- VBoxExtPackHelperApp_TEMPLATE = VBoxR3SetUidToRoot
- VBoxExtPackHelperApp_LDFLAGS.darwin = -framework Security
- VBoxExtPackHelperApp_LDFLAGS.win = /SUBSYSTEM:windows
- VBoxExtPackHelperApp_SOURCES = \
-	src-helper-apps/VBoxExtPackHelperApp.cpp \
-	src-all/ExtPackUtil.cpp
- VBoxExtPackHelperApp_LIBS = \
-	$(LIB_RUNTIME)
-endif # VBOX_WITH_EXTPACK
-
-
 endif # !VBOX_ONLY_SDK (the ifndef is far above)
 
 
--- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk		2012-07-24 23:25:04.575825175 -0300
+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/Makefile.kmk		2012-07-24 23:25:04.619156084 -0300
@@ -888,7 +888,6 @@
 	$(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
 	$(VBOX_BRAND_GUI_VBOX_64PX_PNG)=>Resources/virtualbox.png \
 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox.icns=>Resources/virtualbox-vbox.icns \
-	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns=>Resources/virtualbox-vbox-extpack.icns \
 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ovf.icns=>Resources/virtualbox-ovf.icns \
 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns \
 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vdi.icns=>Resources/virtualbox-vdi.icns \
--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-05-30 07:39:18.000000000 -0300
+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-09-19 00:51:25.413310527 -0300
@@ -169,18 +169,6 @@
         <file alias="status_check_32px.png">images/status_check_32px.png</file>
         <file alias="status_error_16px.png">images/status_error_16px.png</file>
         <file alias="status_error_32px.png">images/status_error_32px.png</file>
-        <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file>
-        <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file>
-        <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file>
-        <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file>
-        <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file>
-        <file alias="extension_pack_install_disabled_16px.png">images/extension_pack_install_disabled_16px.png</file>
-        <file alias="extension_pack_install_32px.png">images/extension_pack_install_32px.png</file>
-        <file alias="extension_pack_install_disabled_32px.png">images/extension_pack_install_disabled_32px.png</file>
-        <file alias="extension_pack_uninstall_16px.png">images/extension_pack_uninstall_16px.png</file>
-        <file alias="extension_pack_uninstall_disabled_16px.png">images/extension_pack_uninstall_disabled_16px.png</file>
-        <file alias="extension_pack_uninstall_32px.png">images/extension_pack_uninstall_32px.png</file>
-        <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file>
         <file alias="proxy_16px.png">images/proxy_16px.png</file>
         <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file>
         <file alias="proxy_32px.png">images/proxy_32px.png</file>
--- VirtualBox-4.1.18.orig/src/VBox/Installer/linux/Makefile.kmk	2012-07-25 00:32:00.780012664 -0300
+++ VirtualBox-4.1.18/src/VBox/Installer/linux/Makefile.kmk		2012-07-25 00:32:00.806677728 -0300
@@ -170,11 +170,6 @@
 	VBox.sh \
 	VBox.png
 
-ifdef VBOX_WITH_EXTPACK
- VBOX_LNX_STRIP_BIN += \
-	VBoxExtPackHelperApp
-endif
-
 # Qt4 GUI
 ifdef VBOX_WITH_QTGUI
  include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
@@ -286,7 +281,7 @@
 
 VBOX_MIME_ICONS = \
 	$(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
-	    $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
+	    $(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
 	        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
 		    virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png)))
 
--- VirtualBox-4.1.18.orig/src/VBox/Installer/win/Makefile.kmk		2012-07-25 00:34:52.253398525 -0300
+++ VirtualBox-4.1.18/src/VBox/Installer/win/Makefile.kmk		2012-07-25 00:34:52.300062531 -0300
@@ -435,7 +435,6 @@
 		-E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
 		-E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \
 		-E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
-		-E 'VBOX_WITH_EXTPACK=$(if $(VBOX_WITH_EXTPACK),yes,no)' \
 		-E 'VBOX_WITH_GUEST_CONTROL=$(if $(VBOX_WITH_GUEST_CONTROL),yes,no)' \
 		-E 'VBOX_WITH_GUEST_PROPS=$(if $(VBOX_WITH_GUEST_PROPS),yes,no)' \
 		-E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
--- VirtualBox-4.2.0.orig/src/VBox/Installer/darwin/Makefile.kmk	2012-09-08 06:36:03.000000000 -0300
+++ VirtualBox-4.2.0/src/VBox/Installer/darwin/Makefile.kmk		2012-09-19 00:55:08.991167973 -0300
@@ -497,7 +497,6 @@
 	MacOS/VirtualBoxVM \
 	MacOS/VBoxNetAdpCtl \
 	MacOS/VBoxNetDHCP \
-	MacOS/VBoxExtPackHelperApp \
 	MacOS/VBoxBalloonCtrl \
 	MacOS/VBoxAutostart
 ifdef VBOX_WITH_WEBSERVICES
@@ -522,7 +521,6 @@
 	Resources/virtualbox.icns \
 	Resources/virtualbox.png \
 	Resources/virtualbox-vbox.icns \
-	Resources/virtualbox-vbox-extpack.icns \
 	Resources/virtualbox-ovf.icns \
 	Resources/virtualbox-ova.icns \
 	Resources/virtualbox-vdi.icns \
--- VirtualBox-4.1.18/src/VBox/Installer/solaris/Makefile.kmk.orig	2012-07-25 00:38:48.476398293 -0300
+++ VirtualBox-4.1.18/src/VBox/Installer/solaris/Makefile.kmk		2012-07-25 00:38:48.516396159 -0300
@@ -185,12 +185,12 @@
 
 VBOX_MIME_ICONS = \
 	$(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
-	    $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
+	    $(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
 	        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
 	            virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png)))
 
 SOLARIS_COMMON_ICONS = \
-	$(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
+	$(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
 	    $(foreach s,16 20 24 32 48 64 72 96 128 256,\
 	        $(s)x$(s)/mimetypes/virtualbox-$(f).png))
 
@@ -210,7 +210,6 @@
 	$(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
 	$(if $(VBOX_WITH_NETADP),VBoxNetAdpCtl,) \
 	VBoxNetDHCP \
-	$(if $(VBOX_WITH_EXTPACK),VBoxExtPackHelperApp,) \
 	VBoxSVC \
 	$(if $(VBOX_WITH_CROGL),VBoxTestOGL,) \
 	VBoxXPCOMIPCD \
--- VirtualBox-4.1.18.orig/src/VBox/Runtime/Makefile.kmk	2012-07-25 00:40:58.745522450 -0300
+++ VirtualBox-4.1.18/src/VBox/Runtime/Makefile.kmk		2012-07-25 00:40:58.782186960 -0300
@@ -53,15 +53,6 @@
  #
  LIBRARIES += RuntimeR3 RuntimeBldProg
 
-else ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
- #
- # Build docs only - need just regular R3 runtime.
- #
- LIBRARIES += RuntimeBldProg
- LIBRARIES.solaris += RuntimeR0Stub
- LIBRARIES.win += RuntimeR0Stub RuntimeRCStub
- include $(PATH_SUB_CURRENT)/tools/Makefile.kmk
-
 else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS
 
  #