nylon: updated images and nylon specific packages from 4G trunk

* updated list of supported packages in nylon-feed
* new image nylon-image-extended aiming to put nylon-feed into one image (for debugging)
* new versions of nylon-scripts, nylon-statistics, simple-firewall

4 files changed, 17 insertions, 12 deletions

diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb
index b7ce512e87..e4917d310f 100644
--- a/packages/nylon/nylon-scripts_cvs.bb
+++ b/packages/nylon/nylon-scripts_cvs.bb
@@ -5,14 +5,17 @@ SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPLv2"
-PV = "1:0.0+cvs${SRCDATE}"
+SRCDATE = "20060114"
+PV = "1.0.0+cvs${SRCDATE}"
 PR = "r2"
+RDEPENDS = "bash"
 
 SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz"
 S = "${WORKDIR}/${PN}"
 INHIBIT_PACKAGE_STRIP = "1"
 
 do_install() {
+	install -d -m 755 ${D}
 	(cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf -
 }
 
@@ -21,8 +24,8 @@ if test "x$D" != "x"; then
 	exit 1
 else
 	update-rc.d -s hostap defaults 14
-	update-rc.d -s firewall defaults 20
-	update-rc.d -s routing defaults 20
+	update-rc.d -s firewall defaults 16
+	update-rc.d -s routing defaults 17
 	update-rc.d -s emergency-ip defaults 98
 	update-rc.d -s flash-backup start 38 S . stop 38 0 6 .
 	update-rc.d -s dummydate start 50 S . stop 50 0 6 .
@@ -46,8 +49,6 @@ fi
 pkg_postrm() {
 #!/bin/sh -e
 update-rc.d hostap remove
-update-rc.d bridge remove
-update-rc.d ipaliases remove
 update-rc.d firewall remove
 update-rc.d routing remove
 update-rc.d emergency-ip remove
@@ -55,4 +56,5 @@ update-rc.d flash-backup remove
 update-rc.d dummydate remove
 }
 
-CONFFILES_${PN} = "/etc/nylon/backup.list /etc/nylon/hostap.conf /etc/nylon/interfaces.conf /etc/nylon/route.list"
+CONFFILES_${PN} = "/etc/nylon/backup.list /etc/nylon/hostap.conf /etc/nylon/check-process.list \
+	/etc/nylon/interfaces.conf /etc/nylon/route.list /etc/nylon/wds-bridge.conf"
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index e24d9c93e8..21c588e78a 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -4,7 +4,8 @@ SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPLv2"
-PV = "1:0.0+cvs${SRCDATE}"
+SRCDATE = "20050909"
+PV = "1.0.0+cvs${SRCDATE}"
 PR = "r1"
 
 SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz"
@@ -13,11 +14,11 @@ INHIBIT_PACKAGE_STRIP = "1"
 
 do_install() {
 	install -d ${D}/srv/www/cgi-bin
-	install -d ${D}${sbindir}
+	install -d ${D}/${sbindir}
 	ln -s /var/tmp ${D}/srv/www/rrd-img
 	install -m 755 ${S}/*.html ${D}/srv/www/cgi-bin
 	ln -s /var/tmp/nav.inc.html ${D}/srv/www/cgi-bin
-	install -m 755 ${S}/collect.sh ${D}${sbindir}
+	install -m 755 ${S}/collect.sh ${D}/${sbindir}
 }
 
 pkg_postinst() {
diff --git a/packages/nylon/simple-firewall.bb b/packages/nylon/simple-firewall.bb
index 5698eb732a..35911dad2c 100644
--- a/packages/nylon/simple-firewall.bb
+++ b/packages/nylon/simple-firewall.bb
@@ -4,8 +4,9 @@ PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-SRCDATE = "20060114"
-PV = "cvs${SRCDATE}"
+SRCDATE = "20060810"
+PV = "cvs${CVSDATE}"
+
 
 INHIBIT_PACKAGE_STRIP = "1"
 
diff --git a/packages/nylon/yamonenv.bb b/packages/nylon/yamonenv.bb
index bf4c94200e..2c2fb3cbb7 100644
--- a/packages/nylon/yamonenv.bb
+++ b/packages/nylon/yamonenv.bb
@@ -3,7 +3,8 @@ SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Michael Stickel <michael.stickel@4g-systems.biz>"
 LICENSE = "GPL"
-PV = "1:0.0+cvs${SRCDATE}"
+SRCDATE = "20050909"
+PV = "1.0.0+cvs${SRCDATE}"
 
 SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz"
 S = "${WORKDIR}/${PN}"