From 3c08e2a81096bda8378f2b86abfde0474518ab5e Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Thu, 29 Aug 2013 19:12:30 +0200
Subject: [vbox] Ubuntu-branch functional, could need some more error checking.

---
 remote/modules/vbox/vbox.build | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vbox/vbox.build b/remote/modules/vbox/vbox.build
index 33707fcf..fd2e0b0b 100644
--- a/remote/modules/vbox/vbox.build
+++ b/remote/modules/vbox/vbox.build
@@ -18,8 +18,10 @@ extract_extpack() {
 	mkdir -p ${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack
 	cp    ${MODULE_DIR}/src/vbox/extpack/[EP][xX][tE]* ${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack
 	if [ x${AMD64_X86} == "xamd64" ]; then
+		pinfo "Unpacking 64bit branch of Extension Pack ..."
 		cp -r ${MODULE_DIR}/src/vbox/extpack/linux.amd64 ${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack
 	else	# then we assume 32bit x86...
+		pinfo "Unpacking32bit branch of Extension Pack ..."
 		cp -r ${MODULE_DIR}/src/vbox/extpack/linux.x86 ${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack
 	fi
 }
@@ -90,18 +92,21 @@ build() {
 		rpm)
 			pinfo "Unpacking rpm ..."
 			cd build || perror "Cannot cd to build directory!"
- 			rpm2cpio ../src/vbox/$(basename "$REQUIRED_VBOXBASEURL")|cpio -idmv
+ 			rpm2cpio ../src/vbox/$(basename "$REQUIRED_VBOXBASEURL")|cpio -idmv || perror "Could not unpack rpm-archive!"
 			# it seems that sometimes directories from rpm will be created with 700-permissions,
 			# if that directory is not explicitly mentioned to create. So eg. usr, etc will carry the
 			# permissions 700, which is no fun. So we search for these directories and correct them.
 			find .  -type d -perm 700 -exec chmod 755 {} \; 
-			build_modules
 			;;
 		dpkg )
+			pinfo "Unpacking deb ..."
+			cd build || perror "Cannot cd to build directory!"
+			dpkg -x ../src/vbox/$(basename "$REQUIRED_VBOXBASEURL") . || perror "Could not unpack deb-archive!"
 			;;
 		*) perror "Unknown Distribution: $SYS_DISTRIBUTION - Please specify its packet manager in remote/setup_target" ;;
 	esac
 
+	build_modules
 	patch_vbox_scripts
 	extract_extpack
 
-- 
cgit v1.2.3-55-g7522