--- elwix/config/Attic/rc.elwix	2013/08/02 14:46:04	1.7.2.18
+++ elwix/config/Attic/rc.elwix	2013/10/14 12:33:50	1.9.2.4
@@ -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.18 2013/08/02 14:46:04 misho Exp $
+# $Id: rc.elwix,v 1.9.2.4 2013/10/14 12:33:50 misho Exp $
 #
 ELWIX_IS_CONFIGURED="YES"
 
-VERSION="1.9"
+VERSION="2.1"
 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!!!
@@ -44,8 +45,6 @@ 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"
@@ -66,31 +65,19 @@ 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="9000k"
 
 ### tools Firmware
-LOCALFS_IMG="elwix-local.sys"
+LOCALFS_IMG="elwix-pkg.frm"
 
 ### 3th party
 ROMFS_USR2="${DEST}/romfs.pkg"
 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"
-
-BASE_FS128="${DEST}/base.fs128"
-BASE_ETC128="${CFGDIR}/etc/default"
-BASE_OS128="ELWIX-${VERSION}_base_128mb_${TARGET_ARCH}_${BUILD_DATE}.tar.gz"
-
 ### RomFS Firmware
 ROMFS="${DEST}/romfs"
 ELWIX_ROMFS="${CFGDIR}/elwix_romfs.conf"
@@ -99,20 +86,28 @@ ROMFS_USR="${ROMFS}/usr"
 ROMFS_IMG="elwix-firmware.sys"
 #ROMFS_SIZE="38m"
 
+### 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"
+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"