--- elwix/config/Attic/rc.elwix	2013/05/21 17:05:36	1.7.4.8
+++ elwix/config/Attic/rc.elwix	2014/01/05 23:14:23	1.10
@@ -3,23 +3,25 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.elwix,v 1.7.4.8 2013/05/21 17:05:36 misho Exp $
+# $Id: rc.elwix,v 1.10 2014/01/05 23:14:23 misho Exp $
 #
 ELWIX_IS_CONFIGURED="YES"
 
-VERSION="1.9"
+VERSION="2.1"
 PLATFORM="elwix"
 TIMEZONE="Europe/Sofia"
 BUILD_DATE=`date "+%Y-%m-%d"`
 
-TARGET="mips"
-TARGET_ARCH="mips"
+TARGET="i386"
+TARGET_ARCH="i386"
 TARGET_BUILD="${TARGET_ARCH}-${PLATFORM}-freebsd"
-PARALLEL_BUILD=2
+PARALLEL_BUILD="-j2"
 
 CURDIR=$(pwd)
 CFGDIR="${CURDIR}/config"
 
+SRCCONF="${CFGDIR}/src.conf"
+
 PREDIR=".."
 
 # Dont change TOPDIR!!!
@@ -35,6 +37,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}"
@@ -46,25 +49,35 @@ CROSSTOOLDIR="${BSDOBJ}/${BSDSRC}/tmp"
 BSDKERNCONF="${BSDSRC}/sys/${TARGET}/conf"
 KERNDEVHINTS="${BSDKERNCONF}/GENERIC.hints"
 
+KERNHINT="ELWIX_${TARGET_ARCH}.hints"
+
 KERNEL="${KERN}/boot/kernel/kernel"
-KERNCONF="ELWIX_ALFA_NX"
-KERNHINT="ALFA_NX.hints"
+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"
@@ -73,51 +86,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"
-
-### Make U-boot image
-UB_COMPRESS="lzma"
-UB_OBJS="${BSDOBJ}/uboot"
-UB_KERNEL="${UB_OBJS}/kernel"
-# Must be same like into kernel config [ KERNLOADADDR=0x80050000 ]
-# if address variables are commented install2ub.sh automatic detect addresses
-#UB_LOADADDR=0x80002000
-#UB_ENTRYADDR=0x80002100
-
 ### Cross
 CBUILD="${DEST}/cross_build.sh"
 CGBUILD="${DEST}/cross_gbuild.sh"
@@ -185,7 +176,10 @@ CROSS_ANSH="../ansh"
 ANSH_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
 
 CROSS_MQTT="../mqtt"
-MQTT_CFG="./configure --with-sqlite3dir=${WORLD}/usr --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
+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"