--- elwix/config/rc.elwix.amd64	2017/06/21 12:12:34	1.2.2.6
+++ elwix/config/rc.elwix.amd64	2021/09/08 12:13:11	1.4.2.2
@@ -3,11 +3,11 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.elwix.amd64,v 1.2.2.6 2017/06/21 12:12:34 misho Exp $
+# $Id: rc.elwix.amd64,v 1.4.2.2 2021/09/08 12:13:11 misho Exp $
 #
 ELWIX_IS_CONFIGURED="YES"
 
-VERSION="2.6_amd64"
+VERSION="2.8_amd64"
 PLATFORM="elwix"
 TIMEZONE="Europe/Sofia"
 BUILD_DATE=`date "+%Y-%m-%d"`
@@ -15,22 +15,22 @@ BUILD_DATE=`date "+%Y-%m-%d"`
 TARGET="amd64"
 TARGET_ARCH="amd64"
 TARGET_BUILD="${TARGET_ARCH}-${PLATFORM}-freebsd"
-PARALLEL_BUILD="-j2"
+PARALLEL_BUILD="-j $(sysctl -n hw.ncpu)"
 
 CURDIR=$(pwd)
 CFGDIR="${CURDIR}/config"
 
-SRCCONF="${CFGDIR}/src_${TARGET}.conf"
-MAKECONF="${CFGDIR}/make_${TARGET}.conf"
+SRCCONF="${CFGDIR}/src_${TARGET_ARCH}.conf"
+MAKECONF="${CFGDIR}/make_${TARGET_ARCH}.conf"
 
 PREDIR=".."
 
+BSDSRC="/usr/home/misho/work/freebsd.src"
+ADDSRC="/usr/home/misho/work/embedaddon"
+
 # Dont change TOPDIR!!!
 TOPDIR="${CURDIR}/build/${VERSION}"
 #
-BSDSRC="/home/fbsd_work.src/src"
-ADDSRC="/home/misho/work/embedaddon"
-
 REL="${TOPDIR}/release"
 DEST="${TOPDIR}/destdir"
 OBJS="${TOPDIR}/obj"
@@ -45,10 +45,10 @@ AIT="${ADIR}/${TARGET_ARCH}"
 BSDOBJ="${OBJS}/${TARGET_ARCH}"
 BSDTOOLS="${BSDSRC}/tools/tools"
 PKGDIR="${WORLD}/elwix/pkg"
-CROSSTOOLDIR="${BSDOBJ}/${TARGET_ARCH}.${TARGET_ARCH}/${BSDSRC}/tmp"
+CROSSTOOLDIR="${BSDOBJ}/${BSDSRC}/${TARGET}.${TARGET_ARCH}/tmp"
 
 ### Kernel
-BSDKERNCONF="${BSDSRC}/sys/${TARGET}/conf"
+BSDKERNCONF="${BSDSRC}/sys/${TARGET_ARCH}/conf"
 KERNDEVHINTS="${BSDKERNCONF}/GENERIC.hints"
 
 KERNHINT="ELWIX_amd64.hints"
@@ -73,8 +73,10 @@ ELWIX_ROOTFS="${CFGDIR}/elwix_rootfs.conf"
 ROOTFS_KERN="kernel_rootfs.gz"
 
 ROOTFS_IMG="rootfs.img"
-ROOTFS_SIZE="12000k"
+ROOTFS_SIZE="13440k"
 
+OBJDUMP="/usr/local/bin/x86_64-unknown-freebsd14.0-objdump"
+
 ### tools Firmware
 LOCALFS_IMG="elwix-pkg.frm"
 
@@ -114,7 +116,7 @@ IMG_SIZE128=125100
 IMG_SIZE256=251496
 IMG_SIZE512=500472
 
-CFG_NAND_SIZE=516096
+CFG_NAND_SIZE=524288
 
 IMGNAME="${REL}/ELWIX-${VERSION}_${TARGET_ARCH}"
 
@@ -139,50 +141,59 @@ CROSS_FT_NETBLAST="${BSDTOOLS}/netrate/netblast"
 CROSS_FT_NETRCV="${BSDTOOLS}/netrate/netreceive"
 CROSS_FT_NETSND="${BSDTOOLS}/netrate/netsend"
 
-CROSS_ELWIX="../libelwix"
-ELWIX_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
+CROSS_PATH="../"
+CROSS_TOOLS="libelwix 
+		libaitsched
+		libaitcfg
+		libaitio
+		libaitrpc
+		libaitwww
+		libaitsync
+		libaitcli
+		libaitmqtt
+		embedtools
+		ansh mqtt
+		wifinator
+		tftpd"
+CROSS_PFX="--prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
 
-CROSS_AITIO="../libaitio"
-AITIO_CFG="./configure --enable-aio --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
+# additional options to software // <cross_tools_item>_OPTS
+libaitio_OPTS="--enable-aio"
+libaitsched_OPTS="--enable-aio"
+mqtt_OPTS="--with-sqlite3dir=${WORLD}/usr/local"
 
-CROSS_AITCFG="../libaitcfg"
-AITCFG_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
+# 3th party softwares
+CROSS_3THPATH="../embedaddon/"
+CROSS_3THPARTY="mini_sendmail curl strongswan  
+			ttcp iperf lrzsz
+			libnet arping 
+			hping2 mtr 
+			bmon 
+			mpd dnsmasq pimd pimdd freevrrpd ipguard choparp 
+			readline bird2"
 
-CROSS_AITRPC="../libaitrpc"
-AITRPC_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-
-CROSS_AITSCHED="../libaitsched"
-AITSCHED_CFG="./configure --enable-aio --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-
-CROSS_AITWWW="../libaitwww"
-AITWWW_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-
-CROSS_AITPELCO="../libaitpelco"
-AITPELCO_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-
-CROSS_AITSYNC="../libaitsync"
-AITSYNC_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-
-CROSS_AITCLI="../libaitcli"
-AITCLI_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-
-CROSS_AITMQTT="../libaitmqtt"
-AITMQTT_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-
-CROSS_EMBEDTOOLS="../embedtools"
-EMBEDTOOLS_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-
-CROSS_ANSH="../ansh"
-ANSH_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
-
-CROSS_MQTT="../mqtt"
-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_TFTPD="../tftpd"
-TFTPD_CFG="./configure --prefix=${WORLD}/usr/local --host=${TARGET_BUILD}"
+mini_sendmail_MAKE="${CBUILD}"
+ttcp_MAKE="${CBUILD}"
+iperf_MAKE="${CBUILD}"
+lrzsz_MAKE="${CBUILD}"
+libnet_MAKE="${CBUILD}"
+arping_MAKE="${CBUILD}"
+hping2_MAKE="${CBUILD}"
+mtr_MAKE="${CBUILD}"
+bmon_MAKE="${CGBUILD}"
+mpd_MAKE="${CBUILD}"
+dnsmasq_MAKE="${CBUILD}"
+pimd_MAKE="${CBUILD}"
+pimdd_MAKE="${CBUILD}"
+freevrrpd_MAKE="${CBUILD}"
+ipguard_MAKE="${CBUILD}"
+choparp_MAKE="${CBUILD}"
+readline_MAKE="${CGBUILD}"
+bird2_MAKE="${CGBUILD}"
+bird_MAKE="${CGBUILD}"
+bird6_MAKE="${CGBUILD}"
+curl_MAKE="${CBUILD}"
+strongswan_MAKE="${CGBUILD}"
 
 #####
 [ -r ${CFGDIR}/rc.subr ] && . ${CFGDIR}/rc.subr