[oe-commits] org.oe.dev merge of '0460728e4ca997f4b4f35b944f412c51046ff418'

[mickeyl commit]

merge of '0460728e4ca997f4b4f35b944f412c51046ff418'
     and '1b0acc215822890043b4d815ac222a6c2e77a15b'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: a93cc8da494bfb1ab4e086350968df38190deeee
ViewMTN: http://monotone.openembedded.org/revision/info/a93cc8da494bfb1ab4e086350968df38190deeee
Files:
1
packages/apmd/apmd-3.2.2/90-wifi-off
packages/apmd/apmd_3.2.2.bb
conf/distro/include/sane-srcdates.inc
Diffs:

#
# mt diff -r0460728e4ca997f4b4f35b944f412c51046ff418 -ra93cc8da494bfb1ab4e086350968df38190deeee
#
# 
# 
# add_file "packages/apmd/apmd-3.2.2/90-wifi-off"
#  content [dd2b60322fc6d9136495d7c41f7c1f9e73ed8937]
# 
# patch "packages/apmd/apmd_3.2.2.bb"
#  from [468e386d67d32dcf673ffd462940acdf206daeee]
#    to [7e1be5e159f4f8ae062efeda347fda7056e83fc8]
# 
============================================================
--- packages/apmd/apmd-3.2.2/90-wifi-off	dd2b60322fc6d9136495d7c41f7c1f9e73ed8937
+++ packages/apmd/apmd-3.2.2/90-wifi-off	dd2b60322fc6d9136495d7c41f7c1f9e73ed8937
@@ -0,0 +1,12 @@
+#!/bin/sh
+#Author: Rolf Leggewie
+#
+# turn off wifi cards before suspend so they are fully reloaded upon resume
+
+wifislot = `pccardctl ls|egrep '(hostap|orinoco)'|cut -f 2 -d " "`
+if test $wifislot
+then
+  for slot in $wifislot; do
+    pccardctl eject $wifislot
+  done
+fi
============================================================
--- packages/apmd/apmd_3.2.2.bb	468e386d67d32dcf673ffd462940acdf206daeee
+++ packages/apmd/apmd_3.2.2.bb	7e1be5e159f4f8ae062efeda347fda7056e83fc8
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "Set of tools for managing notebook power consumption."
 SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "libtool-cross"
 LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz \
            file://debian.patch;patch=1 \
@@ -12,6 +12,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/
 	   file://unlinux.patch;patch=1 \
            file://init \
            file://default \
+           file://90-wifi-off \
            file://apmd_proxy \
            file://apmd_proxy.conf"
 
@@ -49,6 +50,7 @@ do_install() {
 
 	install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm
 	install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd
+	install -m 0755 ${WORKDIR}/90-wifi-off ${D}${sysconfdir}/apm/suspend.d
 	install -m 0755 ${WORKDIR}/apmd_proxy ${D}${sysconfdir}/apm/
 	install -m 0644 ${WORKDIR}/apmd_proxy.conf ${D}${datadir}/apmd/
 	install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/apmd


#
# mt diff -r1b0acc215822890043b4d815ac222a6c2e77a15b -ra93cc8da494bfb1ab4e086350968df38190deeee
#
# 
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [d33fc51f1ead3210a0b39d7a0f31a26c904cd333]
#    to [1dcbc89e2e936afc986ff0b9b2342ea57e980a70]
# 
============================================================
--- conf/distro/include/sane-srcdates.inc	d33fc51f1ead3210a0b39d7a0f31a26c904cd333
+++ conf/distro/include/sane-srcdates.inc	1dcbc89e2e936afc986ff0b9b2342ea57e980a70
@@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20080110"
+EFL_SRCDATE = "20080117"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -107,7 +107,7 @@ SRCDATE_e-wm ?= "${EFL_SRCDATE}"
 SRCDATE_entrance ?= "${EFL_SRCDATE}"
 SRCDATE_e-utils ?= "${EFL_SRCDATE}"
 SRCDATE_e-wm ?= "${EFL_SRCDATE}"
-SRCDATE_enna = "20080116"
+SRCDATE_enna = "${EFL_SRCDATE}"
 #SRCDATE_enna ?= "${EFL_SRCDATE}"
 SRCDATE_exquisite ?= "${EFL_SRCDATE}"