[Lunar-commits] r18500 - lunar-iso/trunk/scripts

[Auke Kok]

Author: sofar
Date: 2006-02-03 20:11:31 +0000 (Fri, 03 Feb 2006)
New Revision: 18500

Modified:
   lunar-iso/trunk/scripts/kernels
Log:
add some explicit exits, reformats

Modified: lunar-iso/trunk/scripts/kernels
===================================================================
--- lunar-iso/trunk/scripts/kernels	2006-02-03 20:09:55 UTC (rev 18499)
+++ lunar-iso/trunk/scripts/kernels	2006-02-03 20:11:31 UTC (rev 18500)
@@ -20,7 +20,7 @@
 				cd .. &&
 				mv linux-$ISO_KVER linux-$ISO_PVER &&
 				# assume KVER is now PVER !
-				export VERSION=$ISO_PVER
+				export VERSION=$ISO_PVER || exit 1
 			fi
 		fi
 	fi
@@ -28,7 +28,7 @@
 		mkdir -p $ISO_SOURCE/kernels/patches &&
 		cd $ISO_SOURCE/kernels/patches &&
 		tar jxf $ISO_SOURCE/spool/lunar/ll-$ISO_PVER.tar.bz2 &&
-		cd $ISO_SOURCE/kernels
+		cd $ISO_SOURCE/kernels || exit 1
 	fi
 	cd $ISO_SOURCE/kernels/linux-$VERSION
 }
@@ -86,7 +86,7 @@
 	cd $ISO_SOURCE/kernels/linux-$VERSION
 	yes n | make oldconfig &&
 	if [ "${ISO_KSUFFIX}" = "2.4" ]; then
-		make dep
+		make dep || exit 1
 	fi &&
 	make ${ISO_MAKES:+-j$ISO_MAKES} bzImage &&
 	make ${ISO_MAKES:+-j$ISO_MAKES} modules &&
@@ -95,16 +95,12 @@
 	if [ -n "$2" ]; then
 		# we need them on the iso later too
 		tar cjf $ISO_SOURCE/kernels/$2-modules.tar.bz2 -C $ISO_SOURCE/kernels/BUILD lib/modules &&
-		tar xj -C $ISO_TARGET -f $ISO_SOURCE/kernels/$2-modules.tar.bz2
+		tar xj -C $ISO_TARGET -f $ISO_SOURCE/kernels/$2-modules.tar.bz2 &&
+		cp arch/i386/boot/bzImage $ISO_SOURCE/kernels/$2 &&
+		cp System.map $ISO_SOURCE/kernels/$2.map || exit 1
 	fi
 	cp arch/i386/boot/bzImage $ISO_SOURCE/kernels/BUILD/boot/$VERSION$1 &&
-	if [ -n "$2" ]; then
-	  cp arch/i386/boot/bzImage $ISO_SOURCE/kernels/$2
-	fi
 	cp System.map $ISO_SOURCE/kernels/BUILD/boot/System.map-$VERSION$1 &&
-	if [ -n "$2" ]; then
-	  cp System.map $ISO_SOURCE/kernels/$2.map
-	fi
 	cp .config $ISO_SOURCE/kernels/BUILD/boot/config-$VERSION$1 &&
 	gzip $ISO_SOURCE/kernels/BUILD/boot/config-$VERSION$1 &&
 	# cp -aL $ISO_SOURCE/kernels/linux-$VERSION/include/asm $ISO_SOURCE/kernels/BUILD/usr/include/linux-$VERSION$1/asm
@@ -116,7 +112,7 @@
 	tar cjf $ISO_SOURCE/kernels/TAR/$VERSION$1.tar.bz2 boot/ lib/ &&
 	cd $ISO_SOURCE/kernels &&
 	rm -rf $ISO_SOURCE/kernels/BUILD &&
-	rm -rf $ISO_SOURCE/kernels/linux-$VERSION
+	rm -rf $ISO_SOURCE/kernels/linux-$VERSION || exit 1
 }
 
 build()
@@ -125,7 +121,7 @@
 	prepare_patch $(echo $3)
 	prepare_options $(echo $2)
 	prepare_version "$1"
-	build_kernel $1 $5
+	build_kernel "$1" "$5"
 	echo "$VERSION$1:$4" >> $ISO_SOURCE/kernels/.kernels-tmp
 	if [ -n "$5" ]; then
 		echo "$5 $VERSION$1" >> $ISO_SOURCE/kernels/.initrd_kernels-tmp