--- elwix/config/rc.elwix.amd64	2014/09/17 22:27:18	1.1.2.1
+++ elwix/config/rc.elwix.amd64	2017/01/19 00:31:40	1.1.2.5
@@ -3,18 +3,18 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.elwix.amd64,v 1.1.2.1 2014/09/17 22:27:18 misho Exp $
+# $Id: rc.elwix.amd64,v 1.1.2.5 2017/01/19 00:31:40 misho Exp $
 #
 ELWIX_IS_CONFIGURED="YES"
 
-VERSION="2.3_amd64"
+VERSION="2.5_amd64"
 PLATFORM="elwix"
 TIMEZONE="Europe/Sofia"
 BUILD_DATE=`date "+%Y-%m-%d"`
 
 TARGET="amd64"
 TARGET_ARCH="amd64"
-TARGET_BUILD="${TARGET_ARCH}-${PLATFORM}-freebsd"
+TARGET_BUILD="x86_64-${PLATFORM}-freebsd"
 PARALLEL_BUILD="-j2"
 
 CURDIR=$(pwd)
@@ -46,7 +46,7 @@ AIT="${ADIR}/${TARGET_ARCH}"
 BSDOBJ="${OBJS}/${TARGET_ARCH}"
 BSDTOOLS="${BSDSRC}/tools/tools"
 PKGDIR="${WORLD}/elwix/pkg"
-CROSSTOOLDIR="${BSDOBJ}/${BSDSRC}/tmp"
+CROSSTOOLDIR="${BSDOBJ}/${TARGET_ARCH}.${TARGET_ARCH}/${BSDSRC}/tmp"
 
 ### Kernel
 BSDKERNCONF="${BSDSRC}/sys/${TARGET}/conf"
@@ -74,7 +74,7 @@ ELWIX_ROOTFS="${CFGDIR}/elwix_rootfs.conf"
 ROOTFS_KERN="kernel_rootfs.gz"
 
 ROOTFS_IMG="rootfs.img"
-ROOTFS_SIZE="9120k"
+ROOTFS_SIZE="9600k"
 
 ### tools Firmware
 LOCALFS_IMG="elwix-pkg.frm"
@@ -103,11 +103,11 @@ BASE_OS="ELWIX-${VERSION}_base_64mb_${TARGET_ARCH}_${B
 ### FS Image
 FS="${DEST}/elwix.fs"
 FS_ETC="${CFGDIR}/etc/default"
-OS="ELWIX-${VERSION}_64mb_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
+OS="ELWIX-${VERSION}_rootfs_64mb_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
 
 FS_EXT="${DEST}/elwix_ext.fs"
 FS_EXT_ETC="${CFGDIR}/etc/default"
-OS_EXT="ELWIX-${VERSION}_ext_128mb_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
+OS_EXT="ELWIX-${VERSION}_rootfsext_128mb_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
 
 ### Make OS Image
 IMG_SIZE=62592
@@ -131,51 +131,35 @@ CROSS_FT_NET80211="${BSDTOOLS}/net80211"
 CROSS_FT_VIMAGE="${BSDTOOLS}/vimage"
 CROSS_FT_WTAP="${BSDTOOLS}/wtap"
 
-#CROSS_AXL="../gpl/axl"
-#AXL_CFG="./configure --disable-py-axl --prefix=${WORLD}/usr/local --build=${TARGET_BUILD}"
-##AXL_LIB="${CROSS_AXL}/src/.libs/libaxl.so.*"
-##AXL_LIB_NS="${CROSS_AXL}/ns/.libs/libaxl-ns.so.*"
-##AXL_LIB_BABEL="${CROSS_AXL}/babel/.libs/libaxl-babel.so.*"
-
 CROSS_ELWIX="../libelwix"
 ELWIX_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-#ELWIX_LIB_ELWIX="${CROSS_ELWIX}/lib/libelwix.so"
 
 CROSS_AITIO="../libaitio"
 AITIO_CFG="./configure --enable-aio --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-#ELWIX_LIB_AITIO="${CROSS_AITIO}/lib/libaitio.so"
 
 CROSS_AITCFG="../libaitcfg"
 AITCFG_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-#ELWIX_LIB_AITCFG="${CROSS_AITCFG}/lib/libaitcfg.so"
 
 CROSS_AITRPC="../libaitrpc"
 AITRPC_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-#ELWIX_LIB_AITRPC="${CROSS_AITRPC}/lib/libaitrpc.so"
 
 CROSS_AITSCHED="../libaitsched"
 AITSCHED_CFG="./configure --enable-aio --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-#ELWIX_LIB_AITSCHED="${CROSS_AITSCHED}/lib/libaitsched.so"
 
 CROSS_AITWWW="../libaitwww"
 AITWWW_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-#ELWIX_LIB_AITWWW="${CROSS_AITWWW}/lib/libaitwww.so"
 
 CROSS_AITPELCO="../libaitpelco"
 AITPELCO_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-#ELWIX_LIB_AITPELCO="${CROSS_AITPELCO}/lib/libaitpelco.so"
 
 CROSS_AITSYNC="../libaitsync"
 AITSYNC_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-#ELWIX_LIB_AITSYNC="${CROSS_AITSYNC}/lib/libaitsync.so"
 
 CROSS_AITCLI="../libaitcli"
 AITCLI_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-#ELWIX_LIB_AITCLI="${CROSS_AITCLI}/lib/libaitcli.so"
 
 CROSS_AITMQTT="../libaitmqtt"
 AITMQTT_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-#ELWIX_LIB_AITMQTT="${CROSS_AITMQTT}/lib/libaitmqtt.so"
 
 CROSS_EMBEDTOOLS="../embedtools"
 EMBEDTOOLS_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"