From 19bb0f450ea678e2bd05d0fa827346c710c6d843 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Thu, 29 Aug 2013 18:36:04 +0200
Subject: [openbox] Added needed packages dor pango-querymodules, udev-dev

---
 remote/modules/openbox/openbox.conf.opensuse | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'remote/modules')

diff --git a/remote/modules/openbox/openbox.conf.opensuse b/remote/modules/openbox/openbox.conf.opensuse
index eb0eb559..c06a89b2 100644
--- a/remote/modules/openbox/openbox.conf.opensuse
+++ b/remote/modules/openbox/openbox.conf.opensuse
@@ -1,10 +1,12 @@
 REQUIRED_INSTALLED_PACKAGES="
 			openbox
 			libpango-1_0-0
+			pango-tools
 "
 REQUIRED_CONTENT_PACKAGES="
 			openbox
 			libpango-1_0-0
+			pango-tools
 "
 REQUIRED_DIRECTORIES+="	
 			/usr/$LIB64
-- 
cgit v1.2.3-55-g7522


From aa5328b21f3c36ef14ef0eaffe3018bd7cfffd90 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Thu, 29 Aug 2013 18:37:18 +0200
Subject: [openbox] Added needed packages dor pango-querymodules, udev-dev

---
 remote/modules/openbox/openbox.conf.ubuntu | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'remote/modules')

diff --git a/remote/modules/openbox/openbox.conf.ubuntu b/remote/modules/openbox/openbox.conf.ubuntu
index 49589258..b10bd40d 100644
--- a/remote/modules/openbox/openbox.conf.ubuntu
+++ b/remote/modules/openbox/openbox.conf.ubuntu
@@ -1,10 +1,14 @@
 REQUIRED_INSTALLED_PACKAGES="
 			openbox
 			libpango1.0-0
+			libpango1.0-dev
+			libdbus-1-dev
 "
 REQUIRED_CONTENT_PACKAGES="
 			openbox
 			libpango1.0-0
+			libpango1.0-dev
+			libdbus-1-dev
 "
 REQUIRED_DIRECTORIES+="  
 			/usr/lib
-- 
cgit v1.2.3-55-g7522


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


From ffe6dbca7fd7d6994e488022b6049308654cacad Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Thu, 29 Aug 2013 19:13:40 +0200
Subject: [vbox] Some directory cleaning

---
 remote/modules/vbox/vbox.conf | 1 -
 1 file changed, 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vbox/vbox.conf b/remote/modules/vbox/vbox.conf
index d6a0e94e..29067791 100644
--- a/remote/modules/vbox/vbox.conf
+++ b/remote/modules/vbox/vbox.conf
@@ -7,7 +7,6 @@ REQUIRED_DIRECTORIES="
 				/etc
 				/lib
 				/usr
-				/sbin
 "
 # REQUIRED_LDD_BLACKLIST: Keep in minde the leading '\|'!
 REQUIRED_LDD_BLACKLIST="\|VBoxVMM"
-- 
cgit v1.2.3-55-g7522