Minor fixes to 'clean' script.

Changed the 'build' script to use ../${TYPE}/conf/Makefile in order to
have true dependency of kernel image on the kernel config file.

2 files changed, 8 insertions, 24 deletions

diff --git a/release/picobsd/build/build b/release/picobsd/build/build
index 72bb305..6281b86 100755
--- a/release/picobsd/build/build
+++ b/release/picobsd/build/build
@@ -1,7 +1,7 @@
 #!/bin/sh -
 
 #
-#	$Id: build,v 1.8 1998/08/10 19:06:48 abial Exp $
+#	$Id: build,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 #
 
 # You can set the SRC variable which points to your source tree. It's
@@ -33,15 +33,9 @@ set -e
 
 build_kernel() {
 	echo ""
-	echo "-> We must make the PICOBSD${suffix}.${SIZE} kernel first..."
-	pwd=`pwd`
-	cat ../${TYPE}/conf/PICOBSD | grep -v "MFS_ROOT">${CONF}/PICOBSD${suffix}.${SIZE}
-	echo "options	\"MFS_ROOT=${SIZE}\"" >>${CONF}/PICOBSD${suffix}.${SIZE}
-	cd ${CONF}
-	config PICOBSD${suffix}.${SIZE}
-	cd ../../compile/PICOBSD${suffix}.${SIZE}
-	make depend && make
-	cd ${pwd}
+	echo "-> Checking if we have to build the PICOBSD kernel..."
+	(cd ../${TYPE}/conf; make)
+	echo ""
 }
 
 # Main build procedure. It calls other scripts (stage1-3 and populate)
@@ -64,8 +58,6 @@ then
 	suffix="-R"
 fi
 
-CONF="${SRC}/sys/i386/conf"
-
 clear
 echo "-> Building with following parameters:"
 echo -n "	Type:     ${TYPE}"
@@ -85,15 +77,8 @@ echo ""
 echo ""
 sleep 2
 
-# Now check if we must build the kernel first
-
-if [ ! -f ${SRC}/sys/i386/conf/PICOBSD${suffix}.${SIZE} ]
-then
-	build_kernel
-elif [ ! -f ${SRC}/sys/compile/PICOBSD${suffix}.${SIZE}/kernel ]
-then
-	build_kernel
-fi
+# Build the kernel, if necessary
+build_kernel
 
 export SIZE LANGUAGE TYPE SRC RELENG_2_2 INIT
 
diff --git a/release/picobsd/build/clean b/release/picobsd/build/clean
index d02371b..17cbbb9 100755
--- a/release/picobsd/build/clean
+++ b/release/picobsd/build/clean
@@ -1,7 +1,7 @@
 #! /bin/sh -
 
 #
-#	$Id: clean,v 1.7 1998/08/19 07:05:23 abial Exp $
+#	$Id: clean,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 #
 set -e
 
@@ -20,14 +20,13 @@ fi
 
 rm -f kernel kernel.kz fs.PICOBSD picobsd.bin *.o *core *.db
 rm -f picobsd.bin
-rm -f build.status
 cd ..
 for j in $list
 do
 	echo "===================== $0 $j started ======================"
 	for i in `ls -d tinyware/[a-z]*` tools/write_mfs_in_kernel tools/dumpnlist ${j}/crunch1
 	do
-		(cd ${i} && make clean && rm -f .depend)
+		(cd ${i} && make clean && make cleandepend)
 	done
 
 	echo "=============== $0 $j completed successfuly =============="