--- elwix/build_romfs.sh	2011/07/05 23:43:00	1.1
+++ elwix/build_romfs.sh	2011/10/18 09:02:05	1.2
@@ -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 2011/07/05 23:43:00 misho Exp $
+# $Id: build_romfs.sh,v 1.2 2011/10/18 09:02:05 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -68,6 +68,7 @@ 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"
@@ -82,7 +83,7 @@ install_romfs()
 		install -v -m 644 ${BSDSRC}/etc/services $MISC;
 	fi
 
-	install -v -m 0555 /libexec/ld-elf.so.1 ${ROMFS_USR}/libexec
+	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;
@@ -97,98 +98,33 @@ install_romfs()
 
 	InstallList ${ELWIX_ROMFS} ${WORLD} ${ROMFS}
 
-	InstallProg ${ELWIX_LIB_AITIO} $LIBS;
-	InstallProg ${ELWIX_LIB_AITCRC} $LIBS;
-	InstallProg ${ELWIX_LIB_AITCFG} $LIBS;
-	InstallProg ${ELWIX_LIB_AITSESS} $LIBS;
-	InstallProg ${ELWIX_LIB_AITRPC} $LIBS;
-	InstallProg ${ELWIX_LIB_AITPELCO} $LIBS;
-	InstallProg ${ELWIX_LIB_AITPWD} $LIBS;
-	InstallProg ${ELWIX_LIB_AITSYNC} $LIBS;
-	InstallProg ${ELWIX_LIB_AITCLI} $LIBS;
+	InstallDir ${WORLD}/usr/local/bin $BIN
+	InstallDir ${WORLD}/usr/local/sbin $SBIN
+	InstallDir ${WORLD}/usr/local/libdata $LIBDATA
 
-	InstallProg ${AXL_LIB} $LIBS;
-	InstallProg ${AXL_LIB_NS} $LIBS;
-	InstallProg ${AXL_LIB_BABEL} $LIBS;
+	InstallFiles \*.so\* ${PKG}/lib $LIBS
+	InstallFiles \* ${PKG}/libexec $LIBEXEC
+	InstallFiles \* ${PKG}/libdata $LIBDATA
+	InstallFiles \* ${PKG}/bin $BIN
+	InstallFiles \* ${PKG}/sbin $SBIN
 
-#	find $PKG/elwix_tools/bin -type f -perm +111 -exec install -v {} $BIN \;
-#	find $PKG/elwix_tools/sbin -type f -perm +111 -exec install -v {} $SBIN \;
-
-# content of OS from 3th party software
-#	echo "+++ Install elwix additional programes ..."
-#	install -v -m 0111 $PKG/sudo/sudoreplay $BIN;
-#	install -v -o root -g wheel -m 4111 $PKG/sudo/sudo $BIN;
-#	ln -f $BIN/sudo $BIN/sudoedit;
-#	install -v -m 0111 $PKG/sudo/visudo $SBIN;
-#	install -v $PKG/sudo/.libs/libsudo_noexec.so $LIBS;
-#
-#	install -v $PKG/ttcp/ttcp $BIN;
-#	install -v $PKG/ntpd/ntpd $SBIN;
-#	install -v $PKG/choparp/choparp $SBIN;
-#	install -v $PKG/ipguard/ipguard $SBIN;
-#	install -v $PKG/mini_sendmail/mini_sendmail $SBIN/sendmail;
-#
-#	install -v $PKG/pftop/pftop $BIN;
-#	install -v $PKG/pfflowd/pfflowd $SBIN;
-#
-#	install -v $PKG/dhcp/work.freebsd/dhcpctl/omshell $BIN;
-#	install -v $PKG/dhcp/work.freebsd/server/dhcpd $SBIN;
-#	install -v $PKG/dhcp/work.freebsd/relay/dhcrelay $SBIN;
-#	install -v $PKG/dhcping/dhcping $SBIN;
-#	install -v $PKG/dhcdrop/src/dhcdrop $SBIN;
-#
-#	install -v $PKG/mrouted/map-mbone $SBIN;
-#	install -v $PKG/mrouted/mrinfo $SBIN;
-#	install -v $PKG/mrouted/mrouted $SBIN;
-#
-#	install -v $PKG/bmon/src/bmon $BIN;
-#	install -v $PKG/iftop/iftop $BIN;
-#	install -v $PKG/trafshow/trafshow $BIN;
-#
-#	install -v $PKG/libevent/.libs/libevent-1.4.so.4 $LIBS;
-#	install -v $PKG/libevent/.libs/libevent_extra-1.4.so.4 $LIBS;
-#	install -v $PKG/expat/.libs/libexpat.so.6 $LIBS;
-#	install -v $PKG/libpdel/libpdel.so.0 $LIBS;
-#
-#	install -v $PKG/mpd/src/mpd5 $SBIN;
-#	install -v $PKG/ifstated/ifstated $SBIN;
-#
-#	install -v $PKG/ipsec-tools/src/libipsec/.libs/libipsec.so.0 $LIBS;
-#	install -v $PKG/ipsec-tools/src/racoon/.libs/libracoon.so.0 $LIBS;
-#	install -v $PKG/ipsec-tools/src/racoon/eaytest $BIN;
-#	install -v $PKG/ipsec-tools/src/racoon/plainrsa-gen $BIN;
-#	install -v $PKG/ipsec-tools/src/racoon/.libs/racoonctl $BIN;
-#	install -v $PKG/ipsec-tools/src/racoon/.libs/racoon $SBIN;
-#	install -v $PKG/ipsec-tools/src/setkey/.libs/setkey $BIN;
-#
-#	install -v $PKG/arping/src/arping $SBIN;
-#	install -v $PKG/hping2/hping2 $SBIN;
-#	install -v $PKG/mtr/mtr $SBIN;
-#
-#	install -v $PKG/smartmontools/smartctl $BIN;
-#	install -v $PKG/smartmontools/smartd $SBIN;
-#
-#	install -v $PKG/conserver/conserver/conserver $SBIN;
-#	install -v $PKG/conserver/console/console $BIN;
-#
-## eeproms for atheros, used from elwix service tools
-#	cp -r /usr/local/libdata/athprom $FW_USR/libdata;
+	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${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()
@@ -198,7 +134,7 @@ if SnitVer ${WORLD}/elwix.ver; then
 	build_romfs
 	install_romfs
 
-#build_image
+	build_image
 else
 	echo "Skipped ELWIX RomFS build ..."
 fi