--- elwix/config/Attic/rc.elwix	2013/07/31 15:13:17	1.7.2.13
+++ elwix/config/Attic/rc.elwix	2014/01/07 09:27:55	1.10.2.3
@@ -3,11 +3,11 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.elwix,v 1.7.2.13 2013/07/31 15:13:17 misho Exp $
+# $Id: rc.elwix,v 1.10.2.3 2014/01/07 09:27:55 misho Exp $
 #
 ELWIX_IS_CONFIGURED="YES"
 
-VERSION="1.9"
+VERSION="2.2"
 PLATFORM="elwix"
 TIMEZONE="Europe/Sofia"
 BUILD_DATE=`date "+%Y-%m-%d"`
@@ -15,12 +15,13 @@ BUILD_DATE=`date "+%Y-%m-%d"`
 TARGET="i386"
 TARGET_ARCH="i386"
 TARGET_BUILD="${TARGET_ARCH}-${PLATFORM}-freebsd"
-#PARALLEL_BUILD=2
-PARALLEL_BUILD=1
+PARALLEL_BUILD="-j2"
 
 CURDIR=$(pwd)
 CFGDIR="${CURDIR}/config"
 
+SRCCONF="${CFGDIR}/src.conf"
+
 PREDIR=".."
 
 # Dont change TOPDIR!!!
@@ -28,6 +29,7 @@ TOPDIR="${CURDIR}/build/${VERSION}"
 #
 BSDSRC="/home/fbsd_work.src/src"
 PKGSRC="/home/pkgsrc"
+ADDSRC="/home/misho/work/embedaddon"
 
 REL="${TOPDIR}/release"
 DEST="${TOPDIR}/destdir"
@@ -36,6 +38,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}"
@@ -43,16 +46,47 @@ 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_${TARGET_ARCH}"
-KERNHINT="ELWIX_${TARGET_ARCH}.hints"
 
+KERNEL_ROOTFS="${KERN_ROOTFS}/boot/kernel/kernel"
+KERNCONF_ROOTFS="ELWIX_${TARGET_ARCH}_ROOTFS"
+
+### Rootfs
+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_rootfs.gz"
+
+ROOTFS_IMG="rootfs.img"
+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"
+
+ROMFS_USR="${ROMFS}/usr"
+ROMFS_IMG="elwix-firmware.sys"
+#ROMFS_SIZE="38m"
+
 ### Base Firmware
 BASEFS="${DEST}/base"
 ELWIX_BASEFS="${CFGDIR}/elwix_base.conf"
@@ -61,24 +95,20 @@ BASE_FS="${DEST}/base.fs"
 BASE_ETC="${CFGDIR}/etc/default"
 BASE_OS="ELWIX-${VERSION}_base_64mb_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
 
-BASE_FS128="${DEST}/base.fs128"
-BASE_ETC128="${CFGDIR}/etc/default"
-BASE_OS128="ELWIX-${VERSION}_base_128mb_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
-
 ### FS Image
+FS="${DEST}/elwix.fs"
 FS_ETC="${CFGDIR}/etc/default"
+OS="ELWIX-${VERSION}_64mb_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
 
-OS="ELWIX-${VERSION}_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
-FS="${DEST}/elwix.fs"
+FS_EXT="${DEST}/elwix_ext.fs"
+FS_EXT_ETC="${CFGDIR}/etc/default"
+OS_EXT="ELWIX-${VERSION}_ext_128mb_${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"
 
 ### Cross
 CBUILD="${DEST}/cross_build.sh"
@@ -151,8 +181,6 @@ MQTT_CFG="./configure --with-sqlite3dir=${WORLD}/usr/l
 
 CROSS_WIFINATOR="../wifinator"
 WIFINATOR_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-
-CROSS_3TH="../embedaddon"
 
 #####
 [ -r ${CFGDIR}/rc.subr ] && . ${CFGDIR}/rc.subr