--- elwix/config/Attic/rc.elwix	2013/05/07 20:46:48	1.7
+++ elwix/config/Attic/rc.elwix	2013/08/05 13:10:16	1.8
@@ -3,11 +3,11 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.elwix,v 1.7 2013/05/07 20:46:48 misho Exp $
+# $Id: rc.elwix,v 1.8 2013/08/05 13:10:16 misho Exp $
 #
 ELWIX_IS_CONFIGURED="YES"
 
-VERSION="1.8"
+VERSION="1.9"
 PLATFORM="elwix"
 TIMEZONE="Europe/Sofia"
 BUILD_DATE=`date "+%Y-%m-%d"`
@@ -15,7 +15,8 @@ BUILD_DATE=`date "+%Y-%m-%d"`
 TARGET="i386"
 TARGET_ARCH="i386"
 TARGET_BUILD="${TARGET_ARCH}-${PLATFORM}-freebsd"
-PARALLEL_BUILD=2
+#PARALLEL_BUILD=2
+PARALLEL_BUILD=1
 
 CURDIR=$(pwd)
 CFGDIR="${CURDIR}/config"
@@ -35,6 +36,7 @@ ADIR="${TOPDIR}/arch"
 
 WORLD="${ADIR}/${TARGET_ARCH}/world"
 KERN="${ADIR}/${TARGET_ARCH}/kernel"
+KERN_ROOTFS="${ADIR}/${TARGET_ARCH}/kernel.rootfs"
 PKG="${ADIR}/${TARGET_ARCH}/pkg"
 AIT="${ADIR}/${TARGET_ARCH}"
 BSDOBJ="${OBJS}/${TARGET_ARCH}"
@@ -42,28 +44,41 @@ BSDTOOLS="${BSDSRC}/tools/tools"
 PKGDIR="${WORLD}/elwix/pkg"
 CROSSTOOLDIR="${BSDOBJ}/${BSDSRC}/tmp"
 
+ELWIX_BSDSRC="${CFGDIR}/elwix_bsdsrc.conf"
+
 ### Kernel
 BSDKERNCONF="${BSDSRC}/sys/${TARGET}/conf"
 KERNDEVHINTS="${BSDKERNCONF}/GENERIC.hints"
 
+KERNHINT="ELWIX_${TARGET_ARCH}.hints"
+
 KERNEL="${KERN}/boot/kernel/kernel"
-KERNCONF="ELWIX"
+KERNCONF="ELWIX_${TARGET_ARCH}"
 
+KERNEL_ROOTFS="${KERN_ROOTFS}/boot/kernel/kernel"
+KERNCONF_ROOTFS="ELWIX_${TARGET_ARCH}_ROOTFS"
+
 ### Rootfs
-MKDIR="${ADIR}/${TARGET_ARCH}/elwix"
-MKF="Makefile.elwix"
-MKH="Makefile.inc"
+ROOTFS_MKDIR="${ADIR}/${TARGET_ARCH}/elwix"
 ROOTFS_CONF="elwix_firmware.conf"
 
 ROOTFS="${DEST}/rootfs"
 ROOTFS_ETC="${CFGDIR}/etc/rootfs"
 ELWIX_ROOTFS="${CFGDIR}/elwix_rootfs.conf"
 
-ROOTFS_KERN="kernel.gz"
+ROOTFS_KERN="kernel_rootfs.gz"
 
 ROOTFS_IMG="rootfs.img"
-ROOTFS_SIZE="8000k"
+ROOTFS_SIZE="9000k"
 
+### tools Firmware
+LOCALFS_IMG="elwix-pkg.frm"
+
+### 3th party
+ROMFS_USR2="${DEST}/romfs.pkg"
+ROMFS_IMG2="elwix-firmware2.sys"
+#ROMFS_SIZE2="40m"
+
 ### RomFS Firmware
 ROMFS="${DEST}/romfs"
 ELWIX_ROMFS="${CFGDIR}/elwix_romfs.conf"
@@ -72,42 +87,29 @@ ROMFS_USR="${ROMFS}/usr"
 ROMFS_IMG="elwix-firmware.sys"
 #ROMFS_SIZE="38m"
 
-ROMFS_USR2="${ROMFS}/usr/local"
-ROMFS_IMG2="elwix-firmware2.sys"
-#ROMFS_SIZE2="40m"
+### Base Firmware
+BASEFS="${DEST}/base"
+ELWIX_BASEFS="${CFGDIR}/elwix_base.conf"
 
+BASE_FS="${DEST}/base.fs"
+BASE_ETC="${CFGDIR}/etc/default"
+BASE_OS="ELWIX-${VERSION}_base_64mb_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
+
 ### FS Image
+FS="${DEST}/elwix.fs"
 FS_ETC="${CFGDIR}/etc/default"
-ELWIX_BSDSRC="${CFGDIR}/elwix_bsdsrc.conf"
+OS="ELWIX-${VERSION}_64mb_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
 
-FS="${DEST}/elwix.fs"
-OS="ELWIX-${VERSION}_${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"
 
-FS_LITE="${DEST}/elwix_lite.fs"
-OS_LITE="ELWIX_lite-${VERSION}_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
-
-FS_LITE128="${DEST}/elwix_lite128.fs"
-OS_LITE128="ELWIX_lite_128-${VERSION}_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
-
 ### Make OS Image
 IMG_SIZE=62592
 IMG_SIZE128=125100
 
 IMGNAME="${REL}/ELWIX-${VERSION}_${TARGET_ARCH}"
-MD5CHK="${IMGNAME}.md5"
-SHA1CHK="${IMGNAME}.sha1"
-IMG="${IMGNAME}.img"
 
-IMGNAME_LITE="${REL}/ELWIX_lite-${VERSION}_${TARGET_ARCH}"
-MD5CHK_LITE="${IMGNAME_LITE}.md5"
-SHA1CHK_LITE="${IMGNAME_LITE}.sha1"
-IMG_LITE="${IMGNAME_LITE}.img"
-
-IMGNAME_LITE128="${REL}/ELWIX_lite_128-${VERSION}_${TARGET_ARCH}"
-MD5CHK_LITE128="${IMGNAME_LITE128}.md5"
-SHA1CHK_LITE128="${IMGNAME_LITE128}.sha1"
-IMG_LITE128="${IMGNAME_LITE128}.img"
-
 ### Cross
 CBUILD="${DEST}/cross_build.sh"
 CGBUILD="${DEST}/cross_gbuild.sh"
@@ -129,53 +131,56 @@ AXL_CFG="./configure --disable-py-axl --prefix=${WORLD
 #AXL_LIB_BABEL="${CROSS_AXL}/babel/.libs/libaxl-babel.so.*"
 
 CROSS_ELWIX="../libelwix"
-ELWIX_CFG="./configure --prefix=${WORLD}/usr/local"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+EMBEDTOOLS_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
 
 CROSS_ANSH="../ansh"
-ANSH_CFG="./configure --prefix=${WORLD}/usr/local"
+ANSH_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
 
 CROSS_MQTT="../mqtt"
-MQTT_CFG="./configure --with-sqlite3dir=${WORLD}/usr --prefix=${WORLD}/usr/local"
+MQTT_CFG="./configure --with-sqlite3dir=${WORLD}/usr/local --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
+
+CROSS_WIFINATOR="../wifinator"
+WIFINATOR_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
 
 CROSS_3TH="../embedaddon"