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

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/04/02 00:41:36+02:00 uni-frankfurt.de!mickeyl
make our suspend scripts return success. we might reconsider that once our kernels support rejection of apm events

BKrev: 424dce34iCY-QeUfToMyG54IYb6D6w

diff --git a/packages/network-suspend-scripts/files/ifupdown b/packages/network-suspend-scripts/files/ifupdown
index e69de29..d458da6 100644 (file)
--- a/packages/network-suspend-scripts/files/ifupdown
+++ b/packages/network-suspend-scripts/files/ifupdown
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Unloads/loads all interface that are up at time of suspend
+
+if [ "$1" = suspend ]; then
+       rm -f /var/run/ifstate-suspend
+       rm -f /var/run/ifstate-old
+       cp /var/run/ifstate /var/run/ifstate-old
+       cat /var/run/ifstate-old | (
+       IFS="="
+       while read IFACE LOGICAL; do
+               ifdown $IFACE
+               echo "$IFACE=$LOGICAL" >>/var/run/ifstate-suspend
+       done
+       rm -f /var/run/ifstate-old
+       )
+elif [ "$1" = resume ] && [ "$2" != standby ] && [ -f /var/run/ifstate-suspend ]; then
+       cat /var/run/ifstate-suspend | (
+       while read LINE; do
+               ifup $LINE
+       done
+       )
+       rm -f /var/run/ifstate-suspend
+fi
+
+: exit 0
+

diff --git a/packages/network-suspend-scripts/files/usbnet b/packages/network-suspend-scripts/files/usbnet
index 71d7256..3731f63 100644 (file)
--- a/packages/network-suspend-scripts/files/usbnet
+++ b/packages/network-suspend-scripts/files/usbnet
@@ -12,3 +12,5 @@ elif [ "$1" = resume ] && [ "$2" != standby ]; then
        modprobe $usbdmodule
 fi
 
+: exit 0
+

diff --git a/packages/network-suspend-scripts/network-suspend-scripts.bb b/packages/network-suspend-scripts/network-suspend-scripts.bb
index a50ffa3..1161f64 100644 (file)
--- a/packages/network-suspend-scripts/network-suspend-scripts.bb
+++ b/packages/network-suspend-scripts/network-suspend-scripts.bb
@@ -1,9 +1,11 @@
+DESCRIPTION = "Network suspend/resume scripts"
+SECTION = "base"
 LICENSE = "GPL"
-SRC_URI = "file://ifupdown \
-          file://usbnet"
-FILES = "${sysconfdir}/apm"
 PV = "1.1"
-PR = "r1"
+PR = "r2"
+
+SRC_URI = "file://ifupdown \
+           file://usbnet"  
 
 do_install() {
        install -d ${D}${sysconfdir}/apm/scripts.d
@@ -17,3 +19,4 @@ do_install() {
        ln -sf ../scripts.d/usbnet ${D}${sysconfdir}/apm/resume.d/20usbnet
 }
 
+FILES = "${sysconfdir}/apm"

diff --git a/packages/opie-alarm/opie-alarm/01opiealarm b/packages/opie-alarm/opie-alarm/01opiealarm
index e69de29..4ab70fe 100644 (file)
--- a/packages/opie-alarm/opie-alarm/01opiealarm
+++ b/packages/opie-alarm/opie-alarm/01opiealarm
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Starts opiealarm, which only runs while the iPaq sleeps 
+# and wakes it up when the RTC alarm goes off.
+
+if [ "$1" = suspend ]; then
+       /opt/QtPalmtop/bin/opiealarm -s -f
+elif [ "$1" = resume ] && [ "$2" != standby ]; then
+       /opt/QtPalmtop/bin/opiealarm -r -a 120
+fi
+
+: exit 0
+

diff --git a/packages/opie-alarm/opie-alarm_1.2.0.bb b/packages/opie-alarm/opie-alarm_1.2.0.bb
index e69de29..5903942 100644 (file)
--- a/packages/opie-alarm/opie-alarm_1.2.0.bb
+++ b/packages/opie-alarm/opie-alarm_1.2.0.bb
@@ -0,0 +1,7 @@
+include ${PN}.inc
+    
+ 
+PR = "r1"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \
+           file://01opiealarm "