--- elwix/config/rc.elwix.i386	2021/07/16 18:35:50	1.5
+++ elwix/config/rc.elwix.i386	2024/01/29 13:59:18	1.5.2.3
@@ -3,39 +3,42 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.elwix.i386,v 1.5 2021/07/16 18:35:50 misho Exp $
+# $Id: rc.elwix.i386,v 1.5.2.3 2024/01/29 13:59:18 misho Exp $
 #
 ELWIX_IS_CONFIGURED="YES"
 
-VERSION="2.7_x86"
+VERSION="3.0_x86"
 PLATFORM="elwix"
 TIMEZONE="Europe/Sofia"
 BUILD_DATE=`date "+%Y-%m-%d"`
 
+BUILD_NAME="elwix"
+
 TARGET="i386"
 TARGET_ARCH="i386"
 TARGET_BUILD="${TARGET_ARCH}-${PLATFORM}-freebsd"
-PARALLEL_BUILD="-j8"
+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=".."
 
-# Dont change TOPDIR!!!
-TOPDIR="${CURDIR}/build/${VERSION}"
-#
 BSDSRC="/usr/home/misho/work/freebsd.src"
 ADDSRC="/usr/home/misho/work/embedaddon"
 
+# Dont change TOPDIR!!!
+TOPDIR="${CURDIR}/build/${VERSION}"
+#
 REL="${TOPDIR}/release"
 DEST="${TOPDIR}/destdir"
 OBJS="${TOPDIR}/obj"
 ADIR="${TOPDIR}/arch"
 
+XDEV="${ADIR}/${TARGET_ARCH}/xdev"
 WORLD="${ADIR}/${TARGET_ARCH}/world"
 KERN="${ADIR}/${TARGET_ARCH}/kernel"
 KERN_ROOTFS="${ADIR}/${TARGET_ARCH}/kernel.rootfs"
@@ -51,7 +54,7 @@ CROSSTOOLDIR="${BSDOBJ}/${BSDSRC}/${TARGET}.${TARGET_A
 COMPILE_DEPTOOLS="YES"
 
 ### Kernel
-BSDKERNCONF="${BSDSRC}/sys/${TARGET}/conf"
+BSDKERNCONF="${BSDSRC}/sys/${TARGET_ARCH}/conf"
 KERNDEVHINTS="${BSDKERNCONF}/GENERIC.hints"
 
 KERNHINT="ELWIX_i386.hints"
@@ -168,6 +171,7 @@ mqtt_OPTS="--with-sqlite3dir=${WORLD}/usr/local"
 # 3th party softwares
 CROSS_3THPATH="../embedaddon/"
 CROSS_3THPARTY="mini_sendmail ttcp iperf hping2 
+			miniupnpc
 			libnet arping mtr bmon
 			mpd dnsmasq freevrrpd
 			ipguard choparp 
@@ -178,7 +182,7 @@ mini_sendmail_MAKE="${CBUILD}"
 ttcp_MAKE="${CBUILD}"
 iperf_MAKE="${CBUILD}"
 libnet_MAKE="${CBUILD}"
-arping_MAKE="${CBUILD}"
+arping_MAKE="${CGBUILD}"
 hping2_MAKE="${CBUILD}"
 mtr_MAKE="${CBUILD}"
 bmon_MAKE="${CGBUILD}"
@@ -192,6 +196,8 @@ choparp_MAKE="${CBUILD}"
 readline_MAKE="${CGBUILD}"
 bird_MAKE="${CGBUILD}"
 bird6_MAKE="${CGBUILD}"
+miniupnpc_MAKE="${CGBUILD}"
+miniupnpd_MAKE="${CBUILD}"
 
 #####
 [ -r ${CFGDIR}/rc.subr ] && . ${CFGDIR}/rc.subr