diff options
| author | Matthias Hentges <oe@hentges.net> | 2007-11-19 17:00:41 +0000 |
|---|---|---|
| committer | Matthias Hentges <oe@hentges.net> | 2007-11-19 17:00:41 +0000 |
| commit | 85cadd8dd8537540f27429c10852e29d4cdae6cf (patch) | |
| tree | 61b03b9de6deda7baef9b0e8861f1fc7e2d69df7 | |
| parent | cdcc825f5cb18922289afe3a50d5be19a47d8d04 (diff) | |
| parent | 154b49c75d9058b9904986cc1d0f2913a7ce6388 (diff) | |
merge of 'a938b4c71ba294501c06bafd379472de8bf9458e'
and 'd0ce51a2e141b6101beacdff037b4401d8e4c275'
| -rw-r--r-- | packages/display-brightness/display-brightness.sh | 2 | ||||
| -rw-r--r-- | packages/display-brightness/display-brightness_1.0.0.bb | 2 | ||||
| -rw-r--r-- | packages/hostap/files/hostap-fw-load.patch | 4 | ||||
| -rw-r--r-- | packages/hostap/hostap-utils.inc | 2 | ||||
| -rw-r--r-- | packages/zaurusd/files/zaurus-hinge.bl-on | 18 | ||||
| -rw-r--r-- | packages/zaurusd/zaurusd_svn.bb | 2 |
6 files changed, 24 insertions, 6 deletions
diff --git a/packages/display-brightness/display-brightness.sh b/packages/display-brightness/display-brightness.sh index a82c748309..935dabff7b 100644 --- a/packages/display-brightness/display-brightness.sh +++ b/packages/display-brightness/display-brightness.sh @@ -38,7 +38,7 @@ if [ "$1" = "up" ]; then fi if [ "$1" = "down" ]; then - if [ $ACTUAL_BRIGHTNESS -eq 0 ]; then + if [ $ACTUAL_BRIGHTNESS -lt 2 ]; then exit 0 elif [ $ACTUAL_BRIGHTNESS -lt $STEP ]; then STEP=1 diff --git a/packages/display-brightness/display-brightness_1.0.0.bb b/packages/display-brightness/display-brightness_1.0.0.bb index bc46c16631..f06fde0fa9 100644 --- a/packages/display-brightness/display-brightness_1.0.0.bb +++ b/packages/display-brightness/display-brightness_1.0.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "display brightness utility" AUTHOR = "Patrick Steiner <patrick.steiner@a1.net>" DEPENDS = "" PRIORITY = "optional" -PR = "r3" +PR = "r4" LICENSE = "GPLv2" SRC_URI = "file://display-brightness.sh" diff --git a/packages/hostap/files/hostap-fw-load.patch b/packages/hostap/files/hostap-fw-load.patch index 88adee2bc9..c9fe9360b0 100644 --- a/packages/hostap/files/hostap-fw-load.patch +++ b/packages/hostap/files/hostap-fw-load.patch @@ -12,8 +12,8 @@ -PRI=/etc/pcmcia/PM010102.HEX -STA=/etc/pcmcia/RF010802.HEX -PRISM2_SREC=/usr/local/bin/prism2_srec -+PRI=/etc/pcmcia/pm010102.hex -+STA=/etc/pcmcia/rf010804.hex ++PRI=/lib/firmware/pm010102.hex ++STA=/lib/firmware/rf010704.hex +PRISM2_SREC=/usr/sbin/prism2_srec set -e diff --git a/packages/hostap/hostap-utils.inc b/packages/hostap/hostap-utils.inc index 2e1897c9ba..94cb42010d 100644 --- a/packages/hostap/hostap-utils.inc +++ b/packages/hostap/hostap-utils.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://hostap.epitest.fi" SECTION = "kernel/userland" PRIORITY = "optional" LICENSE = "GPL" -PR = "r4" +PR = "r5" SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \ file://hostap-fw-load.patch;patch=1" diff --git a/packages/zaurusd/files/zaurus-hinge.bl-on b/packages/zaurusd/files/zaurus-hinge.bl-on index 6d416ad8c4..b9b0e68749 100644 --- a/packages/zaurusd/files/zaurus-hinge.bl-on +++ b/packages/zaurusd/files/zaurus-hinge.bl-on @@ -8,3 +8,21 @@ test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin" ${ZD_BINDIR}/bl on + +# If the backlight does not come back on after a suspend, the driver is +# still "on" (hence "bl on" does nothing) with a brightness of "0" + +if test "`bl | awk '{print $2}'`" = "0" +then + x=0 + while test "$x" != 4 + do + bl 10 + usleep 10 + bl 50 + usleep 10 + + let x=$x+1 + done +fi + diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 2b918bbaa3..aa503f273a 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "tslib" RDEPENDS = "procps" PV = "0.0+svn${SRCDATE}" -PR = "r10" +PR = "r11" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ |