--- elwix/build_romfs.sh	2012/10/09 11:08:52	1.2.4.7
+++ elwix/build_romfs.sh	2016/11/14 00:56:05	1.8.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.8.2.1 2016/11/14 00:56:05 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -53,6 +53,12 @@ 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/misc;
 	install -d share/skel;
@@ -90,10 +96,11 @@ 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 \;
+	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 +109,16 @@ 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
 }
 
 build_image()
 {
-	echo "+++ Build ELWIX Firmware image ..."
+	echo "+++ Build ELWIX Firmware system image ..."
 
-	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} \
@@ -133,11 +133,10 @@ build_image()
 }
 
 ### 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"