- split up hostap-modules package into hostap-modules, hostap-modules-cs, and hostap-modules-pci. patch courtesy Bruno Randolf.

- adjust machine configurations to RDEPEND on hostap-modules-cs.


BKrev: 4119f043tj69uFyok2N7HpTooC3AQA

9 files changed, 18 insertions, 7 deletions

diff --git a/conf/beagle.conf b/conf/beagle.conf
index ee09262cb7..db22f072e7 100644
--- a/conf/beagle.conf
+++ b/conf/beagle.conf
@@ -7,7 +7,7 @@ IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "montavista-sa"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules orinoco-modules \
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules-cs orinoco-modules \
 kernel-module-net-fd \
 kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor " 
 
diff --git a/conf/collie.conf b/conf/collie.conf
index 22007a60bf..86e30d87c7 100644
--- a/conf/collie.conf
+++ b/conf/collie.conf
@@ -7,7 +7,7 @@ IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules orinoco-modules sharp-sdmmc-support \
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs orinoco-modules sharp-sdmmc-support \
 kernel-module-devinfo kernel-module-gpio kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \
 kernel-module-usbdcore kernel-module-usbdmonitor " 
 
diff --git a/conf/ipaq-common.conf b/conf/ipaq-common.conf
index 150128e048..f7c044a9a2 100644
--- a/conf/ipaq-common.conf
+++ b/conf/ipaq-common.conf
@@ -1,4 +1,4 @@
 IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal h3600_ts" 
 
 BOOTSTRAP_EXTRA_DEPENDS += "hostap-modules orinoco-modules freeswan mipv6"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "hostap-modules orinoco-modules freeswan mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "hostap-modules-cs orinoco-modules freeswan mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"
diff --git a/conf/poodle.conf b/conf/poodle.conf
index b8cc3df491..8c072bf78f 100644
--- a/conf/poodle.conf
+++ b/conf/poodle.conf
@@ -7,7 +7,7 @@ IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules sharp-sdmmc-support \
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
 kernel-module-ip-gre  \
 kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
 kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral"
diff --git a/conf/simpad.conf b/conf/simpad.conf
index 0279c854dd..ab4c66fa6f 100644
--- a/conf/simpad.conf
+++ b/conf/simpad.conf
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules freeswan mipv6 atmelwlandriver"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules orinoco-modules atmelwlandriver kernel-module-sa1100-ir"
+BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules-cs orinoco-modules atmelwlandriver kernel-module-sa1100-ir"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 EXTRA_IMAGEDEPENDS = ""
 INHERIT += "simpad_flashimg"
diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf
index a58107a593..0fdb294baf 100644
--- a/conf/zaurus-pxa.conf
+++ b/conf/zaurus-pxa.conf
@@ -3,7 +3,7 @@ IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support chkhinge"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules sharp-sdmmc-support \
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
 kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
 kernel-module-usbdcore kernel-module-usbdmonitor modutils chkhinge"
 
diff --git a/hostap/hostap-modules-0.2.4/mtx_compat.diff b/hostap/hostap-modules-0.2.4/mtx_compat.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/hostap/hostap-modules-0.2.4/mtx_compat.diff
diff --git a/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff b/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/hostap/hostap-modules-0.2.4/mtx_hostap_deferred_irq.diff
diff --git a/hostap/hostap-modules_0.2.4.oe b/hostap/hostap-modules_0.2.4.oe
index 04d1817ff9..9925ce7afb 100644
--- a/hostap/hostap-modules_0.2.4.oe
+++ b/hostap/hostap-modules_0.2.4.oe
@@ -8,14 +8,18 @@ PR = "r1"
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
            file://hostap_cs.conf \
 	   file://Makefile.patch;patch=1"
+SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
+	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
+
 S = "${WORKDIR}/hostap-driver-${PV}"
 
 inherit module
 
 # Hack Alert :D
+ARCH_mipsel = "mips"
 MAKE_TARGETS = "KERNEL_PATH=${KERNEL_SOURCE} MAKE='make -e'"
 
-NET_MODULES = "hostap.o hostap_crypt_ccmp.o hostap_crypt_tkip.o hostap_crypt_wep.o"
+NET_MODULES = "hostap.o hostap_pci.o hostap_crypt_ccmp.o hostap_crypt_tkip.o hostap_crypt_wep.o"
 
 do_install() {
 	install -d ${D}/lib/modules/${KERNEL_VERSION}/net \
@@ -29,3 +33,10 @@ do_install() {
 	install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
 	cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
 }
+
+PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules"
+FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/"
+FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci.o"
+FILES_hostap-modules = "/lib/modules/"
+RDEPENDS_hostap-modules-cs = "hostap-modules"
+RDEPENDS_hostap-modules-pci = "hostap-modules"