--- elwix/build_base.sh	2013/07/31 16:05:36	1.1.2.5
+++ elwix/build_base.sh	2017/06/19 21:12:57	1.4.2.8
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# ELWIX Build script for ELWIX raw base firmware
+# ELWIX Build script for ELWIX raw BaseFS firmware
 #
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_base.sh,v 1.1.2.5 2013/07/31 16:05:36 misho Exp $
+# $Id: build_base.sh,v 1.4.2.8 2017/06/19 21:12:57 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -25,21 +25,21 @@ fi
 
 if [ "${USER}" != "root" ]; then
 	echo
-	echo "ELWIX project is not configured - base must build under root !?!"
+	echo "ELWIX project is not configured - BaseFS must build under root !?!"
 	echo
 	exit 1
 fi
 
 clean_basefs()
 {
-	echo "+++ Clean ELWIX base firmware ..."
-	chflags -Rf noschg $BASEFS $BASE_FS
-	rm -rf $BASEFS $BASE_FS ${REL}/${BASE_OS}
+	echo "+++ Clean ELWIX BaseFS firmware ... $BASEFS"
+	chflags -Rf noschg,nosunlink $BASEFS $BASE_FS
+	rm -rf $BASEFS $BASE_FS ${REL}/${BASE_OS} ${REL}/kernel.gz
 }
 
 build_basefs()
 {
-	echo "+++ Build ELWIX base directory ..."
+	echo "+++ Build ELWIX BaseFS directory ... $BASEFS"
 	mkdir -p $BASEFS
 
 	cd $BASEFS
@@ -56,25 +56,27 @@ build_basefs()
 	install -d elwix/altroot;
 	install -d elwix/altroot/var;
 	install -d elwix/cf;
+	case ${TARGET} in
+		i386)
+			ln -fs /dev/ada0g elwix/cf/map.cfg
+			;;
+		mips)
+			ln -fs /dev/map/cfg elwix/cf/map.cfg
+			;;
+	esac
 	install -d elwix/etc;
 	install -d -o 883 -g 883 elwix/etc/mqtt;
 	install -d elwix/exports;
 	install -d elwix/home;
 	install -d -m 0750 elwix/root;
 	install -d -m 0750 elwix/root/.ssh;
-	install -d elwix/system;
 	install -d elwix/tftpboot;
 	install -d elwix/pkg;
-	install -d elwix/pkg/bin;
-	install -d elwix/pkg/lib;
-	install -d elwix/pkg/libexec;
-	install -d elwix/pkg/libdata;
-	install -d elwix/pkg/sbin;
-	ln -fs /elwix/etc etc;
+	install -d elwix/local;
+	install -d etc;
 	ln -fs /elwix/exports exports;
 	ln -fs /elwix/home home;
 	ln -fs /elwix/root root;
-	ln -fs /elwix/system system;
 	ln -fs /elwix/tftpboot tftpboot;
 	install -d mnt;
 	install -d -m 0555 proc;
@@ -86,16 +88,18 @@ build_basefs()
 	ln -fs /usr/lib lib;
 	install -d usr/lib/engines;
 	install -d usr/lib/geom;
-	install -d usr/lib32;
+	case ${TARGET} in
+		amd64)
+			install -d usr/lib32;
+			;;
+		*)
+			;;
+	esac
 	install -d usr/libdata;
 	install -d usr/libexec;
 	ln -fs /usr/libexec libexec;
-	install -d usr/local;
-	install -d usr/local/bin;
-	install -d usr/local/lib;
-	install -d usr/local/libexec;
-	install -d usr/local/libdata;
-	install -d usr/local/sbin;
+	ln -fs /elwix/local usr/local;
+	ln -fs /elwix/pkg usr/pkg;
 	install -d usr/sbin;
 	install -d usr/share;
 	install -d usr/share/misc;
@@ -120,7 +124,7 @@ install_basefs()
 	SKEL="${SHARE}/skel"
 	MISC="${SHARE}/misc"
 
