--- elwix/build_rootfs.sh	2013/08/05 13:10:16	1.7
+++ elwix/build_rootfs.sh	2014/01/17 00:48:28	1.8.2.2
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_rootfs.sh,v 1.7 2013/08/05 13:10:16 misho Exp $
+# $Id: build_rootfs.sh,v 1.8.2.2 2014/01/17 00:48:28 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -35,6 +35,9 @@ NEWKERN="${REL}/${KRNNAME}"
 MKF="Makefile.elwix"
 MKH="Makefile.inc"
 
+# Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
+X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
+
 clean_elwix()
 {
 	echo "+++ Clean elwix binary from ELWIX World ..."
@@ -72,13 +75,14 @@ srcdirs ${BSDSRC}/usr.bin ${BSDSRC}/usr.sbin ${BSDSRC}
 srcdirs ${BSDSRC}/secure/usr.bin ${BSDSRC}/secure/usr.sbin ${BSDSRC}/secure/libexec
 
 buildopts -DNO_PAM -DNO_KERBEROS WITHOUT_PAM_SUPPORT=yes WITHOUT_KERBEROS_SUPPORT=yes WITHOUT_KERBEROS=yes
-buildopts TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} MAKEOBJDIRPREFIX=${BSDOBJ}/elwix
+buildopts TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} MAKEOBJDIRPREFIX=${BSDOBJ}/elwix
 _EOF
 	cat $CFGDIR/$ROOTFS_CONF >>$ROOTFS_CONF
 
 	. ${CENV}
 	install -d ${BSDOBJ}/elwix
-	crunchgen -f -o -p ${BSDOBJ}/elwix -h $ROOTFS_MKDIR/$MKH -m $MKF -c elwix.c -e elwix $ROOTFS_CONF
+	crunchgen -f -o -p ${BSDOBJ}/elwix -h $ROOTFS_MKDIR/$MKH -m $MKF \
+		-c elwix.c -e elwix $ROOTFS_CONF
 	cd -
 }
 
@@ -87,9 +91,12 @@ build_elwix()
 	echo "+++ Build ELWIX RootFS firmware ..."
 	cd $ROOTFS_MKDIR
 	. ${CENV}
-	MAKEOBJDIRPREFIX=${BSDOBJ}/elwix
-	make -f $MKF clean
-	make -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 make -f $MKF \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}
 	if [ $? -ne 0 ]; then
 		exit 1
 	fi
@@ -401,7 +408,7 @@ if SnitVer ${WORLD}/elwix.ver; then
 	build_image
 	install_image
 else
-	echo "Skipped ELWIX RootFS build ..."
+	echo "$? Skipped ELWIX RootFS build ..."
 fi
 
 echo "+++ Complete build ELWIX RootFS"