xorg & ldm

7 files changed, 75 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 8faa9aaf..e5d7b671 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *~
+*.swp
 server/stage3.1
 stage3.2
 initramfs
diff --git a/remote/.setup_tools.swp b/remote/.setup_tools.swp
index c2db4851..0fc6deed 100644
--- a/remote/.setup_tools.swp
+++ b/remote/.setup_tools.swp
diff --git a/remote/setup_tools b/remote/setup_tools
index f04f082c..ebfb1995 100755
--- a/remote/setup_tools
+++ b/remote/setup_tools
@@ -95,8 +95,43 @@ copyfileswithdependencies ()
 		done
 	done
 
-	echo "Copying required directories and files from config file..."
-	for ENTRY in ${REQUIRED_DIRECTORIES} ${REQUIRED_FILES}
+	echo "Copying required directories from config file..."
+	for ENTRY in ${REQUIRED_DIRECTORIES}
+	do
+		echo ".${ENTRY}" >> ${COPYFILES_LIST}
+		for LIB in $(find .${ENTRY} -type f | xargs grep -l ELF)
+		do 
+			for i in $(ldd ${LIB} |awk '{print $1 $2 $3}'|grep -v ld-linux|grep -v libc.so*|grep -v linux-gate)
+			do
+				arrIN=(${i//=>/ })
+				echo "--------------------------------------------------------"
+				echo "Searching ${arrIN[0]} under $(pwd)..."
+				LOCAL_MATCHES=$(find . -name $(echo ${arrIN[0]}|awk -F "." '{print $1}').*)
+				if [ "x${LOCAL_MATCHES}" != "x" ];
+				then
+					for llib in ${LOCAL_MATCHES};
+					do
+						echo "Copying ${llib}"
+						echo ${llib} >> ${COPYFILES_LIST}
+					done
+				else
+					echo "Did not found ${arrIN[0]} in $(pwd)"
+					if [ -e ${arrIN[1]} ];
+					then
+						echo -n "Trying ${arrIN[1]} ..."
+						echo " found! Copying."
+						echo ${arrIN[1]} >> ${COPYFILES_LIST}
+						[ -L ${arrIN[1]} ] && echo $(readlink -f ${arrIN[1]}) >> ${COPYFILES_LIST}
+					fi
+				fi
+			done
+			echo "Copied ${LIB}."
+			echo "-----------------------------------------------------------------"
+		done
+	done
+
+	echo "Copying required files from config file..."
+	for ENTRY in ${REQUIRED_FILES}
 	do
 		echo ".${ENTRY}" >> ${COPYFILES_LIST}
 	done
diff --git a/remote/tools/ldm/ldm.build b/remote/tools/ldm/ldm.build
new file mode 100644
index 00000000..f8860806
--- /dev/null
+++ b/remote/tools/ldm/ldm.build
@@ -0,0 +1,27 @@
+#tool/distro specific functions for fetching, building and installing dependencies
+
+fetch_source () {
+	if [ ! -e .fetched_source ]; then
+ 		[ ! -d src ] && mkdir src
+		wget $URL
+		tar xfz $VERSION.tar.gz -C src/
+		rm $VERSION.tar.gz
+		touch .fetched_source
+	fi
+}	
+
+install_dependencies() {
+	apt-get install -y $DEPS
+}
+
+build () {
+	if [ ! -e .built ]; then
+		cd src/$VERSION
+		./configure --prefix=/
+		make 
+		[ ! -d $TOOL_DIR/$TOOL/build ] && mkdir -p $TOOL_DIR/$TOOL/build
+		DESTDIR=$TOOL_DIR/$TOOL/build make install
+		cd -
+	touch .built
+	fi
+}
diff --git a/remote/tools/ldm/ldm.conf b/remote/tools/ldm/ldm.conf
new file mode 100644
index 00000000..d1dc4eff
--- /dev/null
+++ b/remote/tools/ldm/ldm.conf
@@ -0,0 +1,7 @@
+VERSION=lightdm-1.4.0
+URL=https://launchpad.net/lightdm/1.4/1.4.0/+download/lightdm-1.4.0.tar.gz
+DEPS="libpam-dev itstool liblightdm-gobject-1-dev"
+REQUIRED_BINARIES="dm-tool lightdm gdmflexiserver lightdm-guest-session-wrapper lightdm-set-defaults"
+REQUIRED_DIRECTORIES="/etc /lib"
+REQUIRED_FILES="
+
diff --git a/remote/tools/xorg/xorg.build b/remote/tools/xorg/xorg.build
index 4f8e950d..800e243d 100644
--- a/remote/tools/xorg/xorg.build
+++ b/remote/tools/xorg/xorg.build
@@ -30,5 +30,6 @@ build() {
 }
 
 post_copy() {
-	:
+	[ ! -d $INIT_DIR/etc/X11 ] && mkdir -p $INIT_DIR/etc/X11
+	ln -s $INIT_DIR/usr/bin/Xorg $INIT_DIR/etc/X11/X
 }
diff --git a/remote/tools/xorg/xorg.conf b/remote/tools/xorg/xorg.conf
index db547648..84f8b5bb 100644
--- a/remote/tools/xorg/xorg.conf
+++ b/remote/tools/xorg/xorg.conf
@@ -22,6 +22,6 @@ REQUIRED_PACKAGES=" xserver-xorg
 					xserver-xorg-video-nouveau        
 					xserver-xorg-video-s3             
 					xserver-xorg-video-tdfx"   
-REQUIRED_BINARIES="	Xorg vmwarectrl gtf cvt X"
+REQUIRED_BINARIES="	Xorg vmwarectrl gtf cvt X "
 REQUIRED_DIRECTORIES="/lib/udev /usr/lib /usr/share/X11/xorg.conf.d"
 REQUIRED_FILES=""