fix wlan module [ zd1211b ]

diff --git a/recipes/zd1211/zd1211b-r222/Makefile.patch b/recipes/zd1211/zd1211b-r222/Makefile.patch
new file mode 100644 (file)
index 0000000..7adcb5c
--- /dev/null
+++ b/recipes/zd1211/zd1211b-r222/Makefile.patch
@@ -0,0 +1,35 @@
+--- patches/Makefile   2011-12-05 20:21:45.611778504 +0900
++++ org/Makefile       2011-12-05 20:21:35.315727459 +0900
+@@ -7,10 +7,10 @@
+ #HOST=\r
+ #CC=$(HOST)gcc\r
+ #LD=$(HOST)ld\r
+-VERSION := $(shell uname -r)\r
+-MODPATH := /lib/modules/$(VERSION)\r
+-KERN_VER=$(shell uname -r | cut -b1-3;)\r
+-KDIR := /lib/modules/$(shell uname -r)/build\r
++VERSION = $(shell cat $(KERNEL_SOURCE)/kernel-abiversion)\r
++MODPATH ?= /lib/modules/$(VERSION)\r
++KERN_VER ?= $(shell echo $(VERSION) | cut -c1-3)\r
++KDIR ?= /lib/modules/$(shell uname -r)/build\r
+ PWD := $(shell pwd)\r
+ \r
+ SUBDIRS=.\r
+@@ -22,7 +22,7 @@
+     KERNEL_SOURCE ?= $(MODPATH)/source\r
+ else \r
+     KERN_24=y\r
+-    KERNEL_SOURCE=/usr/src/linux-2.4\r
++    KERNEL_SOURCE ?= /usr/src/linux-2.4\r
+ endif\r
+ \r
+ SRC_DIR=src\r
+@@ -31,7 +31,7 @@
+ # set to 1 for zd1211b\r
+ ZD1211REV_B=1\r
+ \r
+-KERNRELEASE := $(shell uname -r;)\r
++KERNRELEASE ?= $(VERSION)\r
+ MODPATH := /lib/modules/$(KERNRELEASE)\r
+ \r
+ \r

diff --git a/recipes/zd1211/zd1211b_r222.bb b/recipes/zd1211/zd1211b_r222.bb
index 7c7f84f..faa37b6 100644 (file)
--- a/recipes/zd1211/zd1211b_r222.bb
+++ b/recipes/zd1211/zd1211b_r222.bb
@@ -12,13 +12,15 @@ PR = "r2"
 
 SRC_URI = "http://www.reactivated.net/software/zd1211-vendor/releases/ZD1211LnxDrv_2_22_0_0.tar.gz \
            file://ZD1211LnxDrv_2_22_0_0.patch;patch=1 \
-           file://zdiface.patch;patch=1"
+           file://zdiface.patch;patch=1 \
+          file://Makefile.patch;patch=1 \
+"
            
 S = "${WORKDIR}/ZD1211LnxDrv_2_22_0_0"
 
 do_compile () {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
-        oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
+        oe_runmake 'MODPATH=${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
                    'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \
                    'KDIR=${STAGING_KERNEL_DIR}' \
                    'KERNEL_VERSION=${KERNEL_VERSION}' \