From 3ea348d12a4f3314bf723d069632fdc51efbd35a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 25 Jan 2006 14:35:48 +0000 Subject: zd1211: upstream upgrade to -r52, fix for 'reset not allowed in state 0' on rmmod --- packages/zd1211/zd1211-r51/.mtn2git_empty | 0 packages/zd1211/zd1211-r51/makefile.patch | 57 ------------------------------- packages/zd1211/zd1211-r52/.mtn2git_empty | 0 packages/zd1211/zd1211-r52/makefile.patch | 57 +++++++++++++++++++++++++++++++ packages/zd1211/zd1211_r51.bb | 31 ----------------- packages/zd1211/zd1211_r52.bb | 31 +++++++++++++++++ 6 files changed, 88 insertions(+), 88 deletions(-) delete mode 100644 packages/zd1211/zd1211-r51/.mtn2git_empty delete mode 100644 packages/zd1211/zd1211-r51/makefile.patch create mode 100644 packages/zd1211/zd1211-r52/.mtn2git_empty create mode 100644 packages/zd1211/zd1211-r52/makefile.patch delete mode 100644 packages/zd1211/zd1211_r51.bb create mode 100644 packages/zd1211/zd1211_r52.bb (limited to 'packages') diff --git a/packages/zd1211/zd1211-r51/.mtn2git_empty b/packages/zd1211/zd1211-r51/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zd1211/zd1211-r51/makefile.patch b/packages/zd1211/zd1211-r51/makefile.patch deleted file mode 100644 index bd07a084f0..0000000000 --- a/packages/zd1211/zd1211-r51/makefile.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- zd1211-driver-r51/Makefile.orig 2006-01-22 11:32:24.000000000 +0100 -+++ zd1211-driver-r51/Makefile 2006-01-22 12:37:17.000000000 +0100 -@@ -4,17 +4,17 @@ - # - # - --CC=gcc --CPP=g++ --LD=ld --rM=rm -f -r -+#CC=gcc -+#CPP=g++ -+#LD=ld -+#RM=rm -f -r - --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 -@@ -46,7 +46,7 @@ - EXTRA_CFLAGS += -D__SMP__ -DSMP - endif - --KDIR := $(MODPATH)/build -+#KDIR := $(MODPATH)/build - PWD := $(shell pwd) - - WLAN_SRC=$(PWD) -@@ -219,15 +219,15 @@ - - - install: all -- mkdir -p $(MODPATH)/net -+# mkdir -p $(MODPATH)/net - # mkdir -p /etc/zd1211 -- cp $(MODULE) $(MODPATH)/net -- depmod -a -+# cp $(MODULE) $(MODPATH)/net -+# 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-r52/.mtn2git_empty b/packages/zd1211/zd1211-r52/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zd1211/zd1211-r52/makefile.patch b/packages/zd1211/zd1211-r52/makefile.patch new file mode 100644 index 0000000000..9ec821daa1 --- /dev/null +++ b/packages/zd1211/zd1211-r52/makefile.patch @@ -0,0 +1,57 @@ +--- zd1211-driver-r52/Makefile.orig 2006-01-22 11:32:24.000000000 +0100 ++++ zd1211-driver-r52/Makefile 2006-01-22 12:37:17.000000000 +0100 +@@ -4,17 +4,17 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld +-rM=rm -f -r ++#CC=gcc ++#CPP=g++ ++#LD=ld ++#RM=rm -f -r + +-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 +@@ -46,7 +46,7 @@ + EXTRA_CFLAGS += -D__SMP__ -DSMP + endif + +-KDIR := $(MODPATH)/build ++#KDIR := $(MODPATH)/build + PWD := $(shell pwd) + + WLAN_SRC=$(PWD) +@@ -219,15 +219,15 @@ + + + install: all +- mkdir -p $(MODPATH)/net ++# mkdir -p $(MODPATH)/net + # mkdir -p /etc/zd1211 +- cp $(MODULE) $(MODPATH)/net +- depmod -a ++# cp $(MODULE) $(MODPATH)/net ++# 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_r51.bb b/packages/zd1211/zd1211_r51.bb deleted file mode 100644 index 7aaad5e6ef..0000000000 --- a/packages/zd1211/zd1211_r51.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "Oyvind Repvik " -LICENSE = "GPL" -PR = "r1" -RDEPENDS = "wireless-tools" - -SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile.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}' \ - 'SRC_DIR=${S}/src' \ - 'KERNE_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 -} - diff --git a/packages/zd1211/zd1211_r52.bb b/packages/zd1211/zd1211_r52.bb new file mode 100644 index 0000000000..7aaad5e6ef --- /dev/null +++ b/packages/zd1211/zd1211_r52.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "Oyvind Repvik " +LICENSE = "GPL" +PR = "r1" +RDEPENDS = "wireless-tools" + +SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ + file://makefile.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}' \ + 'SRC_DIR=${S}/src' \ + 'KERNE_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 +} + -- cgit v1.2.3