From: David-John Willis <John.Willis@Distant-earth.com>
Date: Fri, 15 Jan 2010 21:30:05 +0000 (+0000)
Subject: wl1251-modules: Tweak the init script a little to stop trying to unload MAC80211... 
X-Git-Tag: Release-2010-05/1~122
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=6455297911b07f08d0819ae9fccb7cca30ba65ad

wl1251-modules: Tweak the init script a little to stop trying to unload MAC80211 stuff that may be loaded by something else.
---

diff --git a/recipes/pandora-system/wl1251-modules.bb b/recipes/pandora-system/wl1251-modules.bb
index 772fd77..414d21f 100755
--- a/recipes/pandora-system/wl1251-modules.bb
+++ b/recipes/pandora-system/wl1251-modules.bb
@@ -2,8 +2,6 @@ DESCRIPTION = "Kernel drivers for the TI WL1251 WiFi chip found on the Pandora -
 LICENSE = "GPLv2"
 
 SRC_URI += " \
-#	http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-08-rev2.zip \
-#	http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-28-take2.zip \
 	http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-28-take3.zip \	
 	file://rc.wl1251 \
 "
@@ -13,7 +11,6 @@ inherit update-rc.d
 INITSCRIPT_NAME = "wl1251-init"
 INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ."
 
-#S = "${WORKDIR}/compat-wireless-2009-08-30"
 S = "${WORKDIR}/compat-wireless-2009-10-28"
 
 inherit module
@@ -31,20 +28,21 @@ do_compile_prepend() {
 }
 
 do_install() {
-          mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/net/mac80211
-          cp ${S}/net/mac80211/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/net/mac80211
-          mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/net/wireless
-          cp ${S}/net/wireless/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/net/wireless
-          mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/net/rfkill
-          cp ${S}/net/rfkill/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/net/rfkill
-          mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/wl12xx      
-          cp ${S}/drivers/net/wireless/wl12xx/wl1251.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/wl12xx
-          cp ${S}/drivers/net/wireless/wl12xx/wl1251_sdio.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/wl12xx
+          install -d ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/mac80211
+          install -m 0644 ${S}/net/mac80211/*.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/mac80211
+          install -d ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/wireless
+          install -m 0644 ${S}/net/wireless/*.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/wireless
+          install -d ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/rfkill
+          install -m 0644 ${S}/net/rfkill/*.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/rfkill
+          install -d ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/drivers/net/wireless/wl12xx      
+          install -m 0644 ${S}/drivers/net/wireless/wl12xx/wl1251.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/drivers/net/wireless/wl12xx
+          install -m 0644 ${S}/drivers/net/wireless/wl12xx/wl1251_sdio.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/drivers/net/wireless/wl12xx
+          
           install -d ${D}${sysconfdir}/init.d/
           install -m 0755 ${WORKDIR}/rc.wl1251 ${D}${sysconfdir}/init.d/wl1251-init
 }
 
-FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/kernel/net/mac80211/*.ko.*"
-FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/kernel/net/wireless/*.ko.*"
-FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/kernel/net/rfkill/*.ko.*"
-FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/wl12xx/*.ko.*"
+FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/updates/kernel/net/mac80211/*.ko.*"
+FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/updates/kernel/net/wireless/*.ko.*"
+FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/updates/kernel/net/rfkill/*.ko.*"
+FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/updates/kernel/drivers/net/wireless/wl12xx/*.ko.*"
diff --git a/recipes/pandora-system/wl1251-modules/rc.wl1251 b/recipes/pandora-system/wl1251-modules/rc.wl1251
index 9e1783e..b39b056 100755
--- a/recipes/pandora-system/wl1251-modules/rc.wl1251
+++ b/recipes/pandora-system/wl1251-modules/rc.wl1251
@@ -7,16 +7,7 @@ d_stop() {
 	if `grep -q wl1251 /proc/modules` ; then
 		rmmod wl1251_sdio
 		rmmod wl1251
-		rmmod board-omap3pandora-wifi
-	fi
-	if `grep -q mac80211 /proc/modules` ; then
-		rmmod mac80211
-		rmmod cfg80211
-		rmmod rfkill_backport
-		rmmod lib80211_crypt_ccmp
-		rmmod lib80211_crypt_wep
-		rmmod lib80211_crypt_tkip
-		rmmod lib80211
+		# rmmod board-omap3pandora-wifi
 	fi
 }
 
@@ -25,21 +16,21 @@ d_start() {
 	insmod $(busybox find /lib/modules/$(uname -r) -name "arc4.ko")
 	insmod $(busybox find /lib/modules/$(uname -r) -name "ecb.ko")
 	insmod $(busybox find /lib/modules/$(uname -r) -name "pcbc.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "rfkill_backport.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "cfg80211.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "mac80211.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "lib80211.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "lib80211_crypt_tkip.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "lib80211_crypt_wep.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "lib80211_crypt_ccmp.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "wl1251.ko")
-	insmod $(busybox find /lib/modules/$(uname -r) -name "wl1251_sdio.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "rfkill_backport.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "cfg80211.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "mac80211.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "lib80211.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "lib80211_crypt_tkip.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "lib80211_crypt_wep.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "lib80211_crypt_ccmp.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "wl1251.ko")
+	insmod $(busybox find /lib/modules/$(uname -r)/updates -name "wl1251_sdio.ko")
 }
 
 case "$1" in
   start)
 	echo -n "Starting $DESC: $NAME"
-	d_start
+	d_start &
 	echo "."
 	;;
   stop)