acx-mac80211 fixes: * make Build/Compile conditionnal (only if in-kernel mac80211...

SVN-Revision: 8543

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index ee3f6532651558578cf668ee89c20c0514bf06c2..7ad0022f6c554af12719ce3a3f9a741fde229c30 100644 (file)
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -11,17 +11,22 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx-mac80211
 PKG_VERSION:=20070610
 
 PKG_NAME:=acx-mac80211
 PKG_VERSION:=20070610

-PKG_RELEASE:=
+PKG_RELEASE:=1

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.hauke-m.de/fileadmin/acx
 PKG_MD5SUM:=7c6c70722a5a2ad6ad25075467ea4909
 
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.hauke-m.de/fileadmin/acx
 PKG_MD5SUM:=7c6c70722a5a2ad6ad25075467ea4909
 

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

 PKG_FW_NAME:=tiacx111c16
 PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
 PKG_FW_MD5SUM:=7026826460376f6b174f9225bd7781b9
 
 include $(INCLUDE_DIR)/package.mk
 PKG_FW_NAME:=tiacx111c16
 PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
 PKG_FW_MD5SUM:=7026826460376f6b174f9225bd7781b9
 
 include $(INCLUDE_DIR)/package.mk

+ifeq ($(DUMP),)
+  include $(LINUX_DIR)/.config
+endif

 
 define KernelPackage/acx-mac80211
   SUBMENU:=Wireless Drivers
 
 define KernelPackage/acx-mac80211
   SUBMENU:=Wireless Drivers


@@ -39,19 +44,39 @@ $(STAMP_BUILT): $(DL_DIR)/$(PKG_FW_NAME)
 $(DL_DIR)/$(PKG_FW_NAME):
        $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_NAME)" "$(PKG_FW_MD5SUM)" $(PKG_FW_URL)
 
 $(DL_DIR)/$(PKG_FW_NAME):
        $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_NAME)" "$(PKG_FW_MD5SUM)" $(PKG_FW_URL)
 

-define Build/Compile
+ifneq ($(CONFIG_MAC80211),)
+
+  PKG_EXTRA_KCONFIG:= \
+       CONFIG_ACX_MAC80211=m \
+       CONFIG_ACX_MAC80211_PCI=m \
+
+  PKG_EXTRA_CFLAGS:= \
+       -I$(STAGING_DIR)/usr/include/mac80211 \
+       $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
+       $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
+
+  define Build/Compile/it

        $(MAKE) -C "$(LINUX_DIR)" \
        $(MAKE) -C "$(LINUX_DIR)" \

-               CROSS_COMPILE="$(TARGET_CROSS)" \

                ARCH="$(LINUX_KARCH)" \
                ARCH="$(LINUX_KARCH)" \

+               CROSS_COMPILE="$(TARGET_CROSS)" \

                SUBDIRS="$(PKG_BUILD_DIR)" \
                SUBDIRS="$(PKG_BUILD_DIR)" \

-               CONFIG_ACX_MAC80211=m \
-               CONFIG_ACX_MAC80211_PCI=m \
-               EXTRA_CFLAGS="-DCONFIG_ACX_MAC80211_PCI -DCONFIG_ACX_PCI_DEBUG_MAX -I$(PKG_BUILD_DIR)/../mac80211" \
+               $(PKG_EXTRA_KCONFIG) \
+               EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \
+               V="$(V)" \

                modules
                modules

+  endef
+
+endif
+
+define Build/Configure
+endef
+
+define Build/Compile
+$(call Build/Compile/it)

 endef
 
 define KernelPackage/acx-mac80211/install
 endef
 
 define KernelPackage/acx-mac80211/install

-       mkdir -p $(1)/lib/firmware
+       $(INSTALL_DIR) $(1)/lib/firmware

        $(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_NAME) $(1)/lib/firmware/
 endef
 
        $(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_NAME) $(1)/lib/firmware/
 endef