--- elwix/build_kernel.sh	2011/11/02 09:51:32	1.2
+++ elwix/build_kernel.sh	2021/03/11 13:59:50	1.8
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_kernel.sh,v 1.2 2011/11/02 09:51:32 misho Exp $
+# $Id: build_kernel.sh,v 1.8 2021/03/11 13:59:50 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -32,43 +32,65 @@ fi
 
 clean_kernel()
 {
-	echo "+++ Clean ELWIX Kernel ..."
-	rm -rf $KERN
-	mkdir -p $KERN
+	echo "+++ Clean ELWIX Kernel $2 ... $1"
+	rm -rf $1
+	mkdir -p $1
 
-	ln -sf $(pwd)/config/${KERNCONF} ${BSDKERNCONF}
+	ln -sf ${CFGDIR}/$2 ${BSDKERNCONF}
+	ln -sf ${CFGDIR}/${KERNHINT:=$KERNCONF.hints} ${BSDKERNCONF}
 }
 
 build_kernel()
 {
-	echo "+++ Build ELWIX Kernel ..."
+	echo "+++ Build ELWIX Kernel $2 ... $1"
 	cd $BSDSRC
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		-j${PARALLEL_BUILD} buildkernel KERNCONF=${KERNCONF} DESTDIR=${KERN}
-	if [ $? -ne 0 ]; then
-		exit 1
-	else
+		${PARALLEL_BUILD} SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} DESTDIR=$1 \
+		buildkernel KERNCONF=$2
+	if [ $? -eq 0 ]; then
 		cd -
+	else
+		exit 1
 	fi
 }
 
 install_kernel()
 {
-	echo "+++ Install ELWIX Kernel ..."
+	echo "+++ Install ELWIX Kernel $2 ... $1"
 	cd $BSDSRC
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		installkernel KERNCONF=${KERNCONF} DESTDIR=${KERN}
+		SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} DESTDIR=$1 installkernel KERNCONF=$2
 	cd -
 
-	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${KERN}/elwix.ver
+	if [ $? -eq 0 ]; then
+		echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >$1/elwix.ver
+	fi
+
+	echo "+++ Completed ELWIX Kernel $2 ... $1"
 }
 
 ### main()
+if [ -n "${1}" ]; then
+	rm ${KERN_ROOTFS}/elwix.ver
+fi
+if [ -n "${2}" ]; then
+	rm ${KERN}/elwix.ver
+fi
+
 if ! SnitVer ${KERN}/elwix.ver; then
-	clean_kernel
-	build_kernel && install_kernel
+	clean_kernel ${KERN} ${KERNCONF}
+	build_kernel ${KERN} ${KERNCONF}
+	install_kernel ${KERN} ${KERNCONF}
 else
 	echo "Skipped ELWIX Kernel build ..."
 fi
 
-echo "+++ Complete build ELWIX Kernel"
+if ! SnitVer ${KERN_ROOTFS}/elwix.ver; then
+	clean_kernel ${KERN_ROOTFS} ${KERNCONF_ROOTFS}
+	build_kernel ${KERN_ROOTFS} ${KERNCONF_ROOTFS}
+	install_kernel ${KERN_ROOTFS} ${KERNCONF_ROOTFS}
+else
+	echo "Skipped ELWIX rootfs Kernel build ..."
+fi
+
+echo "+++ Complete build ELWIX Kernels"