Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

9 files changed, 66 insertions, 32 deletions

diff --git a/remote/modules/beamergui/module.build b/remote/modules/beamergui/module.build
index 837a2e38..26059615 100644
--- a/remote/modules/beamergui/module.build
+++ b/remote/modules/beamergui/module.build
@@ -7,6 +7,9 @@ fetch_source() {
 build() {
 	local SRCDIR="${MODULE_DIR}/src/"
 
+	# first activate qt 4
+	activate_qt 4
+
 	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin"
 	cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!"
 	pinfo "Running qmake"
diff --git a/remote/modules/dnbd3/module.conf b/remote/modules/dnbd3/module.conf
index 333637fd..93e6d0d3 100644
--- a/remote/modules/dnbd3/module.conf
+++ b/remote/modules/dnbd3/module.conf
@@ -2,7 +2,7 @@
 #REQUIRED_CONTENT_PACKAGES="libgconf-2-4 fontconfig-config"
 REQUIRED_MODULES="kernel"
 REQUIRED_GIT="git://git.openslx.org/dnbd3.git"
-REQUIRED_COMMIT="32ca216b49b2417a102457ce54bdd9bb76d6f02d"
+REQUIRED_COMMIT="fda78a33648bf94623b479e0ea971046a45d54a0"
 REQUIRED_BINARIES="
 	dnbd3-client
 "
diff --git a/remote/modules/printergui/module.build b/remote/modules/printergui/module.build
index 2ee49154..869e8716 100644
--- a/remote/modules/printergui/module.build
+++ b/remote/modules/printergui/module.build
@@ -11,6 +11,9 @@ build() {
 	local SRCDIR="${MODULE_DIR}/src/"
 	local DESTDIR="$MODULE_BUILD_DIR/opt/openslx/cups"
 
+	# first activate qt 4
+	activate_qt 4
+
 	mkdir -p "$DESTDIR"
 	cd "$DESTDIR" || perror "Could not cd to $DESTDIR!"
 	pinfo "Running cmake"
diff --git a/remote/modules/systemd/data/usr/lib/systemd/system/debug-shell.service b/remote/modules/systemd/data/usr/lib/systemd/system/debug-shell.service
index 1942c987..4220d7c2 100644
--- a/remote/modules/systemd/data/usr/lib/systemd/system/debug-shell.service
+++ b/remote/modules/systemd/data/usr/lib/systemd/system/debug-shell.service
@@ -13,7 +13,7 @@ IgnoreOnIsolate=yes
 
 [Service]
 Environment=TERM=linux
-ExecStart=/sbin/sushell
+ExecStart=/bin/ash
 Restart=always
 RestartSec=0
 StandardInput=tty
diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build
index 2c27231e..4851f682 100644
--- a/remote/modules/systemd/module.build
+++ b/remote/modules/systemd/module.build
@@ -6,26 +6,28 @@ fetch_source () {
 
 	# starting with systemd 212 a new way of setting global environment is supported
 	# meaning we don't have to apply the patch needed til that version.
-	if [ "x${REQUIRED_VERSION#systemd-}" = "x212" ]; then
-		pinfo "Systemd version 212 detected."
-		pinfo "REQUIRED_XATTR_PATCH is $REQUIRED_XATTR_PATCH"
-		# patch src/core/socket.c if activated in the config file
-		if [ "x$REQUIRED_XATTR_PATCH" = "xyes" ]; then
-			pinfo "Patching 'src/core/socket.c' ..."
-			# patch it
-			if [ -e "src/$REQUIRED_VERSION/src/core/socket.c" ]; then
-				sed -i 's/^#include <attr\/xattr.h>$/#include <sys\/xattr.h>\n#include <attr\/xattr.h>/g' "src/$REQUIRED_VERSION/src/core/socket.c" \
-					|| perror "Could not patch 'src/$REQUIRED_VERSION/src/core/socket.c'"
-			else
-				perror "'src/$REQUIRED_VERSION//src/core/socket.c' does not exist."
-			fi
+	# patch src/core/socket.c if activated in the config file
+	if [ "x$REQUIRED_XATTR_PATCH" = "xyes" ]; then
+		pinfo "Patching 'src/core/socket.c' ..."
+		# patch it
+		if [ -e "src/$REQUIRED_VERSION/src/core/socket.c" ]; then
+			sed -i 's/^#include <attr\/xattr.h>$/#include <sys\/xattr.h>\n#include <attr\/xattr.h>/g' "src/$REQUIRED_VERSION/src/core/socket.c" \
+				|| perror "Could not patch 'src/$REQUIRED_VERSION/src/core/socket.c'"
+		else
+			perror "'src/$REQUIRED_VERSION/src/core/socket.c' does not exist."
 		fi
-	else
+	fi
+	# now check if the old fix needs to be applied
+	# NOTE: only for systemd-204
+	if [ "x${REQUIRED_VERSION#systemd-}" = "x204" ]; then
 		# Patch PATH, HOME, USER environment
 		# TODO: Newer systemd versions support DefaultEnvironment=xxx in /etc/systemd/system.conf
 		# However, there were lots of changes after systemd 204, so we didn't update yet
 		# See http://cgit.freedesktop.org/systemd/systemd/tree/NEWS for changes.
 		patch -p0 src/systemd-*/src/core/main.c < systemd-openslx.patch || perror "Failed to apply openslx systemd patch."
+	else
+		# TODO use the above hint for setting environmenet through /etc/systemd/system.conf
+		pinfo "Missing..."
 	fi
 
 	# libkmod
diff --git a/remote/modules/systemd/module.conf.ubuntu.14 b/remote/modules/systemd/module.conf.ubuntu.14
index f5ed3c0f..7b2f853c 100644
--- a/remote/modules/systemd/module.conf.ubuntu.14
+++ b/remote/modules/systemd/module.conf.ubuntu.14
@@ -1,20 +1,19 @@
-REQUIRED_VERSION="systemd-212"
+REQUIRED_VERSION="systemd-204"
 REQUIRED_URL="http://www.freedesktop.org/software/systemd/${REQUIRED_VERSION}.tar.xz"
-REQUIRED_LIBKMOD_VERSION="kmod-17"
+REQUIRED_LIBKMOD_VERSION="kmod-14"
 REQUIRED_LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${REQUIRED_LIBKMOD_VERSION}.tar.xz"
-
 REQUIRED_INSTALLED_PACKAGES="
-			intltool
-			gperf
-			dbus
-			pkg-config
-			libcap-dev
-			libudev-dev
-			libdbus-1-dev
-			xsltproc
-			libblkid-dev
-			libacl1-dev
-			libpam-dev
+	intltool
+	gperf
+	dbus
+	pkg-config
+	libcap-dev
+	libudev-dev
+	libdbus-1-dev
+	xsltproc
+	libblkid-dev
+	libacl1-dev
+	libpam-dev
 "
 REQUIRED_BINARIES="
 	journalctl
diff --git a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include
index 1a87e01b..22c62513 100755
--- a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include
+++ b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include
@@ -179,7 +179,7 @@ machineuuid="00000000-0000-0000-0000-${macaddr}"
 machineuuid=$(echo ${machineuuid} | tr "[A-Z]" "[a-z]")
 # get UUID of VBox image, if not diskless
 [ ${diskless} -eq 0 ] && diskuuid=$(VBoxManage -q showvdiinfo ${diskfile} \
-                                    | grep UUID | awk '{print $2}')
+                                    | grep UUID | grep -v "Parent UUID" | awk '{print $2}')
 # make disk immutable
 imgtype="Immutable"
 # snapshot UUID is static
diff --git a/remote/modules/vbox/module.conf.ubuntu.13.10 b/remote/modules/vbox/module.conf.ubuntu.13.10
new file mode 100644
index 00000000..463c26e2
--- /dev/null
+++ b/remote/modules/vbox/module.conf.ubuntu.13.10
@@ -0,0 +1,24 @@
+REQUIRED_VBOX_VERSION_MAJOR="4.3"
+REQUIRED_VBOX_VERSION_MINOR="8"
+REQUIRED_VBOX_VERSION="$REQUIRED_VBOX_VERSION_MAJOR.$REQUIRED_VBOX_VERSION_MINOR"
+REQUIRED_VBOX_VERSIONCODE="92456"
+REQUIRED_VBOX_OSCODE='Ubuntu~raring'
+
+REQUIRED_VBOXBASEURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/virtualbox-${REQUIRED_VBOX_VERSION_MAJOR}_${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}~${REQUIRED_VBOX_OSCODE}_${AMD64_I386}.deb"
+
+REQUIRED_VBOXEXTURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/Oracle_VM_VirtualBox_Extension_Pack-${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}.vbox-extpack"
+
+
+REQUIRED_CONTENT_PACKAGES="
+				libsdl1.2debian
+				libpng12-0
+"
+
+REQUIRED_INSTALLED_PACKAGES="
+				libsdl1.2debian
+				libpng12-0
+"
+
+REQUIRED_LIBRARIES="
+				libpng12
+"
diff --git a/remote/modules/vmchooser/module.build b/remote/modules/vmchooser/module.build
index eb0a2d48..bfad0692 100644
--- a/remote/modules/vmchooser/module.build
+++ b/remote/modules/vmchooser/module.build
@@ -23,7 +23,10 @@ build() {
 	fi
 
 	pinfo "Running cmake"
-	ln -sf qt4.conf /usr/share/qtchooser/default.conf
+
+	# activate qt 4
+	activate_qt 4
+
 	cmake "$SRCDIR" || perror "'cmake $SRCDIR' failed."
 	make || perror "'make' failed."