From 888b7582ad1cbe20248c27b4123e226348ef6b3f Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Thu, 19 May 2011 10:43:27 +0200
Subject: env fixes ..

---
 bin/build.initramfs.sh |  3 +++
 config/setup.conf      |  2 +-
 inc/functions.env.sh   | 19 +++++++++++--------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/bin/build.initramfs.sh b/bin/build.initramfs.sh
index e55d186..5c09790 100755
--- a/bin/build.initramfs.sh
+++ b/bin/build.initramfs.sh
@@ -2,6 +2,9 @@
 
 ROOT_DIR=$(readlink -f $(dirname $(readlink -f $0))/..)
 
+SYSLINUX=${ROOT_DIR}/contrib/syslinux/latest
+[ ! -f ${SYSLINUX}/Makefile ] && $ROOT_DIR/bin/env.setup-syslinux.sh
+
 cd ${ROOT_DIR}/build/rootfs
 echo -e "[build-initramfs] \t Create initramfs."
 find . | cpio --quiet -H newc -o > ../initramfs-default.cpio
diff --git a/config/setup.conf b/config/setup.conf
index e2adf31..5234371 100644
--- a/config/setup.conf
+++ b/config/setup.conf
@@ -1,4 +1,4 @@
-kernel_version=2.6.38.3
+kernel_version=2.6.39
 kernel_url=http://www.kernel.org/pub/linux/kernel/v2.6/linux-${kernel_version}.tar.bz2
 syslinux_use_testing=0
 syslinux_stable_version=syslinux-4.04
diff --git a/inc/functions.env.sh b/inc/functions.env.sh
index 56cc49c..ab36fb7 100644
--- a/inc/functions.env.sh
+++ b/inc/functions.env.sh
@@ -101,14 +101,17 @@ read_params() {
 
 
 run () {
-	set_quiet
+	#set_quiet
+
+	if [ "x$CLEAN" = "x1" ]; then
+		[ "x$TARGET_INIT" = "x1" ] && rm -rf $ROOT_DIR/contrib/syslinux/sys*
+		[ "x$TARGET_KERNEL" = "x1" ] && rm -rf $ROOT_DIR/build/linux-*
+	fi
 	
-	pre_start_cleanup
-	setup_dir_structure	
-	copy_files
-	create_iso
+	[ "x$TARGET_KERNEL" = "x1" ] && $ROOT_DIR/bin/build.kernel.sh
+	[ "x$TARGET_INIT" = "x1" ] && $ROOT_DIR/bin/build.initramfs.sh
 	
-	unset_quiet
+	#unset_quiet
 	
-	pinfo "FINISHED: ISO can be found here: $ROOT_DIR/openslx.iso!"	
-}
\ No newline at end of file
+	pinfo "FINISHED"	
+}
-- 
cgit v1.2.3-55-g7522