zd1211: Clean up duplicate files

diff --git a/packages/zd1211/files/.mtn2git_empty b/packages/zd1211/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/zd1211/zd1211-r83/makefile-unslung.patch b/packages/zd1211/files/makefile-unslung.patch
similarity index 100%
rename from packages/zd1211/zd1211-r83/makefile-unslung.patch
rename to packages/zd1211/files/makefile-unslung.patch

diff --git a/packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch b/packages/zd1211/files/unslung-iwpriv-hack.patch
similarity index 100%
rename from packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch
rename to packages/zd1211/files/unslung-iwpriv-hack.patch

diff --git a/packages/zd1211/zd1211-r83/unslung-writel-logging.patch b/packages/zd1211/files/unslung-writel-logging.patch
similarity index 100%
rename from packages/zd1211/zd1211-r83/unslung-writel-logging.patch
rename to packages/zd1211/files/unslung-writel-logging.patch

diff --git a/packages/zd1211/zd1211_r59.bb b/packages/zd1211/zd1211_r59.bb
deleted file mode 100644 (file)
index 2ab0f2c..0000000
--- a/packages/zd1211/zd1211_r59.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
-PRIORITY = "optional"
-SECTION = "kernel/modules"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
-LICENSE = "GPL"
-PR = "r3"
-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
-
-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
-}
-

diff --git a/packages/zd1211/zd1211_r67.bb b/packages/zd1211/zd1211_r67.bb
deleted file mode 100644 (file)
index 2ab0f2c..0000000
--- a/packages/zd1211/zd1211_r67.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
-PRIORITY = "optional"
-SECTION = "kernel/modules"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
-LICENSE = "GPL"
-PR = "r3"
-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
-
-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
-}
-

diff --git a/packages/zd1211/zd1211_r74.bb b/packages/zd1211/zd1211_r74.bb
deleted file mode 100644 (file)
index bb23071..0000000
--- a/packages/zd1211/zd1211_r74.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
-PRIORITY = "optional"
-SECTION = "kernel/modules"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
-LICENSE = "GPL"
-PR = "r2"
-RDEPENDS = "wireless-tools"
-
-SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
-       file://makefile.patch;patch=1 \
-       file://zd1211-endian-fix.patch;patch=1 \
-       " 
-
-SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
-               file://makefile-unslung.patch;patch=1 \
-       file://zd1211-endian-fix.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
-}