--- elwix/build_rootfs.sh	2014/01/17 11:23:12	1.8.2.4
+++ elwix/build_rootfs.sh	2014/06/26 01:02:42	1.8.2.5
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_rootfs.sh,v 1.8.2.4 2014/01/17 11:23:12 misho Exp $
+# $Id: build_rootfs.sh,v 1.8.2.5 2014/06/26 01:02:42 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -76,6 +76,7 @@ srcdirs ${BSDSRC}/secure/usr.bin ${BSDSRC}/secure/usr.
 
 buildopts TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}
 buildopts -DNO_PAM -DNO_KERBEROS WITHOUT_PAM_SUPPORT=yes WITHOUT_KERBEROS_SUPPORT=yes WITHOUT_KERBEROS=yes
+buildopts -DMK_CASPER=no WITHOUT_CASPER=yes
 _EOF
 	cat $CFGDIR/$ROOTFS_CONF >>$ROOTFS_CONF
 
@@ -83,6 +84,9 @@ _EOF
 	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix crunchgen -f \
 		-h $ROOTFS_MKDIR/$MKH -m $MKF \
 		-c elwix.c -e elwix $ROOTFS_CONF
+	if [ $? -ne 0 ]; then
+		exit 1
+	fi
 	cd -
 }
 
@@ -90,10 +94,10 @@ build_elwix()
 {
 	echo "+++ Build ELWIX RootFS firmware ..."
 	cd $ROOTFS_MKDIR
-	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix ${CBUILD} -f $MKF \
+	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} clean
-	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix ${CBUILD} -f $MKF \
+	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}
 	if [ $? -ne 0 ]; then
@@ -398,15 +402,14 @@ install_image()
 ### main()
 if SnitVer ${WORLD}/elwix.ver; then
 	clean_elwix
-	prepare_elwix
-	build_elwix
-	exit 1
+	prepare_elwix || exit 1
+	build_elwix || exit 1
 
-	build_rootdir
-	install_rootfs
+	build_rootdir || exit 1
+	install_rootfs || exit 1
 
-	build_image
-	install_image
+	build_image || exit 1
+	install_image || exit 1
 else
 	echo "$? Skipped ELWIX RootFS build ..."
 fi