--- elwix/build_romfs.sh	2011/10/18 09:02:05	1.2
+++ elwix/build_romfs.sh	2012/10/12 08:22:43	1.3
@@ -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 2011/10/18 09:02:05 misho Exp $
+# $Id: build_romfs.sh,v 1.3 2012/10/12 08:22:43 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -53,12 +53,18 @@ 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;
 	install -d share/zoneinfo;
 
-	ln -s /elwix/local local;
+	ln -s /elwix/pkg pkg;
 
 	chown -hR root:wheel .
 	cd -
@@ -69,10 +75,11 @@ install_romfs()
 	LIBS="${ROMFS_USR}/lib"
 	LIBEXEC="${ROMFS_USR}/libexec"
 	LIBDATA="${ROMFS_USR}/libdata"
-	SKEL="${ROMFS_USR}/share/skel"
-	MISC="${ROMFS_USR}/share/misc"
 	BIN="${ROMFS_USR}/bin"
 	SBIN="${ROMFS_USR}/sbin"
+	SHARE="${ROMFS_USR}/share"
+	SKEL="${SHARE}/skel"
+	MISC="${SHARE}/misc"
 
 	echo "+++ Install ELWIX RomFS software ..."
 	if [ -r ${BSDSRC}/release/picobsd/mfs_tree/etc/termcap ]; then
@@ -83,8 +90,6 @@ install_romfs()
 		install -v -m 644 ${BSDSRC}/etc/services $MISC;
 	fi
 
-	install -v -m 0555 ${WORLD}/libexec/ld-elf.so.1 $LIBEXEC
-
 	install -v ${CFGDIR}/root.skel/cshrc $SKEL/dot.cshrc;
 	install -v ${CFGDIR}/root.skel/login $SKEL/dot.login;
 	install -v ${CFGDIR}/root.skel/logout $SKEL/dot.logout;
@@ -100,43 +105,84 @@ install_romfs()
 
 	InstallDir ${WORLD}/usr/local/bin $BIN
 	InstallDir ${WORLD}/usr/local/sbin $SBIN
+	InstallDir ${WORLD}/usr/local/lib $LIBS
 	InstallDir ${WORLD}/usr/local/libdata $LIBDATA
 
-	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 ..."
-	makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${ROMFS_SIZE} \
-		${REL}/${ROMFS_IMG} ${ROMFS_USR}
+	echo "+++ Build ELWIX Firmware system image ..."
 
-	MDDEV=$(mdconfig -a -t vnode -f ${REL}/${ROMFS_IMG});
-	tunefs -L elwixFirmware /dev/$MDDEV;
-#	mount /dev/$MDDEV /mnt
-#	umount /mnt
-	mdconfig -d -u $MDDEV;
+	cd ${ROMFS_USR}
+	pax -w -z -v -f${REL}/${ROMFS_IMG} .
+	cd -
 
-	mkuzip -s 8192 -o ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG};
-	mv ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG}
+# Stop using uzip fs
+#	makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${ROMFS_SIZE} \
+#		${REL}/${ROMFS_IMG} ${ROMFS_USR}
+
+#	MDDEV=$(mdconfig -a -t vnode -f ${REL}/${ROMFS_IMG});
+#	tunefs -L elwixFirmware /dev/$MDDEV;
+#	mdconfig -d -u $MDDEV;
+
+#	mkuzip -s 8192 -o ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG};
+#	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()
-if SnitVer ${WORLD}/elwix.ver; then
-	clean_romfs
+clean_romfs
+build_romfs
 
-	build_romfs
-	install_romfs
+install_romfs
+build_image
 
-	build_image
-else
-	echo "Skipped ELWIX RomFS build ..."
-fi
+install_romfs2
+build_image2
 
 echo "+++ Complete build ELWIX RomFS"