[oe-commits] org.oe.dev apmd|hostap|orinoco: move the fix for bug 3664 into a separate package
Laibsch commit
openembedded-commits at lists.openembedded.org
Fri Jan 18 21:42:07 UTC 2008
apmd|hostap|orinoco: move the fix for bug 3664 into a separate package
* the package is RRECOMMENDS and should be installed automatically, but can
be removed if one so desires
* reorder some fields according to StyleGuide
* bump PR
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 157be493d58806df1aa6f89ba3922778bf6d6302
ViewMTN: http://monotone.openembedded.org/revision/info/157be493d58806df1aa6f89ba3922778bf6d6302
Files:
1
packages/apmd/apmd-3.2.2/90-wifi-off
packages/apmd/files/90-wifi-off
packages/apmd/files
packages/apmd/apm-wifi-suspendfix_0.1.bb
packages/apmd/apmd_3.2.2.bb
packages/hostap/hostap-modules.inc
packages/hostap/hostap-modules_0.3.10.bb
packages/hostap/hostap-modules_0.3.7.bb
packages/hostap/hostap-modules_0.3.9.bb
packages/hostap/hostap-modules_0.4.4.bb
packages/hostap/hostap-modules_0.4.7.bb
packages/orinoco/orinoco-modules.inc
packages/orinoco/orinoco-modules_0.13e.bb
packages/orinoco/orinoco-modules_0.15rc1.bb
packages/orinoco/orinoco-modules_0.15rc2.bb
packages/orinoco/orinoco-modules_cvs.bb
Diffs:
#
# mt diff -r29cdddd76ac62c5b8cc96fb0fc570d0ccdc1bd23 -r157be493d58806df1aa6f89ba3922778bf6d6302
#
#
#
# rename "packages/apmd/apmd-3.2.2/90-wifi-off"
# to "packages/apmd/files/90-wifi-off"
#
# add_dir "packages/apmd/files"
#
# add_file "packages/apmd/apm-wifi-suspendfix_0.1.bb"
# content [32e32669e7da5dc9936acf3cb159da1b81b66067]
#
# patch "packages/apmd/apmd_3.2.2.bb"
# from [7e1be5e159f4f8ae062efeda347fda7056e83fc8]
# to [802998c3cb348e128c51dbb572c513ce08435bae]
#
# patch "packages/hostap/hostap-modules.inc"
# from [8dd8a74a0d2be6a98f9774a686a1d8d88283a103]
# to [4aef1e5957ceb92d896155aa725805e7bd3bb86e]
#
# patch "packages/hostap/hostap-modules_0.3.10.bb"
# from [8268380fd8f99bbd9dcab883ffa9730810778ce8]
# to [f0cd0ca67584afd4954087e9394e9a72b31f0f5e]
#
# patch "packages/hostap/hostap-modules_0.3.7.bb"
# from [dbc9b37cbb3ece1d1ce9dc4a26eae1e75f40e7d5]
# to [54e616aabe83011887d6a02fdc4933c2cb555c66]
#
# patch "packages/hostap/hostap-modules_0.3.9.bb"
# from [319028d0bab094143c5509f49a1b93070c93a0bf]
# to [489393907d53f0fc4a24ee6766b164cdd43c8d3f]
#
# patch "packages/hostap/hostap-modules_0.4.4.bb"
# from [5916d2b1ebbdcb7e7c409ca9f4991a0c9e0d7569]
# to [68e7cc2df00dd02ac97e6e2b5a24196cc6b44e66]
#
# patch "packages/hostap/hostap-modules_0.4.7.bb"
# from [ac1576508c45db0d5aa6328e7509bb8054dbf9c0]
# to [cfa9b284c023a9f58123c9703f4fb2255560312b]
#
# patch "packages/orinoco/orinoco-modules.inc"
# from [a0f71de24feba1b09e5a8e110fed2b234ea823b7]
# to [4727c8643a7a5e60cc6a635e8ffe60d7ed626abb]
#
# patch "packages/orinoco/orinoco-modules_0.13e.bb"
# from [42df7a5fe957c5a457e5b6d10f5fa99b0eccf8ee]
# to [10833ef43de324bc4d7d5d673f2adacc4d5a88b8]
#
# patch "packages/orinoco/orinoco-modules_0.15rc1.bb"
# from [2e800a3702a89c002b802721cb278ccc07a0c3c7]
# to [e160ab3ef9f8b649453c7e66b692ee61ac3681ff]
#
# patch "packages/orinoco/orinoco-modules_0.15rc2.bb"
# from [365c34b2f550cda6dee19a2707bddd5521d4426f]
# to [0239d8399839ce389b6dcedda6f9840a7d9438ab]
#
# patch "packages/orinoco/orinoco-modules_cvs.bb"
# from [5deb2baa3d4811d2c877109a966a271eed2abc9d]
# to [e07eb651378190b2697c2213f6f7db4712b19a0c]
#
============================================================
--- packages/apmd/apm-wifi-suspendfix_0.1.bb 32e32669e7da5dc9936acf3cb159da1b81b66067
+++ packages/apmd/apm-wifi-suspendfix_0.1.bb 32e32669e7da5dc9936acf3cb159da1b81b66067
@@ -0,0 +1,10 @@
+DESCRIPTION = "Hacky workaround for bug 3664 (some wifi cards don't recover from suspend) until a real fix is found"
+AUTHOR = "Rolf Leggewie"
+PR = "r0"
+
+SRC_URI = "file://90-wifi-off"
+
+do_install() {
+ install -d ${D}${sysconfdir}/apm/suspend.d
+ install -m 0755 ${WORKDIR}/90-wifi-off ${D}${sysconfdir}/apm/suspend.d
+}
============================================================
--- packages/apmd/apmd_3.2.2.bb 7e1be5e159f4f8ae062efeda347fda7056e83fc8
+++ packages/apmd/apmd_3.2.2.bb 802998c3cb348e128c51dbb572c513ce08435bae
@@ -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 = "r9"
+PR = "r10"
SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz \
file://debian.patch;patch=1 \
@@ -12,7 +12,6 @@ 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"
@@ -50,7 +49,6 @@ 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
============================================================
--- packages/hostap/hostap-modules.inc 8dd8a74a0d2be6a98f9774a686a1d8d88283a103
+++ packages/hostap/hostap-modules.inc 4aef1e5957ceb92d896155aa725805e7bd3bb86e
@@ -1,15 +1,14 @@ LICENSE = "GPL"
DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
SECTION = "kernel/modules"
PRIORITY = "optional"
LICENSE = "GPL"
+RRECOMMENDS = "apm-wifi-suspendfix"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz"
-
SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
SRC_URI_append_mtx-2 = " file://mtx_compat.diff;patch=1;pnum=0 \
file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
-
SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
S = "${WORKDIR}/hostap-driver-${PV}"
============================================================
--- packages/hostap/hostap-modules_0.3.10.bb 8268380fd8f99bbd9dcab883ffa9730810778ce8
+++ packages/hostap/hostap-modules_0.3.10.bb f0cd0ca67584afd4954087e9394e9a72b31f0f5e
@@ -1,5 +1,5 @@ require hostap-modules.inc
require hostap-modules.inc
-PR = "r8"
+PR = "r9"
SRC_URI += "file://Makefile.patch;patch=1 \
file://add_event.patch;patch=1 \
============================================================
--- packages/hostap/hostap-modules_0.3.7.bb dbc9b37cbb3ece1d1ce9dc4a26eae1e75f40e7d5
+++ packages/hostap/hostap-modules_0.3.7.bb 54e616aabe83011887d6a02fdc4933c2cb555c66
@@ -1,5 +1,5 @@ require hostap-modules.inc
require hostap-modules.inc
-PR = "r8"
+PR = "r9"
SRC_URI += "file://Makefile.patch;patch=1 \
file://add_event.patch;patch=1 \
============================================================
--- packages/hostap/hostap-modules_0.3.9.bb 319028d0bab094143c5509f49a1b93070c93a0bf
+++ packages/hostap/hostap-modules_0.3.9.bb 489393907d53f0fc4a24ee6766b164cdd43c8d3f
@@ -1,5 +1,5 @@ require hostap-modules.inc
require hostap-modules.inc
-PR = "r10"
+PR = "r11"
SRC_URI += "file://Makefile.patch;patch=1 \
file://add_event.patch;patch=1 \
============================================================
--- packages/hostap/hostap-modules_0.4.4.bb 5916d2b1ebbdcb7e7c409ca9f4991a0c9e0d7569
+++ packages/hostap/hostap-modules_0.4.4.bb 68e7cc2df00dd02ac97e6e2b5a24196cc6b44e66
@@ -1,4 +1,4 @@ require hostap-modules.inc
require hostap-modules.inc
-PR = "r6"
+PR = "r7"
SRC_URI += "file://kernel_updates.patch;patch=1"
============================================================
--- packages/hostap/hostap-modules_0.4.7.bb ac1576508c45db0d5aa6328e7509bb8054dbf9c0
+++ packages/hostap/hostap-modules_0.4.7.bb cfa9b284c023a9f58123c9703f4fb2255560312b
@@ -1,4 +1,4 @@ require hostap-modules.inc
require hostap-modules.inc
-PR = "r4"
+PR = "r5"
SRC_URI += "file://kernel_updates.patch;patch=1"
============================================================
--- packages/orinoco/orinoco-modules.inc a0f71de24feba1b09e5a8e110fed2b234ea823b7
+++ packages/orinoco/orinoco-modules.inc 4727c8643a7a5e60cc6a635e8ffe60d7ed626abb
@@ -1,7 +1,11 @@ PRIORITY = "optional"
DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \
Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family."
SECTION = "kernel/modules"
PRIORITY = "optional"
+RDEPENDS_orinoco-modules-pci = "orinoco-modules"
+RDEPENDS_orinoco-modules-usb = "orinoco-modules"
+RDEPENDS_orinoco-modules-nortel = "orinoco-modules"
+RRECOMMENDS_orinoco-modules-cs = "apm-wifi-suspendfix"
PROVIDES = "spectrum-modules"
LICENSE = "GPL"
@@ -16,6 +20,3 @@ FILES_orinoco-modules = "/lib/modules/"
FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
/lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}"
FILES_orinoco-modules = "/lib/modules/"
-RDEPENDS_orinoco-modules-pci = "orinoco-modules"
-RDEPENDS_orinoco-modules-usb = "orinoco-modules"
-RDEPENDS_orinoco-modules-nortel = "orinoco-modules"
============================================================
--- packages/orinoco/orinoco-modules_0.13e.bb 42df7a5fe957c5a457e5b6d10f5fa99b0eccf8ee
+++ packages/orinoco/orinoco-modules_0.13e.bb 10833ef43de324bc4d7d5d673f2adacc4d5a88b8
@@ -1,6 +1,7 @@ require orinoco-modules.inc
require orinoco-modules.inc
-PR = "r4"
+RDEPENDS_orinoco-modules-cs += "orinoco-modules"
+PR = "r5"
SRC_URI += "\
file://crosscompile.patch;patch=1 \
@@ -26,4 +27,3 @@ FILES_orinoco-modules-cs = "/lib/modules
}
FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"
-RDEPENDS_orinoco-modules-cs = "orinoco-modules"
============================================================
--- packages/orinoco/orinoco-modules_0.15rc1.bb 2e800a3702a89c002b802721cb278ccc07a0c3c7
+++ packages/orinoco/orinoco-modules_0.15rc1.bb e160ab3ef9f8b649453c7e66b692ee61ac3681ff
@@ -1,8 +1,9 @@ DEPENDS = "orinoco-conf spectrum-fw"
require orinoco-modules.inc
DEPENDS = "orinoco-conf spectrum-fw"
-RDEPENDS = "orinoco-conf"
-PR = "r7"
+RDEPENDS += "orinoco-conf"
+RDEPENDS_orinoco-modules-cs += "orinoco-modules spectrum-fw"
+PR = "r8"
SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \
file://makefile_fix.patch;patch=1 \
@@ -17,4 +18,3 @@ FILES_orinoco-modules-cs = "/lib/modules
}
FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}"
-RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw"
============================================================
--- packages/orinoco/orinoco-modules_0.15rc2.bb 365c34b2f550cda6dee19a2707bddd5521d4426f
+++ packages/orinoco/orinoco-modules_0.15rc2.bb 0239d8399839ce389b6dcedda6f9840a7d9438ab
@@ -1,8 +1,9 @@ DEPENDS = "orinoco-conf spectrum-fw"
require orinoco-modules.inc
DEPENDS = "orinoco-conf spectrum-fw"
-RDEPENDS = "orinoco-conf"
-PR = "r9"
+RDEPENDS += "orinoco-conf"
+RDEPENDS_orinoco-modules-cs += "orinoco-modules spectrum-fw"
+PR = "r10"
SRC_URI += "\
file://makefile_fix.patch;patch=1 \
@@ -18,4 +19,3 @@ FILES_orinoco-modules-cs = "/lib/modules
}
FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}"
-RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw"
============================================================
--- packages/orinoco/orinoco-modules_cvs.bb 5deb2baa3d4811d2c877109a966a271eed2abc9d
+++ packages/orinoco/orinoco-modules_cvs.bb e07eb651378190b2697c2213f6f7db4712b19a0c
@@ -1,8 +1,9 @@ DEPENDS = "orinoco-conf spectrum-fw"
require orinoco-modules.inc
DEPENDS = "orinoco-conf spectrum-fw"
-RDEPENDS = "orinoco-conf"
-PR = "r2"
+RDEPENDS += "orinoco-conf"
+RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw"
+PR = "r3"
PARALLEL_MAKE = ""
EXTRA_OEMAKE = 'KERNEL_SRC="${KERNEL_STAGING_DIR}"'
@@ -20,4 +21,3 @@ FILES_orinoco-modules-cs = "/lib/modules
}
FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}"
-RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw"
More information about the Openembedded-commits
mailing list