-	echo "+++ Install ELWIX base software ..."
+	echo "+++ Install ELWIX BaseFS software ... $BASEFS"
 	if [ -r ${BSDSRC}/release/picobsd/mfs_tree/etc/termcap ]; then
 		install -v -m 644 ${BSDSRC}/release/picobsd/mfs_tree/etc/termcap $MISC;
 		install -v -m 644 ${BSDSRC}/release/picobsd/mfs_tree/etc/services $MISC;
@@ -137,10 +141,10 @@ install_basefs()
 
 	find ${WORLD}/libexec -type f -name ld-elf.so\* -exec install {} $LIBEXEC \;
 
-	find ${WORLD}/lib -type f -name \*.so.\* -exec install {} $LIBS \;
+	find ${WORLD}/lib -type f -name \*.so.\* ! -name \*.debug -exec install {} $LIBS \;
 	find ${WORLD}/lib -type f -name libalias_\*.so -exec install {} $LIBS \;
 	find ${WORLD}/lib/geom -type f -name \*.so -exec install {} $LIBS/geom \;
-	find ${WORLD}/usr/lib -type f -name \*.so.\* -exec install {} $LIBS \;
+	find ${WORLD}/usr/lib -type f -name \*.so.\* ! -name \*.debug -exec install {} $LIBS \;
 	find ${WORLD}/usr/lib/engines -type f -name \*.so -exec install {} $LIBS/engines \;
 
 	InstallList ${ELWIX_BASEFS} ${WORLD} ${BASEFS}
@@ -153,11 +157,13 @@ install_basefs()
 	InstallDir ${WORLD}/usr/local/libdata $LIBDATA
 
 	chown -R root:wheel $SBIN $BIN $USBIN $UBIN $LIBDATA $LIBEXEC $LIBS
+
+	echo "+++ Completed ELWIX BaseFS software ... $BASEFS"
 }
 
 prepare_fs()
 {
-	echo "+++ Prepare ELWIX fs ..."
+	echo "+++ Prepare ELWIX fs ... $BASEFS --> $1"
 	mkdir -p $1
 
 	if [ -d ${BASEFS} ]; then
@@ -173,11 +179,39 @@ create_etc_fstab()
 # Automatic generated fstab for ELWIX $2 at ${BUILD_DATE}
 #
 /dev/ufs/elwix		/	ufs	ro			0	1
-md2			/tmp	mfs	rw,-s8m,-oasync,-S	0	0
-md3			/var	mfs	rw,-s16m,-S		0       0
+tmpfs			/tmp	tmpfs	rw			0	0
+md2			/var	mfs	rw,-s16m,-S,-n		0       0
 _EOF
 }
 
+update_etc_cfexec()
+{
+	echo "mount = \"/\"" >> $1/etc/cfexec.conf
+}
+
+install_fs()
+{
+	echo "+++ Install ELWIX BaseFS $1 in bundle OS install file ..."
+	OSZ=""
+
+	install -v ${KERNEL} $1/boot/kernel;
+	cd $1/boot/kernel;
+	gzip -9 kernel;
+	cp kernel.gz ${REL}
+	cd -;
+	echo "+++ Released native ELWIX kernel ... ${REL}/kernel.gz"
+
+	case "$2" in
+		*)
+			OSZ=${REL}/${BASE_OS}
+			;;
+	esac
+
+	cd $1
+	tar -czvf $OSZ .
+	echo "+++ Completed ELWIX BaseFS $1 --> $OSZ"
+}
+
 ### main()
 clean_basefs
 build_basefs
@@ -186,8 +220,13 @@ install_basefs
 
 # build fs
 prepare_fs ${BASE_FS}
+MakeFS_home ${BASE_FS}/elwix
 MakeFS_var ${BASE_FS}/elwix ${BASE_ETC}
-MakeFS_etc ${BASE_FS}/elwix ${BASE_ETC} base
-create_etc_fstab ${BASE_FS}/elwix base
+MakeFS_etc ${BASE_FS} ${BASE_ETC} base
+create_etc_fstab ${BASE_FS} base
+update_etc_cfexec ${BASE_FS}
+MakeFS_boot ${BASE_FS}
+install_fs ${BASE_FS}
 
-echo "+++ Complete build ELWIX base"
+echo "+++ Complete build ELWIX BaseFS system"
+echo "ELWIX BaseFS finish version ${VERSION}, Good luck!"