--- elwix/build_tools.sh	2013/08/02 14:46:04	1.5.2.3
+++ elwix/build_tools.sh	2013/05/14 09:32:42	1.5.4.1
@@ -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.3 2013/08/02 14:46:04 misho Exp $
+# $Id: build_tools.sh,v 1.5.4.1 2013/05/14 09:32:42 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -15,13 +15,7 @@ if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then
 	echo
 	exit 1
 fi
-V=${VERSION}
-[ -r ${CENV} ] && . ${CENV}
-unset INSTALL
-unset VERSION
-VERSION="$V"
 
-
 if [ ! -d $BSDSRC ]; then
 	echo
 	echo "ELWIX project is not configured - missing BSD sources !?!"
@@ -69,15 +63,12 @@ clean_bootstrap()
 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
+	cd tools
+	make obj
+	make depend
+	make
+	make install
+	cd -
 }
 
 compile_bootstrap()
@@ -112,6 +103,8 @@ 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()
@@ -163,14 +156,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} \
@@ -202,12 +195,12 @@ compile_tools()
 {
 	echo "+++ Compile ELWIX Cross ..."
 
-	cd $CROSS_AXL
-	${AXL_CFG}
-	${CBUILD} clean
-	${CBUILD}
-	${CBUILD} install
-	cd -
+#	cd $CROSS_AXL
+#	${AXL_CFG}
+#	${CBUILD} clean
+#	${CBUILD}
+#	${CBUILD} install
+#	cd -
 
 	cd $CROSS_ELWIX
 	${ELWIX_CFG}
@@ -300,66 +293,29 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_WIFINATOR
-	${WIFINATOR_CFG}
-	${CBUILD} clean
-	${CBUILD}
-	${CBUILD} install
-	cd -
+#	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver
 }
 
-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
-
-	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
+#	clean_bootstrap
+#	compile_bootstrap || exit 1
 else
 	echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
 fi
 
+V=${VERSION}
+[ -r ${CENV} ] && . ${CENV}
+unset INSTALL
+unset VERSION
+VERSION="$V"
+
 if ! SnitVer ${WORLD}/usr/local/elwix.ver; then
 	clean_tools
 	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