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

4 files changed, 160 insertions, 0 deletions

diff --git a/remote/modules/nvidia_libs/nvidia_libs.build b/remote/modules/nvidia_libs/nvidia_libs.build
new file mode 100644
index 00000000..7e4e86c7
--- /dev/null
+++ b/remote/modules/nvidia_libs/nvidia_libs.build
@@ -0,0 +1,121 @@
+fetch_source() {
+	mkdir -p src 2>/dev/null
+	cd src || perror "Could not change into src directory."
+	download "$REQUIRED_URL"
+}
+
+build() {
+	local KERNELSRCDIR="$MODULE_DIR/../kernel/ksrc"	# kernel sources
+	local TEMPDIR="$MODULE_DIR/temp"
+	local ROOTLOWERDIR="/"
+	local ROOTUPPERDIR="$MODULE_DIR/build"
+	local ROOTBINDDIR="$TEMPDIR/rootbind"
+	local ROOTMOUNTDIR="$TEMPDIR/rootmount"
+	local BINDMOUNTS="/dev /proc /run /sys"
+	local NVIDIA="$MODULE_DIR/src/$REQUIRED_NVIDIA"
+	local NVIDIAEXTRACTDIR="$ROOTMOUNTDIR/NVIDIA"
+	local NVEXTRACTDIR="/NVIDIA"				# This is relative to the chroot.
+	
+	make_dirs () {
+		[ -d "$TEMPDIR" ] && rm -rf "$TEMPDIR"
+		mkdir -p "$TEMPDIR"			|| perror "Could not create base directory for mount directories $TEMPDIR."
+		for DIR in "$ROOTBINDDIR" "$ROOTMOUNTDIR"; do
+			mkdir -p "$DIR"			|| perror "Could not create directory for mount directory $DIR."
+		done
+	}
+	
+	mount_dirs () {
+		pinfo "Executing bind- and overlay mounts ..."
+		mount -o bind "$ROOTLOWERDIR" "$ROOTBINDDIR"	|| perror "Could not mount (bind) $ROOTLOWERDIR to $ROOTBINDDIR."
+		mount -o remount,ro "$ROOTBINDDIR"		|| perror "Could not remount $ROOTBINDDIR ro read-only."
+		mount -t overlayfs overlayfs -o lowerdir="$ROOTBINDDIR",upperdir="$ROOTUPPERDIR" "$ROOTMOUNTDIR"  \
+		|| perror "Could not mount (overlayfs) $ROOTLOWERDIR, $ROOTUPPERDIR to $BINDDIR."
+		pinfo "Executing bind mounts ($BINDMOUNTS) for chroot root dir ..."
+		for MOUNT in $BINDMOUNTS; do
+			mount -o bind "$MOUNT" "$ROOTMOUNTDIR/$MOUNT"	|| perror "Could not mount (bind) $MOUNTS into chroot root dir."
+		done
+	}
+	
+	# We inject a bashrc to be executed later within the chroot.
+	gen_bashrc () {
+		local COMMON_OPTIONS=' --no-nouveau-check --no-network --no-backup --no-rpms --no-runlevel-check --no-distro-scripts --no-cc-version-check --no-x-check --no-precompiled-interface --silent '
+		
+		cat >"$ROOTMOUNTDIR/$HOME/.bashrc"<<-EOF
+		echo "chroot successful."
+		alias ll='ls -alF'				# A little convenience for debugging purposes.
+		PS1='\[\e[1;33m\]chroot@\h:\w\$ \[\e[1;32m\]'	# To recognize the chroot instantly when debugging (yellow on black).
+		cd "$NVEXTRACTDIR"
+		./nvidia-installer $COMMON_OPTIONS --no-kernel-module		# Do the work!
+		exit						# Out-comment this for debugging: Then script stays in chroot.
+		EOF
+	}
+	
+	unpack_nvidia () {
+		[ -d "$NVIDIAEXTRACTDIR" ] && rm -rf "$NVIDIAEXTRACTDIR"
+		pinfo "Unpacking NVidia archive ($NVIDIA) ..."
+		sh "$NVIDIA" --extract-only --target "$NVIDIAEXTRACTDIR" ||	perror "Could not extract $NVIDIA to $NVIDIAEXTRACTDIR."
+	}
+	
+	umount_dirs () {
+		# Let's tidy the place, or at least the mounts: Otherwise these would stack up, and we do not like that, don't we.
+		for MOUNT in $BINDMOUNTS; do
+			umount "$ROOTMOUNTDIR/$MOUNT"	|| pwarning "Could not unmount $ROOTMOUNTDIR/$MOUNT!"
+		done
+		umount "$ROOTMOUNTDIR"			|| pwarning "Could not unmount $ROOTMOUNTDIR!"
+		umount "$ROOTBINDDIR"			|| pwarning "Could not unmount $ROOTBINDDIR!"
+	}
+	
+	clean_whiteouts () {
+		# The case of these overlay whiteouts should be investigated instead of just killing them. But for now...
+		pdebug "Searching for overlayfs-whiteouts ..."
+		for WHITEOUT in $(find "$MODULE_DIR/build" -lname "(overlay-whiteout)"); do
+			pdebug "Whiteout found: $WHITEOUT"
+			rm -f "$WHITEOUT" || perror "Could not delete whiteout $WHITEOUT!"
+		done
+	}
+	
+	clean_temp () {
+		rm -rf "$TEMPDIR" || perror "Could not clean/delete temp directory $TEMPDIR."
+		rm -rf "$ROOTUPPERDIR/NVIDIA"
+	}
+	
+	# Main stuff
+	pinfo "Generating temporary directories ..."
+	make_dirs
+	pinfo "Mounting directories ..."
+	mount_dirs
+	
+	pinfo "Injecting .bashrc into later chroot ..."
+	gen_bashrc
+	
+	pinfo "Unpacking NVidia-Installer ..."
+	unpack_nvidia
+	
+	pinfo "Ready to chroot - compiling may take some time."
+	pdebug "--- chroot ---------------------------------------------------------------------"
+	pdebug "-                                                                              -"
+	pdebug "-   Notice: This may take a while!                                             -"
+	pdebug "-                                                                              -"
+	pdebug "-      Please keep note the Nvidia installer _will_ complain about             -"
+	pdebug "-      several warnings and errors. It will do this in any case.               -"
+	pdebug "-                                                                              -"
+	pdebug "-      This does _not_ mean the library module compilation was unsuccessful!   -"
+	pdebug "-                                                                              -"
+	pdebug "--------------------------------------------------------------------------------"
+	chroot "$ROOTMOUNTDIR"
+	pinfo "chroot terminated."
+	
+	pinfo "Unmount directories ..."
+	umount_dirs
+	
+	pinfo "Cleaning whiteouts ..."
+	clean_whiteouts
+	
+	pinfo "Cleaning / deleting temp directories."
+	clean_temp
+}
+
+post_copy() {
+	:
+}
+
diff --git a/remote/modules/nvidia_libs/nvidia_libs.conf b/remote/modules/nvidia_libs/nvidia_libs.conf
new file mode 100644
index 00000000..faec87ec
--- /dev/null
+++ b/remote/modules/nvidia_libs/nvidia_libs.conf
@@ -0,0 +1,29 @@
+REQUIRED_VERSION="331.38"
+REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run"
+REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA"
+
+#REQUIRED_FILES="
+#				/etc/OpenCL/vendors/nvidia.icd
+#				/usr/share/nvidia/nvidia-application-profiles-331.38-rc
+#				/usr/share/applications/nvidia-settings.desktop
+#"
+
+#REQUIRED_DIRECTORIES="
+#				/usr/bin
+#				/usr/lib
+#				/usr/lib/vdpau
+#				/usr/lib/xorg
+#				/usr/lib/xorg/modules
+#				/usr/lib/xorg/modules/drivers
+#				/usr/lib/xorg/modules/extensions
+#				/usr/lib/tls
+#				/usr/lib/x86_64-linux-gnu
+#				/usr/lib/x86_64-linux-gnu/mesa
+#				/usr/lib32
+#				/usr/lib32/vdpau
+#
+#"
+
+REQUIRED_DIRECTORIES="
+				/
+"
diff --git a/remote/modules/nvidia_libs/nvidia_libs.conf.ubuntu b/remote/modules/nvidia_libs/nvidia_libs.conf.ubuntu
new file mode 100644
index 00000000..1eccb199
--- /dev/null
+++ b/remote/modules/nvidia_libs/nvidia_libs.conf.ubuntu
@@ -0,0 +1,10 @@
+# libvdpau: While nvidia delivers a linvdpau within it's driver package, nvidia
+# itself recommends using a distribution package if available. So, here we go.
+
+REQUIRED_CONTENT_PACKAGES="
+				libvdpau1
+"
+
+REQUIRED_INSTALLED_PACKAGES="
+				libvdpau1
+"
diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/bootpgm.exe b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/bootpgm.exe
new file mode 100644
index 00000000..88f89418
--- /dev/null
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/bootpgm.exe