--- elwix/build_tools.sh	2013/07/21 16:50:58	1.5.2.2
+++ elwix/build_tools.sh	2014/01/17 01:11:52	1.6.6.5
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_tools.sh,v 1.5.2.2 2013/07/21 16:50:58 misho Exp $
+# $Id: build_tools.sh,v 1.6.6.5 2014/01/17 01:11:52 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -16,11 +16,13 @@ if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then
 	exit 1
 fi
 V=${VERSION}
-[ -r ${CENV} ] && . ${CENV}
+#[ -r ${CENV} ] && . ${CENV}
 unset INSTALL
 unset VERSION
 VERSION="$V"
 
+# Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
+X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
 
 if [ ! -d $BSDSRC ]; then
 	echo
@@ -120,82 +122,89 @@ compile_fbsdtools()
 
 	cd $CROSS_FT_VIMAGE
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		clean DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		install DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
 	cd -
 
 	cd $CROSS_FT_ATH
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		clean DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		install DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
 	cd -
 
 	cd $CROSS_FT_IPW
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		clean DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		install DESTDIR=${WORLD}/usr/local/bin
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install
 	cd -
 
 	cd $CROSS_FT_IWI
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		clean DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		install DESTDIR=${WORLD}/usr/local/bin
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install
 	cd -
 
 	cd $CROSS_FT_MWL
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		clean DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		install DESTDIR=${WORLD}
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
 	cd -
 
 #	cd $CROSS_FT_NET80211
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		clean DESTDIR=${WORLD}
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		DESTDIR=${WORLD}
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		install DESTDIR=${WORLD}
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
 #	cd -
 
 #	cd $CROSS_FT_WTAP
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		clean DESTDIR=${WORLD}
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		DESTDIR=${WORLD}
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		install DESTDIR=${WORLD}
+#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
 #	cd -
 }
 
 compile_files()
 {
 	cd files
-	env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \
-		TARGET_ARCH=${TARGET_ARCH} clean DESTDIR=${WORLD}
-	env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \
-		TARGET_ARCH=${TARGET_ARCH} obj depend DESTDIR=${WORLD}
-	env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \
-		TARGET_ARCH=${TARGET_ARCH} DESTDIR=${WORLD}
-	env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \
-		TARGET_ARCH=${TARGET_ARCH} install DESTDIR=${WORLD}
+	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
+		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
+	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
+		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} obj
+	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
+		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} depend 
+	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
+		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
+	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
+		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install 
 	cd -
 
-#	strip -s ${WORLD}/usr/bin/csh
+	strip -s ${WORLD}/usr/bin/csh
 }
 
 compile_tools()
@@ -308,11 +317,44 @@ compile_tools()
 	cd -
 }
 
+install_tools()
+{
+	LIBS="${ROMFS_USR2}/lib"
+	LIBEXEC="${ROMFS_USR2}/libexec"
+	BIN="${ROMFS_USR2}/bin"
+	SBIN="${ROMFS_USR2}/sbin"
+	ETC="${ROMFS_USR2}/etc"
+
+	echo "+++ Install ELWIX RomFS secondary firmware ..."
+
+	StripFiles \*.so\* ${PKG}/lib
+	InstallFiles \*.so\* ${PKG}/lib $LIBS
+	StripFiles \* ${PKG}/libexec
+	InstallFiles \* ${PKG}/libexec $LIBEXEC
+	StripFiles \* ${PKG}/bin
+	InstallFiles \* ${PKG}/bin $BIN
+	StripFiles \* ${PKG}/sbin
+	InstallFiles \* ${PKG}/sbin $SBIN
+
+	InstallFiles \* ${PKG}/etc $ETC
+
+	chown -R root:wheel $SBIN $BIN $LIBDATA $LIBEXEC $LIBS
+}
+
+build_tools()
+{
+	echo "+++ Build ELWIX core firmware image ..."
+
+	cd ${WORLD}/usr/local
+	pax -w -z -v -f${REL}/${LOCALFS_IMG} .
+	cd -
+}
+
 ### main()
 if ! SnitVer ${WORLD}/elwix/elwix.ver; then
 	compile_deps || exit 1
-	clean_bootstrap
-	compile_bootstrap || exit 1
+#	clean_bootstrap
+#	compile_bootstrap || exit 1
 
 	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
 else
@@ -324,6 +366,7 @@ if ! SnitVer ${WORLD}/usr/local/elwix.ver; then
 	compile_fbsdtools
 	compile_files
 	compile_tools
+	build_tools
 
 	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver
 else