zd1211: Fixup for Unslung 2.4-kernel

diff --git a/packages/zd1211/zd1211-r59/makefile-unslung.patch b/packages/zd1211/zd1211-r59/makefile-unslung.patch
new file mode 100644 (file)
index 0000000..3ad1e24
--- /dev/null
+++ b/packages/zd1211/zd1211-r59/makefile-unslung.patch
@@ -0,0 +1,48 @@
+--- zd1211-driver-r59/Makefile.orig    2006-02-25 16:04:26.000000000 +0100
++++ zd1211-driver-r59/Makefile 2006-02-25 17:11:27.000000000 +0100
+@@ -4,24 +4,23 @@
+ #
+ #
+ 
+-CC=gcc
+-CPP=g++
+-LD=ld
+-rM=rm -f -r
++CC ?= gcc
++CPP ?= g++
++LD ?= ld
+ 
+-MODPATH := /lib/modules/$(shell uname -r)
++MODPATH ?= /lib/modules/$(shell uname -r)
+ 
+ # if the kernel is 2.6.x, turn on this
+-KERN_26=y
++#KERN_26=y
+ 
+-KERNEL_SOURCE=$(MODPATH)/source
++KERNEL_SOURCE ?= $(MODPATH)/source
+ #KERNEL_SOURCE=/usr/src/linux
+ 
+ # set to 1 for zd1211b
+ ZD1211REV_B=0
+ 
+-SRC_DIR=src
+-DEFINES=-D__KERNEL__ -DMODULE=1
++SRC_DIR=src
++DEFINES ?=-D__KERNEL__ -DMODULE=1
+ 
+ 
+ 
+@@ -227,9 +226,9 @@
+       depmod -a
+ 
+ #for apdbg
+-      gcc -o apdbg apdbg.c
+-      chmod +x apdbg
+-      cp ./apdbg /sbin/apdbg   
++#     gcc -o apdbg apdbg.c
++#     chmod +x apdbg
++#     cp ./apdbg /sbin/apdbg   
+ 
+ clean:
+       rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o  $(SRC_DIR)/.*.o.cmd

diff --git a/packages/zd1211/zd1211_r59.bb b/packages/zd1211/zd1211_r59.bb
index c801b81..af03e76 100644 (file)
--- a/packages/zd1211/zd1211_r59.bb
+++ b/packages/zd1211/zd1211_r59.bb
@@ -3,13 +3,17 @@ PRIORITY = "optional"
 SECTION = "kernel/modules"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 RDEPENDS = "wireless-tools"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
        file://makefile.patch;patch=1 \
        " 
 
+SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
+               file://makefile-unslung.patch;patch=1 \
+               "
+
 S = "${WORKDIR}/zd1211-driver-${PV}"
 
 inherit module