--- elwix/build_romfs.sh	2013/01/28 10:48:45	1.4.2.1
+++ 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.4.2.1 2013/01/28 10:48:45 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
@@ -96,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}
 
@@ -131,63 +132,11 @@ build_image()
 #	mv ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG}
 }
 
-build_image2()
-{
-	echo "+++ Build ELWIX Firmware secondary image ..."
-
-	cd ${ROMFS_USR2}
-	pax -w -z -v -f${REL}/${ROMFS_IMG2} .
-	cd -
-
-# Stop using uzip fs
-#	makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${ROMFS_SIZE2} \
-#		${REL}/${ROMFS_IMG2} ${ROMFS_USR2}
-
-#	MDDEV=$(mdconfig -a -t vnode -f ${REL}/${ROMFS_IMG2});
-#	tunefs -L elwixFirmware2 /dev/$MDDEV;
-#	mdconfig -d -u $MDDEV;
-
-#	mkuzip -s 8192 -o ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2};
-#	mv ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2}
-}
-
-install_romfs2()
-{
-	LIBS="${ROMFS_USR2}/lib"
-	LIBEXEC="${ROMFS_USR2}/libexec"
-	LIBDATA="${ROMFS_USR2}/libdata"
-	BIN="${ROMFS_USR2}/bin"
-	SBIN="${ROMFS_USR2}/sbin"
-
-	echo "+++ Install ELWIX RomFS secondary software ..."
-
-	install -d ${PKGDIR}/bin
-#	InstallDir ${PKGDIR}/bin $BIN
-	install -d ${PKGDIR}/sbin
-	InstallDir ${PKGDIR}/sbin $SBIN
-
-	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
-}
-
 ### main()
-clean_romfs
-build_romfs
+clean_romfs || exit 1
+build_romfs || exit 1
 
-install_romfs
-build_image
-
-install_romfs2
-build_image2
+install_romfs || exit 1
+build_image || exit 1
 
 echo "+++ Complete build ELWIX RomFS"