--- elwix/build_romfs.sh	2011/07/21 08:32:21	1.1.1.1.2.1
+++ elwix/build_romfs.sh	2012/03/20 09:54:19	1.2.4.4
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_romfs.sh,v 1.1.1.1.2.1 2011/07/21 08:32:21 misho Exp $
+# $Id: build_romfs.sh,v 1.2.4.4 2012/03/20 09:54:19 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -58,7 +58,7 @@ build_romfs()
 	install -d share/skel;
 	install -d share/zoneinfo;
 
-	ln -s /elwix/local local;
+	ln -s /elwix/pkg pkg;
 
 	chown -hR root:wheel .
 	cd -
@@ -83,8 +83,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,6 +98,7 @@ 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
@@ -113,18 +112,18 @@ install_romfs()
 
 build_image()
 {
-	echo "+++ Build elwix firmware image ..."
-	makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${FW_SIZE} \
-		$REL/$FW_IMG $FW_USR
+	echo "+++ Build ELWIX Firmware image ..."
+	makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${ROMFS_SIZE} \
+		${REL}/${ROMFS_IMG} ${ROMFS_USR}
 
-	MDDEV=$(mdconfig -a -t vnode -f $REL/$FW_IMG);
+	MDDEV=$(mdconfig -a -t vnode -f ${REL}/${ROMFS_IMG});
 	tunefs -L elwixFirmware /dev/$MDDEV;
 #	mount /dev/$MDDEV /mnt
 #	umount /mnt
 	mdconfig -d -u $MDDEV;
 
-	mkuzip -s 8192 -o $REL/${FW_IMG}.uzip $REL/$FW_IMG;
-	mv $REL/${FW_IMG}.uzip $REL/${FW_IMG}
+	mkuzip -s 8192 -o ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG};
+	mv ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG}
 }
 
 ### main()
@@ -134,7 +133,7 @@ if SnitVer ${WORLD}/elwix.ver; then
 	build_romfs
 	install_romfs
 
-#build_image
+	build_image
 else
 	echo "Skipped ELWIX RomFS build ..."
 fi