[Devil-linux-commit] build/scripts build.sh,1.74,1.75 prepare,1.39,1.40 settings,1.40,1.41

[<smi...@pr...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23727

Modified Files:
	build.sh prepare settings 
Log Message:
some more fixes for lates uname changes
uname now only gets modified when kernel version is available


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- build.sh	20 Jan 2004 01:59:45 -0000	1.74
+++ build.sh	23 Jan 2004 01:03:55 -0000	1.75
@@ -263,11 +263,13 @@
 
 				# fake uname to display another platform we want to compile the kernel for
 				# also make sure our kernel version is displayed
-				test -f /bin/uname.old || cp /bin/uname /bin/uname.old || exit 1
-				rm /bin/uname || exit 1
-				REALKERNEL=$(/bin/uname.old -r)
-				echo "uname.old \$* | sed -e 's/i.86/i$CONFIG_CPU/' | sed -e 's/$REALKERNEL/$KERNELVERSION/'" > /bin/uname || exit 1
-				chmod +x /bin/uname || exit 1
+				if [ -n "$KERNELVERSION" ]; then
+				    test -f /bin/uname.old || cp /bin/uname /bin/uname.old || exit 1
+				    rm /bin/uname || exit 1
+				    REALKERNEL=$(/bin/uname.old -r)
+				    echo "uname.old \$* | sed -e 's/i.86/i$CONFIG_CPU/' | sed -e 's/$REALKERNEL/$KERNELVERSION/'" > /bin/uname || exit 1
+				    chmod +x /bin/uname || exit 1
+				fi
 
 				LINK=${LINK##/*/}
 				SCRIPT=${LINK#S[0-9][0-9]}

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- prepare	21 Jan 2004 15:08:46 -0000	1.39
+++ prepare	23 Jan 2004 01:04:04 -0000	1.40
@@ -34,12 +34,6 @@
 case $1 in
     prepare )
 
-	# fake uname to display another platform we want to compile the kernel for
-	test -f /bin/uname.old || cp /bin/uname /bin/uname.old || exit 1
-	rm /bin/uname || exit 1
-	echo "uname.old \$* | sed -e 's/i.86/i$CONFIG_CPU/'" > /bin/uname || exit 1
-	chmod +x /bin/uname || exit 1
-
 	if [ -d /usr/include/linux ] && [ ! -L /usr/include/linux ]; then
 	    echo "ERROR"
 	    echo "/usr/include/linux found and is a directory"
@@ -71,7 +65,7 @@
 	if [ -e /usr/include/linux ]; then
 	    rm /usr/include/linux
 	fi
-
+	
 	ln -sf $KERNELDIR/include/linux /usr/include/linux || exit 1
 	ln -sf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1
 	ln -sf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1

Index: settings
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/settings,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- settings	11 Jan 2004 14:43:05 -0000	1.40
+++ settings	23 Jan 2004 01:04:18 -0000	1.41
@@ -21,6 +21,13 @@
 
 test -n "$PROFILE" && BUILD_CONFIG=$DL_DIR/scripts/configuration/profiles/$PROFILE
 
+if [ ! -s "$BUILD_CONFIG" ] && [ -z "$NOTLOAD_DEFAULTCONFIG" ]; then
+    echo "**************************************"
+    echo "*WARNING* no configuration file found!"
+    echo "**************************************"
+    sleep 1
+fi
+
 if [ -s "$BUILD_CONFIG" ] && [ -z "$NOTLOAD_DEFAULTCONFIG" ]; then
 	source $BUILD_CONFIG
 	if [ -z "$CONFIG_CPU" ]; then