merge

37 files changed, 39 insertions, 52 deletions

diff --git a/remote/modules/busybox/busybox.build b/remote/modules/busybox/busybox.build
index bc2adc64..d11a3828 100644
--- a/remote/modules/busybox/busybox.build
+++ b/remote/modules/busybox/busybox.build
@@ -14,7 +14,7 @@ build()
 	if [ ! -e .built ]; then
 		cd src
 		pinfo "Running make"
-		make -j5 || perror "failed."
+		make || perror "failed."
 		pinfo "Running make install"
 		make CONFIG_PREFIX="${MODULE_DIR}"/build/"${PREFIX}" install || perror "failed"
 		cd -
diff --git a/remote/modules/hwinfo/hwinfo.build b/remote/modules/hwinfo/hwinfo.build
index 383b8c2a..b2012a22 100644
--- a/remote/modules/hwinfo/hwinfo.build
+++ b/remote/modules/hwinfo/hwinfo.build
@@ -9,7 +9,7 @@ fetch_source() {
 build() {
 	pdebug "Installing libx86emu in ${MODULE_DIR}/build..."
 	cd "${MODULE_DIR}/src/libx86emu"
-	make || perror "libx86emu: make failed."
+	EXTRA_FLAGS="-I${MODULE_DIR}/src/libx86emu/include" make || perror "libx86emu: make failed."
 	DESTDIR="${MODULE_DIR}"/build make install || perror "libx86emu: make install failed."
 	cd - &> /dev/null	
 
diff --git a/remote/modules/kdm/kdm.build b/remote/modules/kdm/kdm.build
index 88c47f6b..3a924380 100644
--- a/remote/modules/kdm/kdm.build
+++ b/remote/modules/kdm/kdm.build
@@ -14,8 +14,6 @@ build () {
 }
 
 post_copy() {
-        # copy static kdm files to stage3.2
-        cp -r ${MODULE_DIR}/data/* ${TARGET_BUILD_DIR}
 	#create static kdm folders in stage3.2
 	mkdir -p ${TARGET_BUILD_DIR}/var/lib/kdm
 	mkdir -p ${TARGET_BUILD_DIR}/var/run/kdm 
diff --git a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build
index 19adf66a..7f02e281 100644
--- a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build
+++ b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build
@@ -28,11 +28,7 @@ build () {
 }
 
 post_copy() {
-	#copy static data files
-	cp -r "${MODULE_DIR}/data/"* "${TARGET_BUILD_DIR}" || perror "Copying data/* failed."
-	# TODO: FIX PATH TO TRIPLET...
-	TRIPLET="$(basename "$(dirname "$(ldd "$SHELL" | grep libc | awk -F " " '{print $3}')")")"
-	gdk-pixbuf-query-loaders > "${TARGET_BUILD_DIR}/usr/lib/${TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache" || perror "pixbuf-query-loaders failed."
+	gdk-pixbuf-query-loaders > "${TARGET_BUILD_DIR}/usr/lib/${ARCH_TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache" || perror "pixbuf-query-loaders failed."
 	mkdir -p "${TARGET_BUILD_DIR}/etc/pango" || perror "Making etc/pango failed."
 	pango-querymodules > "${TARGET_BUILD_DIR}/etc/pango/pango.modules" || perror "pango-querymodules failed."
 	gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || perror "update-icon-cache-3.0 failed."
diff --git a/remote/modules/ldm/ldm.build b/remote/modules/ldm/ldm.build
index 88429cff..0e73148c 100644
--- a/remote/modules/ldm/ldm.build
+++ b/remote/modules/ldm/ldm.build
@@ -34,8 +34,5 @@ post_copy() {
 	local LDMGID=$(add_group "lightdm")
 	pinfo "lightdm user and group is $LDMUID $LDMGID"
 	chown -R "${LDMUID}:${LDMGID}" "${TARGET_BUILD_DIR}/var/lib/lightdm/" || perror "chowning '${TARGET_BUILD_DIR}/var/lib/lightdm/' failed."
-	#copyi static data files
-	cp -r "${MODULE_DIR}/data/"* "${TARGET_BUILD_DIR}" || perror "Copying data/ failed."
-
 }
 
diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth b/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth
index bc669108..8499e451 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth
+++ b/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth
@@ -4,5 +4,5 @@ Description=Uni-Freiburg simple blue-ish theme with simple progress bar
 ModuleName=script
 
 [script]
-ImageDir=/lib/plymouth/themes/unifr-rz
-ScriptFile=/lib/plymouth/themes/unifr-rz/unifr-rz.script
+ImageDir=/share/plymouth/themes/unifr-rz
+ScriptFile=/share/plymouth/themes/unifr-rz/unifr-rz.script
diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png
index 9cb68040..9cb68040 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png
diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png
index 16b069cc..16b069cc 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png
diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth
index 0f300f6b..0f300f6b 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth
diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script
index f2d8bd28..f2d8bd28 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script
diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png
index 4fd4be30..4fd4be30 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png
diff --git a/remote/modules/plymouth/plymouth.build b/remote/modules/plymouth/plymouth.build
index 4363e809..d5e9c594 100644
--- a/remote/modules/plymouth/plymouth.build
+++ b/remote/modules/plymouth/plymouth.build
@@ -11,7 +11,7 @@ build() {
 		pinfo "Running configure" 
 		./configure --enable-systemd-integration --disable-gtk --disable-static --prefix=""|| perror "failed."
 		pinfo "Running make"
-		make -j5 || perror "failed"
+		make || perror "failed"
 		pinfo "Running make install" 
 		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "failed"
 		cd -
@@ -20,8 +20,5 @@ build() {
 }
 
 post_copy() {
-        # copy static dbus systemd unit files to stage3.2
-        SYSTEMDDIR=${TARGET_BUILD_DIR}/etc/systemd/system
-        [ ! -d ${SYSTEMDDIR} ] && mkdir -p ${SYSTEMDDIR}
-        cp -r ${MODULE_DIR}/data/* ${TARGET_BUILD_DIR}
+	:
 }
diff --git a/remote/modules/policykit/policykit.build b/remote/modules/policykit/policykit.build
index 6a03b81c..b6b70b7f 100644
--- a/remote/modules/policykit/policykit.build
+++ b/remote/modules/policykit/policykit.build
@@ -15,9 +15,6 @@ build () {
 
 post_copy() {
 
-	# copy static policykit files to stage3.2
-        cp -r ${MODULE_BUILD_DIR}/data/* ${TARGET_BUILD_DIR}
-	
 	#Add Polkit User/Group/Shadow to Stage3.2
 	pinfo "Adding polkitd user to target system..."
 	add_user "polkitd"
diff --git a/remote/modules/sshd/sshd.build b/remote/modules/sshd/sshd.build
index 57a9e35d..aa4241e6 100644
--- a/remote/modules/sshd/sshd.build
+++ b/remote/modules/sshd/sshd.build
@@ -15,5 +15,4 @@ build() {
 
 post_copy() {	
 	mkdir -p "${TARGET_BUILD_DIR}/var/run/sshd"
-	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}"
 }
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index 450e743b..57fb705e 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -3,8 +3,7 @@
 fetch_source () {
 	if [ ! -e .fetched_source ]; then 
 		download_untar "$URL" "src/"
-		local LIBKMOD_VERSION="kmod-12"
-		download_untar "http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz" "src/"
+		download_untar "$LIBKMOD_URL" "src/"
 		touch .fetched_source
 	fi
 }	
@@ -12,29 +11,27 @@ fetch_source () {
 build () {
 	if [ ! -e .built ]; then
 		#build libkmod
-		cd "src/$LIBKMOD_VERSION/"
+		cd "${MODULE_DIR}/src/$LIBKMOD_VERSION"
+		pwarning "$(pwd)"
 		./configure
-		make -j5
-		make install
-		cd -
+		make || perror "make failed."
+		make install || perror "make install failed."
+		cd - &> /dev/null
 
 		#build systemd
-		cd "src/$VERSION/"
+		cd "${MODULE_DIR}/src/$VERSION"
 		pinfo "calling configure"
 		./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no || perror "configure failed."
 		pinfo "calling make"
-		make -j5 || perror "make failed."
+		make || perror "make failed."
 		pinfo "calling make install"
 		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed."
-		cd -
+		cd - &> /dev/null
 		touch .built
 	fi
 }
 
 post_copy() {
-	# copy static data files
-	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" || perror "copying data files failed."
-		
 	# dont clear systemd log at startup
 	sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
 
diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index c5e72aeb..634828bd 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
@@ -1,5 +1,7 @@
 VERSION=systemd-197
 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
+LIBKMOD_VERSION="kmod-12"
+LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz"
 REQUIRED_DEPENDENCIES="	intltool
 			gperf
 			dbus
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index ef9c32a7..5f614bb3 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -12,9 +12,10 @@
 # First script for initial ramfs for OpenSLX linux stateless clients
 #############################################################################
 
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/openslx/bin:/openslx/sbin
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export LD_LIBRARY_PATH=/usr/lib64
 
+
 mount -n -t tmpfs -o 'mode=755' run "/run"
 
 # mount the important standard directories
@@ -28,6 +29,7 @@ echo "/sbin/mdev" > /proc/sys/kernel/hotplug
 ( hwinfo --netcard > /etc/netcard ) &
 
 # read kernel command line for debugging switch
+DEBUG=0
 read KCL < /proc/cmdline
 export KCL
 for opts in ${KCL}; do
@@ -49,9 +51,6 @@ done
 
 while ps | grep -v grep | grep -q "  hwinfo --gfxcard" ; do usleep 10 ; done
 
-# always load framebuffer
-modprobe uvesafb  mode_option=1024x768-32 mtrr=3 scroll=ywrap
-
 case $(cat /etc/hwinfo) in
 	*i915*)
 	 	modprobe -a i915 2>/dev/null
@@ -69,6 +68,7 @@ case $(cat /etc/hwinfo) in
 	        modprobe -q mga 2>/dev/null
 	        ;;
 	*VMWARE*)
+		modprobe -q uvesafb mode_option=1024x768-32 mtrr=3 scroll=ywrap 2>/dev/null
 		modprove -q vmwgfx 2>/dev/null
 		;;
 	*)
@@ -77,7 +77,7 @@ case $(cat /etc/hwinfo) in
 esac
 (modprobe -a drm; mdev -s ) &
 
-if [ "x$SPLASH" == "x1" ]; then
+if [ "x$SPLASH" == "x1" -a "x$DEBUG" != "x1" ]; then
 	# start plymouth
 	plymouthd && plymouth show-splash
 fi
@@ -98,7 +98,6 @@ fi
 # setup network
 nwif="eth0"
 # set up loopback networking
-[ $DEBUGLEVEL -eq 20 ] && echo "** starting ip config at $(sysup)"
 ip link set dev lo up 2>/dev/null
 ip addr add 127.0.0.1/8 dev lo 2>/dev/null
 ip link set dev $nwif up  2>/dev/null || { echo "No link for $nwif, dropping to shell.."; setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'; }
@@ -163,6 +162,6 @@ for mnt in proc sys run ; do
 done
 
 unset BOOT_IMAGE initrd
-[ "x$SPLASH" = "x1" ] && plymouth update-root-fs --new-root-dir=/mnt
+[ "x$SPLASH" == "x1" -a "x$DEBUG" != "x1" ] && plymouth update-root-fs --new-root-dir=/mnt
 # new style of pivoting (switch_root or run-init)
 exec /sbin/switch_root -c /dev/console /mnt /usr/lib/systemd/systemd
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
index e5e45312..e660b0ff 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.build
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
@@ -23,6 +23,10 @@ post_copy() {
         copy_kernel_modules
         generate_modules_map_files
         copy_firmware
+
+	# copy busybox that has been under /openslx back to /
+	cp -r "${TARGET_BUILD_DIR}"/openslx/* "${TARGET_BUILD_DIR}"
+	#rm -rf "${TARGET_BUILD_DIR}/openslx"
 }
 
 #
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
index ea9fd580..422f9b43 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
@@ -1,3 +1,4 @@
+REQUIRED_MODULES="		busybox"
 REQUIRED_BINARIES="		v86d"
 REQUIRED_KERNEL_MODULES="	kernel/drivers/video/sis/sisfb.ko
 				kernel/drivers/video/via/viafb.ko
diff --git a/remote/setup_target b/remote/setup_target
index c5566fc2..e7370b1b 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -36,13 +36,11 @@ copy_kernel() {
 }
 
 read_config () {
-	unset REQUIRED_BINARIES
-	unset REQUIRED_LIBRARIES
-	unset REQUIRED_DIRECTORIES
-	unset REQUIRED_FILES
-	unset REQUIRED_MODULES
-	unset REQUIRED_PACKAGES
-	unset REQUIRED_DEPENDENCIES
+
+	# unset previous variables from other config files
+	for VARNAME in "${!REQUIRED_*}"; do
+		unset $VARNAME
+	done
 
 	local MODULE_CONFIG="${MODULE_DIR}/${MODULE}.conf"
 
@@ -65,7 +63,8 @@ read_build () {
 	. "${BUILD_SCRIPT}" || perror "Sourcing '${BUILD_SCRIPT}' failed."
 }
 
-copyfileswithdependencies () {
+
+copy_files_with_deps () {
 
 	[ ! -d $MODULE_BUILD_DIR ] && pinfo "No build directory found, skipping dependency copying" && return 0
 	cd $MODULE_BUILD_DIR
@@ -208,7 +207,6 @@ process_module() {
 		if [ ! -z "$REQUIRED_MODULES" ]; then
 			pinfo "$MODULE depends on ${REQUIRED_MODULES}...."
 			for DEP in $REQUIRED_MODULES; do
-				#[[ "$DESIRED_MODULES" != *"!${DEP}!"* ]] && perror "$TOOL has dependency $DEP, but $DEP is not in current profile."
 				process_module "$DEP"
 			done
 			# Read old config again, as it got overwritten by the deps
@@ -227,7 +225,9 @@ process_module() {
 		# remove *.la files as they might confuse libtool/linker of other tool packages
 		find "${MODULE_DIR}/build" -name '*.la' -exec rm -f {} \;
 		pinfo "## Copying files with dependencies"
-		copyfileswithdependencies
+		copy_files_with_deps
+		pinfo "## Copying static module files"
+		copy_static_data
 		pinfo "## Post copy"
 		post_copy
 
diff --git a/remote/targets/stage3.1/busybox b/remote/targets/stage31/busybox
index 4f45cedf..4f45cedf 120000
--- a/remote/targets/stage3.1/busybox
+++ b/remote/targets/stage31/busybox
diff --git a/remote/targets/stage3.1/debug b/remote/targets/stage31/debug
index c05237d6..c05237d6 120000
--- a/remote/targets/stage3.1/debug
+++ b/remote/targets/stage31/debug
diff --git a/remote/targets/stage3.1/hwinfo b/remote/targets/stage31/hwinfo
index 6007a018..6007a018 120000
--- a/remote/targets/stage3.1/hwinfo
+++ b/remote/targets/stage31/hwinfo
diff --git a/remote/targets/stage3.1/plymouth b/remote/targets/stage31/plymouth
index 66a16832..66a16832 120000
--- a/remote/targets/stage3.1/plymouth
+++ b/remote/targets/stage31/plymouth
diff --git a/remote/targets/stage3.1/rootfs-stage31 b/remote/targets/stage31/rootfs-stage31
index 05a91970..05a91970 120000
--- a/remote/targets/stage3.1/rootfs-stage31
+++ b/remote/targets/stage31/rootfs-stage31
diff --git a/remote/targets/stage3.2/busybox b/remote/targets/stage32/busybox
index 4f45cedf..4f45cedf 120000
--- a/remote/targets/stage3.2/busybox
+++ b/remote/targets/stage32/busybox
diff --git a/remote/targets/stage3.2/consolekit b/remote/targets/stage32/consolekit
index 261968c7..261968c7 120000
--- a/remote/targets/stage3.2/consolekit
+++ b/remote/targets/stage32/consolekit
diff --git a/remote/targets/stage3.2/dbus b/remote/targets/stage32/dbus
index dd148715..dd148715 120000
--- a/remote/targets/stage3.2/dbus
+++ b/remote/targets/stage32/dbus
diff --git a/remote/targets/stage3.2/debug b/remote/targets/stage32/debug
index c05237d6..c05237d6 120000
--- a/remote/targets/stage3.2/debug
+++ b/remote/targets/stage32/debug
diff --git a/remote/targets/stage3.2/kdm b/remote/targets/stage32/kdm
index 727ed5b5..727ed5b5 120000
--- a/remote/targets/stage3.2/kdm
+++ b/remote/targets/stage32/kdm
diff --git a/remote/targets/stage3.2/plymouth b/remote/targets/stage32/plymouth
index 66a16832..66a16832 120000
--- a/remote/targets/stage3.2/plymouth
+++ b/remote/targets/stage32/plymouth
diff --git a/remote/targets/stage3.2/policykit b/remote/targets/stage32/policykit
index 39b77c7f..39b77c7f 120000
--- a/remote/targets/stage3.2/policykit
+++ b/remote/targets/stage32/policykit
diff --git a/remote/targets/stage3.2/rootfs-stage32 b/remote/targets/stage32/rootfs-stage32
index 96dcbb86..96dcbb86 120000
--- a/remote/targets/stage3.2/rootfs-stage32
+++ b/remote/targets/stage32/rootfs-stage32
diff --git a/remote/targets/stage3.2/rsyslogd b/remote/targets/stage32/rsyslogd
index 339d02f8..339d02f8 120000
--- a/remote/targets/stage3.2/rsyslogd
+++ b/remote/targets/stage32/rsyslogd
diff --git a/remote/targets/stage3.2/sshd b/remote/targets/stage32/sshd
index 56b4e4b5..56b4e4b5 120000
--- a/remote/targets/stage3.2/sshd
+++ b/remote/targets/stage32/sshd
diff --git a/remote/targets/stage3.2/systemd b/remote/targets/stage32/systemd
index 2dc58bd3..2dc58bd3 120000
--- a/remote/targets/stage3.2/systemd
+++ b/remote/targets/stage32/systemd
diff --git a/remote/targets/stage3.2/xorg b/remote/targets/stage32/xorg
index a9494860..a9494860 120000
--- a/remote/targets/stage3.2/xorg
+++ b/remote/targets/stage32/xorg