Merge branch 'master' of dnbd3:openslx-ng/tm-scripts

13 files changed, 46 insertions, 38 deletions

diff --git a/remote/modules/beamer/beamer.build b/remote/modules/beamer/beamer.build
deleted file mode 100644
index bd189b66..00000000
--- a/remote/modules/beamer/beamer.build
+++ /dev/null
@@ -1,17 +0,0 @@
-fetch_source() {
-	:
-}
-
-build() {
-	COPYLIST="list_dpkg_output"
-	[ -e "$COPYLIST" ] && rm "$COPYLIST"
-
-	list_packet_files >> "$COPYLIST"
-	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
-
-	return 0
-}
-
-post_copy() {
-	:
-}
diff --git a/remote/modules/beamer/beamer.conf b/remote/modules/beamer/beamer.conf
deleted file mode 100644
index 16f54fcf..00000000
--- a/remote/modules/beamer/beamer.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-REQUIRED_BINARIES="
-	zenity
-"
diff --git a/remote/modules/beamer/beamer.conf.debian b/remote/modules/beamer/beamer.conf.debian
deleted file mode 100644
index 459dd079..00000000
--- a/remote/modules/beamer/beamer.conf.debian
+++ /dev/null
@@ -1,6 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="
-	zenity
-"
-REQUIRED_CONTENT_PACKAGES="
-	zenity
-"
diff --git a/remote/modules/beamer/beamer.conf.opensuse b/remote/modules/beamer/beamer.conf.opensuse
deleted file mode 100644
index 459dd079..00000000
--- a/remote/modules/beamer/beamer.conf.opensuse
+++ /dev/null
@@ -1,6 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="
-	zenity
-"
-REQUIRED_CONTENT_PACKAGES="
-	zenity
-"
diff --git a/remote/modules/beamer/TODO b/remote/modules/beamergui/TODO
index 651759eb..651759eb 100644
--- a/remote/modules/beamer/TODO
+++ b/remote/modules/beamergui/TODO
diff --git a/remote/modules/beamergui/beamergui.build b/remote/modules/beamergui/beamergui.build
new file mode 100644
index 00000000..e27cf0b3
--- /dev/null
+++ b/remote/modules/beamergui/beamergui.build
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+fetch_source() {
+	git clone "${REQUIRED_GIT}" src
+}
+
+build() {
+	local SRCDIR="${MODULE_DIR}/src/"
+
+	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin"
+	cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!"
+	pinfo "Running qmake"
+	qmake "$SRCDIR/src/beamergui.pro" -r -spec linux-g++ || perror "'qmake' failed."
+	pinfo "Running make"
+	make || perror "'make' failed."
+}
+post_copy() {
+	:
+}
diff --git a/remote/modules/beamergui/beamergui.conf b/remote/modules/beamergui/beamergui.conf
new file mode 100644
index 00000000..da786271
--- /dev/null
+++ b/remote/modules/beamergui/beamergui.conf
@@ -0,0 +1,9 @@
+REQUIRED_GIT="git://git.openslx.org/openslx-ng/beamergui.git"
+REQUIRED_BINARIES="
+	beamergui
+"
+REQUIRED_LIBRARIES="
+"
+REQUIRED_SYSTEM_FILES="
+"
+# TODO add libraries
diff --git a/remote/modules/beamer/beamer.conf.scientific b/remote/modules/beamergui/beamergui.conf.debian
index 459dd079..ea4cd194 100644
--- a/remote/modules/beamer/beamer.conf.scientific
+++ b/remote/modules/beamergui/beamergui.conf.debian
@@ -1,6 +1,8 @@
 REQUIRED_INSTALLED_PACKAGES="
-	zenity
+libqt4-dev
+libxrandr-dev
 "
 REQUIRED_CONTENT_PACKAGES="
-	zenity
+libqt4-dev
+libxrandr-dev
 "
diff --git a/remote/modules/beamer/beamer.conf.ubuntu b/remote/modules/beamergui/beamergui.conf.ubuntu
index 459dd079..ea4cd194 100644
--- a/remote/modules/beamer/beamer.conf.ubuntu
+++ b/remote/modules/beamergui/beamergui.conf.ubuntu
@@ -1,6 +1,8 @@
 REQUIRED_INSTALLED_PACKAGES="
-	zenity
+libqt4-dev
+libxrandr-dev
 "
 REQUIRED_CONTENT_PACKAGES="
-	zenity
+libqt4-dev
+libxrandr-dev
 "
diff --git a/remote/modules/beamer/data/opt/openslx/bin/screenRecognizer.sh b/remote/modules/beamergui/data/opt/openslx/bin/screenRecognizer.sh
index feabe7ee..feabe7ee 100755
--- a/remote/modules/beamer/data/opt/openslx/bin/screenRecognizer.sh
+++ b/remote/modules/beamergui/data/opt/openslx/bin/screenRecognizer.sh
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index 261ef8f5..4a0ba8c6 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -428,6 +428,7 @@ if [ "$vtflag" = "1" -a -n "$kvm_module" ]; then
 	modprobe "$kvm_module"
 fi
 
+
 # # # # # # Start printer daemon # # # # # # # 
 USER="$(whoami)"
 SPOOLDIR="/var/spool"
@@ -436,7 +437,10 @@ QUEUE="STANDARD"
 # Start the lpdaemon listening on the given port
 busybox tcpsvd -E 0.0.0.0 5515 \
   busybox lpd "$SPOOLDIR" \
-  sh -c "printergui $USER $SPOOOLDIR/$QUEUE/\$DATAFILE" &
+  sh -c "printergui $USER $SPOOLDIR/$QUEUE/\$DATAFILE" &
+
+# PID to kill the process
+PID_LPD="$!"
 
 
 # Copy guest configuration (with added information) config.xml to be accessed
@@ -527,5 +531,9 @@ if [ -n "${POSTRUN}" ]; then
 	eval ${POSTRUN} >/dev/null 2>&1
 fi
 
+# Kill LPD
+kill $PID_LPD
+
+
 cleanexit 0
 exit 0
diff --git a/remote/targets/stage32/beamer b/remote/targets/stage32/beamer
deleted file mode 120000
index 0fbeaeca..00000000
--- a/remote/targets/stage32/beamer
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/beamer/
\ No newline at end of file
diff --git a/remote/targets/stage32/beamergui b/remote/targets/stage32/beamergui
new file mode 120000
index 00000000..5e863316
--- /dev/null
+++ b/remote/targets/stage32/beamergui
@@ -0,0 +1 @@
+../../modules/beamergui
\ No newline at end of file