summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOyvind Repvik <nail@nslu2-linux.org>2006-09-02 14:09:04 +0000
committerOyvind Repvik <nail@nslu2-linux.org>2006-09-02 14:09:04 +0000
commitd3e9d5b3b92c0f04dc1c73ea94758ed974e3d8b9 (patch)
treeaf6ddae93a0cb73b33aebc5198032958ae8cdca1
parent70d51b7ba86e3f532d70a37eef04d16014a451b3 (diff)
zd1211: Remove deprecated versions, update to rev83
-rw-r--r--packages/zd1211/zd1211-r59/makefile-unslung.patch48
-rw-r--r--packages/zd1211/zd1211-r59/makefile.patch47
-rw-r--r--packages/zd1211/zd1211-r67/.mtn2git_empty0
-rw-r--r--packages/zd1211/zd1211-r67/makefile.patch47
-rw-r--r--packages/zd1211/zd1211-r74/.mtn2git_empty0
-rw-r--r--packages/zd1211/zd1211-r74/makefile-unslung.patch48
-rw-r--r--packages/zd1211/zd1211-r74/zd1211-endian-fix.patch11
-rw-r--r--packages/zd1211/zd1211-r83/.mtn2git_empty (renamed from packages/zd1211/zd1211-r59/.mtn2git_empty)0
-rw-r--r--packages/zd1211/zd1211-r83/makefile-unslung.patch (renamed from packages/zd1211/zd1211-r67/makefile-unslung.patch)4
-rw-r--r--packages/zd1211/zd1211-r83/makefile.patch (renamed from packages/zd1211/zd1211-r74/makefile.patch)30
-rw-r--r--packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch (renamed from packages/zd1211/zd1211-r74/unslung-iwpriv-hack.patch)0
-rw-r--r--packages/zd1211/zd1211-r83/unslung-writel-logging.patch (renamed from packages/zd1211/zd1211-r74/unslung-writel-logging.patch)0
-rw-r--r--packages/zd1211/zd1211_r83.bb36
13 files changed, 53 insertions, 218 deletions
diff --git a/packages/zd1211/zd1211-r59/makefile-unslung.patch b/packages/zd1211/zd1211-r59/makefile-unslung.patch
deleted file mode 100644
index 3ad1e24424..0000000000
--- a/packages/zd1211/zd1211-r59/makefile-unslung.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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/makefile.patch b/packages/zd1211/zd1211-r59/makefile.patch
deleted file mode 100644
index 5c575faece..0000000000
--- a/packages/zd1211/zd1211-r59/makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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
-
--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-r67/.mtn2git_empty b/packages/zd1211/zd1211-r67/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/zd1211/zd1211-r67/.mtn2git_empty
+++ /dev/null
diff --git a/packages/zd1211/zd1211-r67/makefile.patch b/packages/zd1211/zd1211-r67/makefile.patch
deleted file mode 100644
index 5c575faece..0000000000
--- a/packages/zd1211/zd1211-r67/makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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
-
--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-r74/.mtn2git_empty b/packages/zd1211/zd1211-r74/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/zd1211/zd1211-r74/.mtn2git_empty
+++ /dev/null
diff --git a/packages/zd1211/zd1211-r74/makefile-unslung.patch b/packages/zd1211/zd1211-r74/makefile-unslung.patch
deleted file mode 100644
index 3ad1e24424..0000000000
--- a/packages/zd1211/zd1211-r74/makefile-unslung.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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-r74/zd1211-endian-fix.patch b/packages/zd1211/zd1211-r74/zd1211-endian-fix.patch
deleted file mode 100644
index c694174fee..0000000000
--- a/packages/zd1211/zd1211-r74/zd1211-endian-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zd1211-driver-r67/src/zd1211.c~ 2006-02-16 15:33:51.000000000 -0600
-+++ zd1211-driver-r67/src/zd1211.c 2006-04-30 22:47:13.000000000 -0500
-@@ -2228,7 +2228,7 @@
-
- if (CurFrmLen & 0x03)
- tmpLen += 4;
-- rfd->ActualCount += macp->rxOffset;
-+ rfd->ActualCount = cpu_to_le32(CurFrmLen + macp->rxOffset);
- }
- } else {
- // last_pkt_len = 509, 510, 511
diff --git a/packages/zd1211/zd1211-r59/.mtn2git_empty b/packages/zd1211/zd1211-r83/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/zd1211/zd1211-r59/.mtn2git_empty
+++ b/packages/zd1211/zd1211-r83/.mtn2git_empty
diff --git a/packages/zd1211/zd1211-r67/makefile-unslung.patch b/packages/zd1211/zd1211-r83/makefile-unslung.patch
index 3ad1e24424..4edcbb7a9d 100644
--- a/packages/zd1211/zd1211-r67/makefile-unslung.patch
+++ b/packages/zd1211/zd1211-r83/makefile-unslung.patch
@@ -1,5 +1,5 @@
---- 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
+--- zd1211-driver-r77/Makefile.orig 2006-02-25 16:04:26.000000000 +0100
++++ zd1211-driver-r77/Makefile 2006-02-25 17:11:27.000000000 +0100
@@ -4,24 +4,23 @@
#
#
diff --git a/packages/zd1211/zd1211-r74/makefile.patch b/packages/zd1211/zd1211-r83/makefile.patch
index 5c575faece..adc2bd416d 100644
--- a/packages/zd1211/zd1211-r74/makefile.patch
+++ b/packages/zd1211/zd1211-r83/makefile.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- zd1211-driver-r83/Makefile.orig 2006-09-02 16:00:00.000000000 +0200
++++ zd1211-driver-r83/Makefile 2006-09-02 16:01:57.000000000 +0200
+@@ -4,10 +4,10 @@
#
#
@@ -8,13 +8,14 @@
-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)
-
++#CC=gcc
++#CPP=g++
++#LD=ld
++#rM=rm -f -r
+
+ VERSION := $(shell uname -r)
+ MODPATH := /lib/modules/$(VERSION)
+@@ -15,14 +15,14 @@
# if the kernel is 2.6.x, turn on this
KERN_26=y
@@ -25,15 +26,14 @@
# set to 1 for zd1211b
ZD1211REV_B=0
--SRC_DIR=src
+ SRC_DIR=src
-DEFINES=-D__KERNEL__ -DMODULE=1
-+SRC_DIR=src
-+DEFINES ?=-D__KERNEL__ -DMODULE=1
++DEFINES ?= -D__KERNEL__ -DMODULE=1
-@@ -227,9 +226,9 @@
- depmod -a
+@@ -228,9 +228,9 @@
+ depmod -a $(VERSION)
#for apdbg
- gcc -o apdbg apdbg.c
diff --git a/packages/zd1211/zd1211-r74/unslung-iwpriv-hack.patch b/packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch
index 64f3806140..64f3806140 100644
--- a/packages/zd1211/zd1211-r74/unslung-iwpriv-hack.patch
+++ b/packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch
diff --git a/packages/zd1211/zd1211-r74/unslung-writel-logging.patch b/packages/zd1211/zd1211-r83/unslung-writel-logging.patch
index 00d54d7d68..00d54d7d68 100644
--- a/packages/zd1211/zd1211-r74/unslung-writel-logging.patch
+++ b/packages/zd1211/zd1211-r83/unslung-writel-logging.patch
diff --git a/packages/zd1211/zd1211_r83.bb b/packages/zd1211/zd1211_r83.bb
new file mode 100644
index 0000000000..398d516372
--- /dev/null
+++ b/packages/zd1211/zd1211_r83.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
+PRIORITY = "optional"
+SECTION = "kernel/modules"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
+LICENSE = "GPL"
+PR = "r1"
+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 \
+ file://unslung-iwpriv-hack.patch;patch=1 \
+ file://unslung-writel-logging.patch;patch=1 \
+ "
+
+S = "${WORKDIR}/zd1211-driver-${PV}"
+
+inherit module
+
+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}' \
+ 'KDIR=${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 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
+}