update zd1211 to r83, fix build on 2.6.19

[openwrt.git] / package / zd1211 / Makefile

diff --git a/package/zd1211/Makefile b/package/zd1211/Makefile
index a71873b..841abb9 100644 (file)
--- a/package/zd1211/Makefile
+++ b/package/zd1211/Makefile
@@ -1,32 +1,40 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 # $Id: Makefile 3297 2006-03-02 23:42:52Z florian $
 
 include $(TOPDIR)/rules.mk
 # $Id: Makefile 3297 2006-03-02 23:42:52Z florian $
 
 include $(TOPDIR)/rules.mk

-include $(TOPDIR)/package/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=zd1211
 
 PKG_NAME:=zd1211

-PKG_VERSION:=r69
+PKG_VERSION:=r83

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=c14133a3d5b27927402a492e84d2467a

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://zd1211.ath.cx/download/

 PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz
 PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz

+PKG_SOURCE_URL:=http://zd1211.ath.cx/download/
+PKG_MD5SUM:=a5751f0e6f1f368689077fa7758a4932

 PKG_CAT:=zcat
 
 PKG_CAT:=zcat
 

-include $(TOPDIR)/package/rules.mk
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk

 
 #FIXME: add proper dependency handling on kmod-usb-core packages
 define Package/kmod-zd1211
 
 #FIXME: add proper dependency handling on kmod-usb-core packages
 define Package/kmod-zd1211

-SECTION:=drivers
-CATEGORY:=Drivers
-DEPENDS:=@LINUX_2_6
-TITLE:=Driver for Zydas 1211 based USB devices
-DESCRIPTION:=Driver for Zydas 1211 based USB devices \\\
-Linux driver for the ZyDAS ZD1211 802.11b/g USB-WLAN-Chip.\\\
-Initially contributed by ZyDAS, this driver is actively maintained by the \\\
-open source community.
-URL:=http://zd1211.ath.cx/
-VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  SECTION:=kernel
+  CATEGORY:=Kernel drivers
+  DEPENDS:=@LINUX_2_6&&!LINUX_2_6_UML
+  TITLE:=Driver for Zydas 1211 based USB devices
+  DESCRIPTION:=\
+       This package contains a Linux driver for the ZyDAS ZD1211 802.11b/g \\\
+       USB-WLAN-Chip.\\\
+       Initially contributed by ZyDAS, this driver is actively maintained by the \\\
+       open source community.
+  URL:=http://zd1211.ath.cx/
+  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)

 endef
 
 define Build/Compile
 endef
 
 define Build/Compile


@@ -36,7 +44,6 @@ define Build/Compile
                CC="$(TARGET_CC)" \
                CPP="$(TARGET_CC)" \
                LD="$(TARGET_CROSS)ld" \
                CC="$(TARGET_CC)" \
                CPP="$(TARGET_CC)" \
                LD="$(TARGET_CROSS)ld" \

-               STAGING_DIR=$(STAGING_DIR) \

                KERNELVERSION="$(KERNEL)" \
                KERNEL_SOURCE="$(LINUX_DIR)" \
                KDIR="$(LINUX_DIR)" \
                KERNELVERSION="$(KERNEL)" \
                KERNEL_SOURCE="$(LINUX_DIR)" \
                KDIR="$(LINUX_DIR)" \


@@ -45,10 +52,10 @@ define Build/Compile
 endef
 
 define Package/kmod-zd1211/install
 endef
 
 define Package/kmod-zd1211/install

-       install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION)
+       $(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)

        $(CP) $(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX) \
                $(1)/lib/modules/$(LINUX_VERSION)/
        $(CP) $(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX) \
                $(1)/lib/modules/$(LINUX_VERSION)/

-       install -m0755 -d $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin

        $(CP) $(PKG_BUILD_DIR)/apdbg $(1)/usr/sbin/
        $(CP) $(PKG_BUILD_DIR)/sta $(1)/usr/sbin/$(PKG_NAME)-sta
 endef
        $(CP) $(PKG_BUILD_DIR)/apdbg $(1)/usr/sbin/
        $(CP) $(PKG_BUILD_DIR)/sta $(1)/usr/sbin/$(PKG_NAME)-sta
 endef