--- elwix/build_base.sh	2013/07/31 14:57:01	1.1.2.2
+++ elwix/build_base.sh	2016/11/03 14:13:30	1.3.2.1
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_base.sh,v 1.1.2.2 2013/07/31 14:57:01 misho Exp $
+# $Id: build_base.sh,v 1.3.2.1 2016/11/03 14:13:30 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -33,8 +33,8 @@ fi
 clean_basefs()
 {
 	echo "+++ Clean ELWIX base firmware ..."
-	chflags -Rf noschg $BASEFS
-	rm -rf $BASEFS
+	chflags -Rf noschg,nosunlink $BASEFS $BASE_FS
+	rm -rf $BASEFS $BASE_FS ${REL}/${BASE_OS} ${REL}/kernel.gz
 }
 
 build_basefs()
@@ -56,13 +56,20 @@ 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;
@@ -74,7 +81,6 @@ build_basefs()
 	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;
@@ -137,10 +143,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}
@@ -155,53 +161,49 @@ install_basefs()
 	chown -R root:wheel $SBIN $BIN $USBIN $UBIN $LIBDATA $LIBEXEC $LIBS
 }
 
-build_image2()
+prepare_fs()
 {
-	echo "+++ Build ELWIX Firmware secondary image ..."
+	echo "+++ Prepare ELWIX fs ..."
+	mkdir -p $1
 
-	cd ${BASEFS_USR2}
-	pax -w -z -v -f${REL}/${BASEFS_IMG2} .
-	cd -
+	if [ -d ${BASEFS} ]; then
+		cd ${BASEFS}
+		pax -rw -pe -X . $1
+		cd -
+	fi
+}
 
-# Stop using uzip fs
-#	makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${BASEFS_SIZE2} \
-#		${REL}/${BASEFS_IMG2} ${BASEFS_USR2}
-
-#	MDDEV=$(mdconfig -a -t vnode -f ${REL}/${BASEFS_IMG2});
-#	tunefs -L elwixFirmware2 /dev/$MDDEV;
-#	mdconfig -d -u $MDDEV;
-
-#	mkuzip -s 8192 -o ${REL}/${BASEFS_IMG2}.uzip ${REL}/${BASEFS_IMG2};
-#	mv ${REL}/${BASEFS_IMG2}.uzip ${REL}/${BASEFS_IMG2}
+create_etc_fstab()
+{
+	cat >$1/etc/fstab <<_EOF
+# Automatic generated fstab for ELWIX $2 at ${BUILD_DATE}
+#
+/dev/ufs/elwix		/	ufs	ro			0	1
+md0			/tmp	mfs	rw,-s8m,-oasync,-S	0	0
+md1			/var	mfs	rw,-s16m,-S		0       0
+/var/db			/elwix/etc	unionfs	rw,noauto,-onoatime	0	0
+_EOF
 }
 
-install_romfs2()
+install_fs()
 {
-	LIBS="${BASEFS_USR2}/lib"
-	LIBEXEC="${BASEFS_USR2}/libexec"
-	LIBDATA="${BASEFS_USR2}/libdata"
-	BIN="${BASEFS_USR2}/bin"
-	SBIN="${BASEFS_USR2}/sbin"
+	echo "+++ Install ELWIX base $1 in bundle OS install file ..."
+	OSZ=""
 
-	echo "+++ Install ELWIX base secondary software ..."
+	install -v ${KERNEL} $1/boot/kernel;
+	cd $1/boot/kernel;
+	gzip -9 kernel;
+	cp kernel.gz ${REL}
+	cd -;
 
-	install -d ${PKGDIR}/bin
-#	InstallDir ${PKGDIR}/bin $BIN
-	install -d ${PKGDIR}/sbin
-	InstallDir ${PKGDIR}/sbin $SBIN
+	case "$2" in
+		*)
+			OSZ=${REL}/${BASE_OS}
+			;;
+	esac
 
-	StripFiles \*.so\* ${PKG}/lib
-	InstallFiles \*.so\* ${PKG}/lib $LIBS
-	StripFiles \* ${PKG}/libexec
-	InstallFiles \* ${PKG}/libexec $LIBEXEC
-	StripFiles \* ${PKG}/libdata
-	InstallFiles \* ${PKG}/libdata $LIBDATA
-	StripFiles \* ${PKG}/bin
-	InstallFiles \* ${PKG}/bin $BIN
-	StripFiles \* ${PKG}/sbin
-	InstallFiles \* ${PKG}/sbin $SBIN
-
-	chown -R root:wheel $SBIN $BIN $LIBDATA $LIBEXEC $LIBS
+	cd $1
+	tar -czvf $OSZ .
 }
 
 ### main()
@@ -210,7 +212,14 @@ build_basefs
 
 install_basefs
 
-#install_romfs2
-#build_image2
+# 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_backup ${BASE_FS}/elwix
+MakeFS_boot ${BASE_FS}
+install_fs ${BASE_FS}
 
 echo "+++ Complete build ELWIX base"