Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/05 14:27:25+01:00 (none)!br1
nylon-statistics

2005/01/05 14:20:50+01:00 (none)!br1
improved postinst for nylon-scripts, nylon-statistics, ntp (nylon) and prism2-firmware-update

BKrev: 41dbee37nRSzsrYX2DJsbnG6pcc5bQ

4 files changed, 69 insertions, 18 deletions

diff --git a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
index e69de29bb2..3699c3b47a 100644
--- a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
+++ b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "one-time install package to upgrade the firmware of all installed prism2 based cards."
+RDEPENDS = "hostap-modules-pci hostap-utils"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+LICENSE = "unknown"
+
+SRC_URI = "http://www.red-bean.com/~proski/firmware/1.7.4.tar.gz"
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+do_install() {
+	install -d ${D}/tmp
+	install ${WORKDIR}/${PV}/pk010101.hex ${D}/tmp
+	install ${WORKDIR}/${PV}/sf010704.hex ${D}/tmp
+}
+
+pkg_postinst() {
+if test "x$D" != "x"; then
+	exit 1
+else
+	FW_VERSION="v${PV}";
+	
+	fw_upgrade() {
+		IF=$1;
+		echo "firmware upgrade on $IF"
+		if [ ! `iwconfig $IF | grep "No such device"` ]; then
+			echo -n "  - current firmware version: ";
+			echo `hostap_diag $IF | grep STAID | awk '{print $3}'`;
+			if [[ `hostap_diag $IF | grep STAID | awk '{print $3}'` < $FW_VERSION ]]; then
+				echo "  - upgrading to version $FW_VERSION"
+				prism2_srec -f $IF /tmp/sf010704.hex /tmp/pk010101.hex
+			else 
+				echo "  - upgrade not necessary"
+			fi
+		fi
+		echo "done".
+	}
+	
+	for i in `ls /proc/net/hostap`; do
+		fw_upgrade $i;
+	done;
+fi
+}
+
+FILES_${PN} += "/tmp"
diff --git a/packages/ntp/ntp_4.1.2.bb b/packages/ntp/ntp_4.1.2.bb
index dba8632893..5b96e6cbf8 100644
--- a/packages/ntp/ntp_4.1.2.bb
+++ b/packages/ntp/ntp_4.1.2.bb
@@ -28,15 +28,15 @@ do_install_append() {
 }
 
 pkg_postinst_ntpdate_nylon() {
-#!/bin/sh
-if test "x$D" == "x"; then
-	mkdir -p /etc/cron/crontabs
+if test "x$D" != "x"; then
+	exit 1
+else
 	if ! grep -q ntpdate /etc/cron/crontabs/root; then
 		echo "adding crontab"
+		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
 		echo "30 * * * *    /usr/bin/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root
 	fi
 	update-rc.d -s busybox-cron defaults
+	update-rc.d -s ntpdate defaults 30
 fi
-update-rc.d -s ntpdate defaults 30
 }
- 
\ No newline at end of file
diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb
index 923ae89d45..eb6e913e0e 100644
--- a/packages/nylon/nylon-scripts_cvs.bb
+++ b/packages/nylon/nylon-scripts_cvs.bb
@@ -15,19 +15,21 @@ do_install() {
 }
 
 pkg_postinst() {
-#!/bin/sh
-update-rc.d hostap defaults 14
-update-rc.d bridge defaults 15
-update-rc.d ipaliases defaults 16
-update-rc.d firewall defaults 20
-update-rc.d routing defaults 20
-update-rc.d emergency-ip defaults 98
-update-rc.d flash-backup start 38 S . stop 38 0 6 .
-update-rc.d dummydate start 50 S . stop 50 0 6 .
-if test "x$D" == "x"; then
-	mkdir -p /etc/cron/crontabs
+if test "x$D" != "x"; then
+	exit 1
+else
+	update-rc.d -s hostap defaults 14
+	update-rc.d -s bridge defaults 15
+	update-rc.d -s ipaliases defaults 16
+	update-rc.d -s firewall defaults 20
+	update-rc.d -s routing defaults 20
+	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 .
+	
 	if ! grep -q flash-backup /etc/cron/crontabs/root; then
 		echo "adding crontab"
+		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
 		echo "0 * * * *    /etc/init.d/flash-backup backup" >> /etc/cron/crontabs/root
 	fi
 	update-rc.d -s busybox-cron defaults
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index aef674b6b2..060e6182d0 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -18,13 +18,16 @@ do_install() {
 }
 
 pkg_postinst() {
-if test "x$D" == "x"; then
-	mkdir -p /etc/cron/crontabs
+if test "x$D" != "x"; then
+	exit 1
+else
 	if ! grep -q collect.sh /etc/cron/crontabs/root; then
 		echo "adding crontab"
+		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
 		echo "*/5 * * * *    /usr/sbin/collect.sh" >> /etc/cron/crontabs/root
 	fi
 	update-rc.d -s busybox-cron defaults
+	/etc/init.d/busybox-cron reload
 	if [ ! -e /etc/httpd.conf ]; then
 		echo "A:*" > /etc/httpd.conf
 	fi