diff options
| -rw-r--r-- | packages/bluez/bluez-utils/02dtl1_cs.sh | 57 | ||||
| -rwxr-xr-x | packages/opie-alarm/opie-alarm/01opiealarm | 4 | ||||
| -rw-r--r-- | packages/opie-alarm/opie-alarm_cvs.bb | 2 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 5 |
4 files changed, 7 insertions, 61 deletions
diff --git a/packages/bluez/bluez-utils/02dtl1_cs.sh b/packages/bluez/bluez-utils/02dtl1_cs.sh deleted file mode 100644 index fd81508010..0000000000 --- a/packages/bluez/bluez-utils/02dtl1_cs.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -case "$1" in - suspend) - if [ "`/bin/hciconfig`" != "" ]; then - #If hciconfig outputs anything then there's probably a Bluetooth - # CF card in the slot so shut it down. - hcitool dc `hcitool con | grep ACL | sed 's/^.*\([0-9A-F]\{2\}\(:[0-9A-F]\{2\}\)\{5\}\).*$/\1/'` - hciconfig hci0 down - killall hciattach > /dev/null 2>&1 - fi - ;; - - resume) - #check for kernel version - if [ "`uname -r | grep 2.4.`" != "" ]; then - k="o" - elif [ "`uname -r | grep 2.6.`" != "" ]; then - k="ko" - else - exit 0 - fi - - if test -e /sbin/cardctl; then - CARDCTL=/sbin/cardctl - elif test -e /sbin/pccardctl; then - CARDCTL=/sbin/pccardctl - else - exit 0 - fi - - if [ "`lsmod | grep hci_uart`" != "" ]; then - #If the hci_usb module is still loaded then there's a serial based - # Bluetooth CF card in the slot, which only needs a resume to get it going - # again. - rfcomm bind all - $CARDCTL resume - hciconfig hci0 up - else - # only works for nokia dtl1 cards - for f in /lib/modules/`uname -r`/kernel/drivers/bluetooth/dtl1_cs.$k - do - #Enumerate all the self-contained Bluetooth CF card drivers - f=`echo $f | sed 's/\.'$k'$//'` - f=`basename $f` - if [ "`lsmod | grep $f`" != "" ]; then - #If one of these drivers is still loaded, then there is probably - #a non-serial based Bluetooth CF card in the slot that needs - #ejecting and reinserting to get it going again - rfcomm bind all - $CARDCTL eject - $CARDCTL insert - hciconfig hci0 up - fi - done - fi -esac diff --git a/packages/opie-alarm/opie-alarm/01opiealarm b/packages/opie-alarm/opie-alarm/01opiealarm index 4ab70fe3a8..6a12319cdc 100755 --- a/packages/opie-alarm/opie-alarm/01opiealarm +++ b/packages/opie-alarm/opie-alarm/01opiealarm @@ -3,9 +3,9 @@ # and wakes it up when the RTC alarm goes off. if [ "$1" = suspend ]; then - /opt/QtPalmtop/bin/opiealarm -s -f + opiealarm -s -f elif [ "$1" = resume ] && [ "$2" != standby ]; then - /opt/QtPalmtop/bin/opiealarm -r -a 120 + opiealarm -r -a 120 fi : exit 0 diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb index 9b0cbe3184..b5927363d1 100644 --- a/packages/opie-alarm/opie-alarm_cvs.bb +++ b/packages/opie-alarm/opie-alarm_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \ file://01opiealarm " diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 0c11eeedc1..1ef70f63cd 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r37" +PR = "r38" DEPENDS = "task-boot" PROVIDES = "${PACKAGES}" @@ -46,7 +46,10 @@ PACKAGE_ARCH = "all" PACKAGE_ARCH_task-base = "${MACHINE_ARCH}" PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}" PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}" +PACKAGE_ARCH_task-base-bluetooth = "${MACHINE_ARCH}" +PACKAGE_ARCH_task-base-irda = "${MACHINE_ARCH}" PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}" +PACKAGE_ARCH_task-base-wifi = "${MACHINE_ARCH}" # # linux-hotplug or none |