diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/apmd/apm-wifi-suspendfix_0.1.bb | 10 | ||||
-rw-r--r-- | packages/apmd/apmd_3.2.2.bb | 4 | ||||
-rw-r--r-- | packages/apmd/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/apmd/files/90-wifi-off (renamed from packages/apmd/apmd-3.2.2/90-wifi-off) | 0 | ||||
-rw-r--r-- | packages/hostap/hostap-modules.inc | 3 | ||||
-rw-r--r-- | packages/hostap/hostap-modules_0.3.10.bb | 2 | ||||
-rw-r--r-- | packages/hostap/hostap-modules_0.3.7.bb | 2 | ||||
-rw-r--r-- | packages/hostap/hostap-modules_0.3.9.bb | 2 | ||||
-rw-r--r-- | packages/hostap/hostap-modules_0.4.4.bb | 2 | ||||
-rw-r--r-- | packages/hostap/hostap-modules_0.4.7.bb | 2 | ||||
-rw-r--r-- | packages/orinoco/orinoco-modules.inc | 7 | ||||
-rw-r--r-- | packages/orinoco/orinoco-modules_0.13e.bb | 4 | ||||
-rw-r--r-- | packages/orinoco/orinoco-modules_0.15rc1.bb | 6 | ||||
-rw-r--r-- | packages/orinoco/orinoco-modules_0.15rc2.bb | 6 | ||||
-rw-r--r-- | packages/orinoco/orinoco-modules_cvs.bb | 6 |
15 files changed, 32 insertions, 24 deletions
diff --git a/packages/apmd/apm-wifi-suspendfix_0.1.bb b/packages/apmd/apm-wifi-suspendfix_0.1.bb new file mode 100644 index 0000000000..ab9959f3f1 --- /dev/null +++ b/packages/apmd/apm-wifi-suspendfix_0.1.bb @@ -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 +} diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb index e9f5c0cbef..eede501d5b 100644 --- a/packages/apmd/apmd_3.2.2.bb +++ b/packages/apmd/apmd_3.2.2.bb @@ -3,7 +3,7 @@ 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/apmd_${PV}.orig.tar.gz \ 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 diff --git a/packages/apmd/files/.mtn2git_empty b/packages/apmd/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/apmd/files/.mtn2git_empty diff --git a/packages/apmd/apmd-3.2.2/90-wifi-off b/packages/apmd/files/90-wifi-off index c54936c4be..c54936c4be 100644 --- a/packages/apmd/apmd-3.2.2/90-wifi-off +++ b/packages/apmd/files/90-wifi-off diff --git a/packages/hostap/hostap-modules.inc b/packages/hostap/hostap-modules.inc index 9a928210c6..01e4e53710 100644 --- a/packages/hostap/hostap-modules.inc +++ b/packages/hostap/hostap-modules.inc @@ -2,14 +2,13 @@ DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 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}" diff --git a/packages/hostap/hostap-modules_0.3.10.bb b/packages/hostap/hostap-modules_0.3.10.bb index 1935d4ed22..7a76a0c1fa 100644 --- a/packages/hostap/hostap-modules_0.3.10.bb +++ b/packages/hostap/hostap-modules_0.3.10.bb @@ -1,5 +1,5 @@ require hostap-modules.inc -PR = "r8" +PR = "r9" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb index 9bf337078a..8daa3455d8 100644 --- a/packages/hostap/hostap-modules_0.3.7.bb +++ b/packages/hostap/hostap-modules_0.3.7.bb @@ -1,5 +1,5 @@ require hostap-modules.inc -PR = "r8" +PR = "r9" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb index 051afadca0..aa1dfde03a 100644 --- a/packages/hostap/hostap-modules_0.3.9.bb +++ b/packages/hostap/hostap-modules_0.3.9.bb @@ -1,5 +1,5 @@ require hostap-modules.inc -PR = "r10" +PR = "r11" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb index 74f39d8b58..f415d31614 100644 --- a/packages/hostap/hostap-modules_0.4.4.bb +++ b/packages/hostap/hostap-modules_0.4.4.bb @@ -1,4 +1,4 @@ require hostap-modules.inc -PR = "r6" +PR = "r7" SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/packages/hostap/hostap-modules_0.4.7.bb b/packages/hostap/hostap-modules_0.4.7.bb index e4a34c1916..369240cfe4 100644 --- a/packages/hostap/hostap-modules_0.4.7.bb +++ b/packages/hostap/hostap-modules_0.4.7.bb @@ -1,4 +1,4 @@ require hostap-modules.inc -PR = "r4" +PR = "r5" SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/packages/orinoco/orinoco-modules.inc b/packages/orinoco/orinoco-modules.inc index fc14eb3ee5..dcf87ffcfb 100644 --- a/packages/orinoco/orinoco-modules.inc +++ b/packages/orinoco/orinoco-modules.inc @@ -2,6 +2,10 @@ 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-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OB 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" diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb index f8f8e446a9..4f8ca98e0b 100644 --- a/packages/orinoco/orinoco-modules_0.13e.bb +++ b/packages/orinoco/orinoco-modules_0.13e.bb @@ -1,6 +1,7 @@ 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 @@ do_install() { } FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}" -RDEPENDS_orinoco-modules-cs = "orinoco-modules" diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb index 7289b6eaf8..746618f7df 100644 --- a/packages/orinoco/orinoco-modules_0.15rc1.bb +++ b/packages/orinoco/orinoco-modules_0.15rc1.bb @@ -1,8 +1,9 @@ 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 @@ do_install() { } FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}" -RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw" diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb index da223fca7d..da25d7b7e5 100644 --- a/packages/orinoco/orinoco-modules_0.15rc2.bb +++ b/packages/orinoco/orinoco-modules_0.15rc2.bb @@ -1,8 +1,9 @@ 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 @@ do_install() { } FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}" -RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw" diff --git a/packages/orinoco/orinoco-modules_cvs.bb b/packages/orinoco/orinoco-modules_cvs.bb index 78bfd2ce0f..6cbb7eb8f6 100644 --- a/packages/orinoco/orinoco-modules_cvs.bb +++ b/packages/orinoco/orinoco-modules_cvs.bb @@ -1,8 +1,9 @@ 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 @@ do_install() { } FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}" -RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw" |