--- elwix/build_romfs.sh	2012/10/09 11:08:52	1.2.4.7
+++ elwix/build_romfs.sh	2017/06/12 08:47:24	1.9.2.1
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_romfs.sh,v 1.2.4.7 2012/10/09 11:08:52 misho Exp $
+# $Id: build_romfs.sh,v 1.9.2.1 2017/06/12 08:47:24 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -32,7 +32,7 @@ fi
 
 clean_romfs()
 {
-	echo "+++ Clean ELWIX RomFS firmware ..."
+	echo "+++ Clean ELWIX RomFS firmware ... $ROMFS"
 	chflags -Rf noschg $ROMFS
 	rm -rf $ROMFS
 
@@ -42,7 +42,7 @@ clean_romfs()
 
 build_romfs()
 {
-	echo "+++ Build ELWIX RomFS directory ..."
+	echo "+++ Build ELWIX RomFS directory ... $ROMFS_USR"
 	mkdir -p $ROMFS_USR
 
 	cd $ROMFS_USR
@@ -53,7 +53,14 @@ build_romfs()
 	install -d lib/geom;
 	install -d libdata;
 	install -d libexec;
+	install -d local;
+	install -d local/bin;
+	install -d local/lib;
+	install -d local/libexec;
+	install -d local/libdata;
+	install -d local/sbin;
 	install -d share;
+	install -d share/keys;
 	install -d share/misc;
 	install -d share/skel;
 	install -d share/zoneinfo;
@@ -74,8 +81,9 @@ install_romfs()
 	SHARE="${ROMFS_USR}/share"
 	SKEL="${SHARE}/skel"
 	MISC="${SHARE}/misc"
+	KEYS="${SHARE}/keys"
 
-	echo "+++ Install ELWIX RomFS software ..."
+	echo "+++ Install ELWIX RomFS software ... $ROMFS_USR"
 	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;
@@ -90,10 +98,13 @@ install_romfs()
 	install -v ${CFGDIR}/root.skel/profile $SKEL/dot.profile;
 	install -v ${CFGDIR}/root.skel/vimrc $SKEL/dot.vimrc;
 
-	find ${WORLD}/lib -type f -name \*.so.\* -exec install {} $LIBS \;
+	ln -sf /var/pkg/keys ${KEYS}/pkg
+
+	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_ROMFS} ${WORLD} ${ROMFS}
 
@@ -102,23 +113,17 @@ install_romfs()
 	InstallDir ${WORLD}/usr/local/lib $LIBS
 	InstallDir ${WORLD}/usr/local/libdata $LIBDATA
 
-#	InstallDir ${PKGDIR}/bin $BIN
-	InstallDir ${PKGDIR}/sbin $SBIN
-
-	InstallFiles \*.so\* ${PKG}/lib $LIBS
-	InstallFiles \* ${PKG}/libexec $LIBEXEC
-	InstallFiles \* ${PKG}/libdata $LIBDATA
-	InstallFiles \* ${PKG}/bin $BIN
-	InstallFiles \* ${PKG}/sbin $SBIN
-
 	chown -R root:wheel $SBIN $BIN $LIBDATA $LIBEXEC $LIBS
+	echo "+++ Completed ELWIX RomFS software ... $ROMFS_USR"
 }
 
 build_image()
 {
-	echo "+++ Build ELWIX Firmware image ..."
+	echo "+++ Build ELWIX Firmware system image ... $ROMFS_USR --> ${REL}/${ROMFS_IMG}"
 
-	echo pax -w -pe ${REL}/${ROMFS_IMG} ${ROMFS_USR}
+	cd ${ROMFS_USR}
+	pax -w -z -v -f${REL}/${ROMFS_IMG} .
+	cd -
 
 # Stop using uzip fs
 #	makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${ROMFS_SIZE} \
@@ -130,14 +135,15 @@ build_image()
 
 #	mkuzip -s 8192 -o ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG};
 #	mv ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG}
+
+	echo "+++ Completed ELWIX Firmware system image ... $ROMFS_USR --> ${REL}/${ROMFS_IMG}"
 }
 
 ### main()
-clean_romfs
+clean_romfs || exit 1
+build_romfs || exit 1
 
-build_romfs
-install_romfs
-
-build_image
+install_romfs || exit 1
+build_image || exit 1
 
 echo "+++ Complete build ELWIX RomFS"