--- elwix/build_tools.sh	2013/05/07 20:46:47	1.5
+++ elwix/build_tools.sh	2013/08/05 13:10:16	1.6
@@ -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 2013/05/07 20:46:47 misho Exp $
+# $Id: build_tools.sh,v 1.6 2013/08/05 13:10:16 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -21,6 +21,7 @@ unset INSTALL
 unset VERSION
 VERSION="$V"
 
+
 if [ ! -d $BSDSRC ]; then
 	echo
 	echo "ELWIX project is not configured - missing BSD sources !?!"
@@ -53,9 +54,9 @@ clean_bootstrap()
 {
 	echo "+++ Clean ELWIX pkgsrc bootstrap tools ..."
 
-	rm -rf ${WORLD}/usr/pkgsrc/bootstrap/work
+	rm -Rf ${WORLD}/usr/pkgsrc/bootstrap/work
 	rm -f /elwix ${WORLD}/usr/pkgsrc
-	rm -rf ${WORLD}/elwix
+	rm -Rf ${WORLD}/elwix
 	install -d ${WORLD}/elwix
 	ln -sf ${WORLD}/elwix /elwix
 	ln -sf ${PKGSRC} ${WORLD}/usr/pkgsrc
@@ -65,11 +66,26 @@ clean_bootstrap()
 	install -d ${PKGDIR}/etc
 }
 
+compile_deps()
+{
+	echo "+++ Compile ELWIX programs bootstrap tools ..."
+	if [ -d tools -a -f tools/Makefile ]; then
+		cd tools
+		make cleandepend
+		make clean
+		make obj
+		make
+		make install
+		cd -
+	fi
+}
+
 compile_bootstrap()
 {
 	echo "+++ Compile ELWIX pkgsrc bootstrap tools ..."
 	if [ ! -d ${WORLD}/usr/pkgsrc/bootstrap/work ]; then
 		cd ${WORLD}/usr/pkgsrc/bootstrap
+		./cleanup --prefix /elwix/pkg --pkgdbdir /elwix/pkg/db 
 		./bootstrap --prefix /elwix/pkg --pkgdbdir /elwix/pkg/db
 		cd -
 	else
@@ -96,8 +112,6 @@ USE_NATIVE_GCC=		yes
 
 .endif			# end cross-compilation settings
 _EOF
-
-	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
 }
 
 compile_fbsdtools()
@@ -149,14 +163,14 @@ compile_fbsdtools()
 		install DESTDIR=${WORLD}
 	cd -
 
-	cd $CROSS_FT_NET80211
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		clean DESTDIR=${WORLD}
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		DESTDIR=${WORLD}
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		install DESTDIR=${WORLD}
-	cd -
+#	cd $CROSS_FT_NET80211
+#	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+#		clean DESTDIR=${WORLD}
+#	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+#		DESTDIR=${WORLD}
+#	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+#		install DESTDIR=${WORLD}
+#	cd -
 
 #	cd $CROSS_FT_WTAP
 #	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
@@ -216,15 +230,15 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_AITRPC
-	${AITRPC_CFG}
+	cd $CROSS_AITSCHED
+	${AITSCHED_CFG}
 	${CBUILD} clean
 	${CBUILD}
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_AITSCHED
-	${AITSCHED_CFG}
+	cd $CROSS_AITRPC
+	${AITRPC_CFG}
 	${CBUILD} clean
 	${CBUILD}
 	${CBUILD} install
@@ -286,13 +300,54 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver
+	cd $CROSS_WIFINATOR
+	${WIFINATOR_CFG}
+	${CBUILD} clean
+	${CBUILD}
+	${CBUILD} install
+	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
+	compile_bootstrap || exit 1
+
+	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
 else
 	echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
 fi
@@ -302,6 +357,9 @@ 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
 	echo "Skipped ELWIX tools build ..."
 fi