Remove unecessary control files since those kmods are packaged with the new layout

[openwrt.git] / package / zd1211 / Makefile

diff --git a/package/zd1211/Makefile b/package/zd1211/Makefile
index 651621f..e5d2c27 100644 (file)
--- a/package/zd1211/Makefile
+++ b/package/zd1211/Makefile
@@ -13,24 +13,26 @@ PKG_NAME:=zd1211
 PKG_VERSION:=r69
 PKG_RELEASE:=1
 
 PKG_VERSION:=r69
 PKG_RELEASE:=1
 

-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://zd1211.ath.cx/download/
 PKG_MD5SUM:=c14133a3d5b27927402a492e84d2467a
 PKG_CAT:=zcat
 
 PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://zd1211.ath.cx/download/
 PKG_MD5SUM:=c14133a3d5b27927402a492e84d2467a
 PKG_CAT:=zcat
 

+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
 include $(INCLUDE_DIR)/package.mk
 
 #FIXME: add proper dependency handling on kmod-usb-core packages
 define Package/kmod-zd1211

-  SECTION:=drivers
-  CATEGORY:=Drivers
+  SECTION:=kernel
+  CATEGORY:=Kernel drivers

   DEPENDS:=@LINUX_2_6&&!LINUX_2_6_UML
   TITLE:=Driver for Zydas 1211 based USB devices
   DEPENDS:=@LINUX_2_6&&!LINUX_2_6_UML
   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.
+  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
   URL:=http://zd1211.ath.cx/
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
 endef


@@ -42,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)" \


@@ -51,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 -d -m0755 $(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 -d -m0755 $(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