[oe-commits] : wlan-rt73: change interface name to wlan, fix build

[OE GIT Trial]

Module: OE.dev
Branch: org.openembedded.dreambox
Commit: 27d9079feb6a1b4fdc25a2a61fd1626dabab638d
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=27d9079feb6a1b4fdc25a2a61fd1626dabab638d

Author:  <tmbinc at openembedded.org>
Date:   Mon Aug 18 04:55:29 2008 +0000

wlan-rt73: change interface name to wlan, fix build

---

 packages/wlan-rt73/files/changeiface.patch |   38 ++++++++++++++++++++++++++++
 packages/wlan-rt73/files/make.patch        |   20 ++++++++++++++
 packages/wlan-rt73/wlan-rt73.bb            |   25 +++++++++++++-----
 3 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/packages/wlan-rt73/files/.mtn2git_empty b/packages/wlan-rt73/files/.mtn2git_empty
new file mode 100644
index 0000000..e69de29
diff --git a/packages/wlan-rt73/files/changeiface.patch b/packages/wlan-rt73/files/changeiface.patch
new file mode 100644
index 0000000..89b3cf1
--- /dev/null
+++ b/packages/wlan-rt73/files/changeiface.patch
@@ -0,0 +1,38 @@
+--- Module/rtmp_main.c_orig	2008-05-06 07:26:44.000000000 +0200
++++ Module/rtmp_main.c	2008-08-12 09:19:55.000000000 +0200
+@@ -987,7 +987,7 @@
+ 
+ 		for (i = 0; i < 8; i++)
+ 		{
+-			sprintf(slot_name, "rausb%d", i);
++			sprintf(slot_name, "wlan%d", i);
+ 			
+ 			read_lock_bh(&dev_base_lock); // avoid multiple init
+ //Benson modify -->
+@@ -1010,7 +1010,7 @@
+ 			return NULL;
+ 		}
+ 
+-		sprintf(pAd->net_dev->name, "rausb%d", i);
++		sprintf(pAd->net_dev->name, "wlan%d", i);
+ 		DBGPRINT(RT_DEBUG_ERROR, "usb device name %s\n",pAd->net_dev->name);
+ 
+         /* get Max Packet Size from usb_dev endpoint */
+@@ -1191,7 +1191,7 @@
+         
+ 		for (i = 0; i < 8; i++)
+ 		{
+-			sprintf(slot_name, "rausb%d", i);
++			sprintf(slot_name, "wlan%d", i);
+ 
+ #if 1          
+ //--> Benson add 20080505, for Linux_kernel > 2,6,24 
+@@ -1231,7 +1231,7 @@
+ 			return res;
+ 		}
+ 
+-		sprintf(pAd->net_dev->name, "rausb%d", i);
++		sprintf(pAd->net_dev->name, "wlan%d", i);
+ 		DBGPRINT(RT_DEBUG_ERROR, "usb device name %s\n", pAd->net_dev->name);
+ 
+ 
diff --git a/packages/wlan-rt73/files/make.patch b/packages/wlan-rt73/files/make.patch
new file mode 100644
index 0000000..b49d513
--- /dev/null
+++ b/packages/wlan-rt73/files/make.patch
@@ -0,0 +1,20 @@
+--- Module/Makefile	2008-05-06 07:58:14.000000000 +0200
++++ Module/Makefile	2008-08-04 15:08:58.000000000 +0200
+@@ -14,6 +14,8 @@
+ #Support Block Net-If during TxSw queue full.
+ HAS_BLOCK_NET_IF=y
+ 
++VERSION := $(shell uname -r)
++MODPATH := /lib/modules/$(VERSION)
+ 
+ WFLAGS := -Wall -Wstrict-prototypes -Wno-trigraphs
+ 
+@@ -35,7 +37,7 @@
+ EXTRA_CFLAGS += $(WFLAGS)
+ 
+ ifeq ($(PLATFORM),PC)
+-LINUX_SRC =/lib/modules/$(shell uname -r)/build
++LINUX_SRC ?= $(MODPATH)/source
+ endif
+ ifeq ($(PLATFORM),CMPC)
+ LINUX_SRC = /home/fonchi/vendor/kernel-default-2.6.21/linux-2.6.21
diff --git a/packages/wlan-rt73/wlan-rt73.bb b/packages/wlan-rt73/wlan-rt73.bb
index 2a90300..56124aa 100644
--- a/packages/wlan-rt73/wlan-rt73.bb
+++ b/packages/wlan-rt73/wlan-rt73.bb
@@ -1,23 +1,34 @@
 DESCRIPTION = "Driver for Ralink rt73 USB 802.11b/g WiFi sticks"
-HOMEPAGE = "http://rt2x00.serialmonkey.com/"
+HOMEPAGE = "http://www.ralinktech.com.tw"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
 
-SRCDATE = "20080521"
-PR = "r2"
-
-SRC_URI = "cvs://anonymous@rt2400.cvs.sourceforge.net/cvsroot/rt2400;module=source/rt73"
+PR = "r3"
 
+SRC_URI = "http://www.ralinktech.com.tw/data/drivers/2008_0506_RT73_Linux_STA_Drv1.1.0.1.tar.bz2 \
+           file://make.patch;patch=1 \
+           file://changeiface.patch;patch=1"
 RDEPEND = "wireless-tools"
 
 inherit module
 
 FILES_${PN} += " /lib/firmware/rt73.bin"
 
-S = "${WORKDIR}/rt73/Module/"
-
+S = "${WORKDIR}/2008_0506_RT73_Linux_STA_Drv1.1.0.1/Module/"
 EXTRA_OEMAKE = "KERNDIR=${STAGING_KERNEL_DIR}"
 
+do_compile () {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
+        oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
+                   'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \
+                   'LINUX_SRC=${STAGING_KERNEL_DIR}' \
+                   'KDIR=${STAGING_KERNEL_DIR}' \
+                   'KERNDIR=${STAGING_KERNEL_DIR}' \
+                   'KERNEL_VERSION=${KERNEL_VERSION}' \
+                   'CC=${KERNEL_CC}' \
+                   'LD=${KERNEL_LD}'
+}
+
 do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
         install -m 0644 rt73${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/