hostap-modules: hostap-modules-cs now RDEPEND on hostap-conf

- its easier to update only hostap-conf when new card is added

6 files changed, 12 insertions, 15 deletions

diff --git a/packages/hostap/hostap-modules.inc b/packages/hostap/hostap-modules.inc
index 72f2dc2da3..6f482e64e4 100644
--- a/packages/hostap/hostap-modules.inc
+++ b/packages/hostap/hostap-modules.inc
@@ -3,13 +3,14 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PROVIDES = "hostap-conf"
+PROVIDES = "virtual/kernel-hostap"
 RPROVIDES = "virtual/kernel-hostap"
 
-SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
-	   file://hostap_cs.conf"
+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_h3900 = " file://ipaq_compat.patch;patch=1 "
 
 S = "${WORKDIR}/hostap-driver-${PV}"
@@ -24,21 +25,17 @@ NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_cryp
 
 do_install() {
 	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \
-		   ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
-        	   ${D}${sysconfdir}/pcmcia
+		   ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia
 	for i in ${NET_MODULES}
 	do
 		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
 	done
 	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
-	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${KERNEL_OBJECT_SUFFIX}"
 FILES_hostap-modules = "/lib/modules/"
-RDEPENDS_hostap-modules-cs = "hostap-modules"
-RDEPENDS_hostap-modules-pci = "hostap-modules"
-RPROVIDES_hostap-modules-cs = "hostap-conf"
+RDEPENDS_hostap-modules-cs  = "hostap-modules (${PV}) hostap-conf"
+RDEPENDS_hostap-modules-pci = "hostap-modules (${PV})"
diff --git a/packages/hostap/hostap-modules_0.3.10.bb b/packages/hostap/hostap-modules_0.3.10.bb
index 2a09550772..d6bdd5ba37 100644
--- a/packages/hostap/hostap-modules_0.3.10.bb
+++ b/packages/hostap/hostap-modules_0.3.10.bb
@@ -1,5 +1,5 @@
 include hostap-modules.inc
-PR = "r7"
+PR = "r8"
 
 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 5980783840..c1ab69a6c9 100644
--- a/packages/hostap/hostap-modules_0.3.7.bb
+++ b/packages/hostap/hostap-modules_0.3.7.bb
@@ -1,5 +1,5 @@
 include hostap-modules.inc
-PR = "r7"
+PR = "r8"
 
 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 508c653230..cc09fd5952 100644
--- a/packages/hostap/hostap-modules_0.3.9.bb
+++ b/packages/hostap/hostap-modules_0.3.9.bb
@@ -1,5 +1,5 @@
 include hostap-modules.inc
-PR = "r9"
+PR = "r10"
 
 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 b3d0a8e949..399d60cc20 100644
--- a/packages/hostap/hostap-modules_0.4.4.bb
+++ b/packages/hostap/hostap-modules_0.4.4.bb
@@ -1,4 +1,4 @@
 include hostap-modules.inc
-PR = "r5"
+PR = "r6"
 
 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 e9efcb5617..21effc081b 100644
--- a/packages/hostap/hostap-modules_0.4.7.bb
+++ b/packages/hostap/hostap-modules_0.4.7.bb
@@ -1,4 +1,4 @@
 include hostap-modules.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://kernel_updates.patch;patch=1"