fix kmod-* build error when wildcards are being used in $(FILES)

[openwrt.git] / package / wlcompat / Makefile

diff --git a/package/wlcompat/Makefile b/package/wlcompat/Makefile
index fc66c90..02ad546 100644 (file)
--- a/package/wlcompat/Makefile
+++ b/package/wlcompat/Makefile
@@ -16,10 +16,10 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

-define Package/kmod-wlcompat/Default
-  SECTION:=kernel
-  CATEGORY:=Kernel drivers
-  DEPENDS:=kmod-brcm-wl
+define KernelPackage/wlcompat/Default
+  SUBMENU:=Proprietary BCM43xx WiFi driver
+  SUBMENUDEP:=@LINUX_2_4_BRCM
+  DEPENDS:=@LINUX_2_4_BRCM @PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools

   TITLE:=Broadcom wl wrapper module
   DESCRIPTION:=\
        This package contains a wrapper module, that provides Wireless Extension \\\
   TITLE:=Broadcom wl wrapper module
   DESCRIPTION:=\
        This package contains a wrapper module, that provides Wireless Extension \\\


@@ -27,17 +27,19 @@ define Package/kmod-wlcompat/Default
   VERSION:=$(LINUX_VERSION)+$(BOARD)-$(PKG_RELEASE)
 endef
 
   VERSION:=$(LINUX_VERSION)+$(BOARD)-$(PKG_RELEASE)
 endef
 

-define Package/kmod-wlcompat
-  $(call Package/kmod-wlcompat/Default)
-  DEFAULT:=y
+define KernelPackage/wlcompat
+  $(call KernelPackage/wlcompat/Default)
+  FILES:=$(PKG_BUILD_DIR)/wlcompat.o
+  AUTOLOAD:=$(call AutoLoad,50,wlcompat)

 endef
 
 endef
 

-define Package/kmod-wlcompat-debug
-  $(call Package/kmod-wlcompat/Default)
+define KernelPackage/wlcompat-debug
+  $(call KernelPackage/wlcompat/Default)

   TITLE+= (debug)
   DESCRIPTION+=\\\
        \\\
        This is a debugging version.
   TITLE+= (debug)
   DESCRIPTION+=\\\
        \\\
        This is a debugging version.

+  FILES:=$(PKG_BUILD_DIR)/wlcompat-debug.o

 endef
 
 define Build/Prepare
 endef
 
 define Build/Prepare


@@ -61,17 +63,5 @@ define Build/Compile
                modules
 endef
 
                modules
 endef
 

-define Package/kmod-wlcompat/install
-       install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
-       $(CP) $(PKG_BUILD_DIR)/wlcompat.o $(1)/lib/modules/$(LINUX_VERSION)/
-       install -d -m0755 $(1)/etc/modules.d
-       echo "wlcompat" > $(1)/etc/modules.d/30-wlcompat
-endef
-
-define Package/kmod-wlcompat-debug/install
-       install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
-       $(CP) $(PKG_BUILD_DIR)/wlcompat-debug.o $(1)/lib/modules/$(LINUX_VERSION)/
-endef
-
-$(eval $(call BuildPackage,kmod-wlcompat))
-$(eval $(call BuildPackage,kmod-wlcompat-debug))
+$(eval $(call KernelPackage,wlcompat))
+$(eval $(call KernelPackage,wlcompat-debug))