--- elwix/build_romfs.sh	2012/10/09 11:29:24	1.2.4.9
+++ elwix/build_romfs.sh	2012/10/10 13:02:11	1.2.4.10
@@ -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.9 2012/10/09 11:29:24 misho Exp $
+# $Id: build_romfs.sh,v 1.2.4.10 2012/10/10 13:02:11 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;
@@ -102,26 +108,16 @@ install_romfs()
 	InstallDir ${WORLD}/usr/local/lib $LIBS
 	InstallDir ${WORLD}/usr/local/libdata $LIBDATA
 
-	install -d ${PKGDIR}/bin
-#	InstallDir ${PKGDIR}/bin $BIN
-	install -d ${PKGDIR}/sbin
-	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 ..."
 
 	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} \
@@ -135,12 +131,58 @@ 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
+
+	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
+}
+
 ### main()
 clean_romfs
-
 build_romfs
-install_romfs
 
+install_romfs
 build_image
+
+install_romfs2
+build_image2
 
 echo "+++ Complete build ELWIX RomFS"