diff options
| -rw-r--r-- | package/acx-mac80211/Makefile | 15 | ||||
| -rw-r--r-- | package/b43/Makefile | 16 | ||||
| -rw-r--r-- | package/mac80211/Makefile | 26 | ||||
| -rw-r--r-- | package/p54/Makefile | 2 | ||||
| -rw-r--r-- | package/rt2x00/Makefile | 74 |
5 files changed, 55 insertions, 78 deletions
diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile index a3c16ec093..33f7512d85 100644 --- a/package/acx-mac80211/Makefile +++ b/package/acx-mac80211/Makefile @@ -27,8 +27,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/acx-mac80211 SUBMENU:=Wireless Drivers TITLE:=ACX111 Mac80211 driver - DEPENDS:=@LINUX_2_6 +kmod-mac80211 @!TARGET_atheros -# KCONFIG:=CONFIG_MAC80211 + DEPENDS:=+kmod-mac80211 @!TARGET_atheros FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,acx-mac80211) endef @@ -42,16 +41,15 @@ $(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) -ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),) - PKG_EXTRA_KCONFIG:= \ +PKG_EXTRA_KCONFIG:= \ CONFIG_ACX_MAC80211=m \ CONFIG_ACX_MAC80211_PCI=m \ - PKG_EXTRA_CFLAGS:= \ +PKG_EXTRA_CFLAGS:= \ $(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 +define Build/Compile $(MAKE) -C "$(LINUX_DIR)" \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ @@ -62,10 +60,7 @@ ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),) -include linux/autoconf.h" \ V="$(V)" \ modules - endef -else - override CONFIG_PACKAGE_kmod-acx-mac80211= -endif +endef define Build/Configure endef diff --git a/package/b43/Makefile b/package/b43/Makefile index 8d64302233..86b8621a3b 100644 --- a/package/b43/Makefile +++ b/package/b43/Makefile @@ -44,22 +44,18 @@ MAKE_OPTS:= \ LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include -include linux/autoconf.h" \ $(EXTRA_KCONFIG) -ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),) - define Build/Prepare +define Build/Prepare mkdir -p $(PKG_BUILD_DIR) $(CP) ./src/* $(PKG_BUILD_DIR)/ - endef +endef - define Build/Configure - endef +define Build/Configure +endef - define Build/Compile +define Build/Compile $(MAKE) -C "$(LINUX_DIR)" \ $(MAKE_OPTS) \ modules - endef -else - override CONFIG_PACKAGE_kmod-b43= -endif +endef $(eval $(call KernelPackage,b43)) diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 8a387b445a..e288354104 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/mac80211 SUBMENU:=Wireless Drivers TITLE:=Linux 802.11 Wireless Networking Stack - DEPENDS:=@LINUX_2_6 +kmod-crypto-arc4 +kmod-crypto-aes + DEPENDS:=@LINUX_2_6_23 +kmod-crypto-arc4 +kmod-crypto-aes FILES:= \ $(PKG_BUILD_DIR)/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX) \ @@ -44,34 +44,30 @@ MAKE_OPTS:= \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ LINUXINCLUDE="-I${CURDIR}/src/include -I$(LINUX_DIR)/include -include linux/autoconf.h" \ -ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),) - define Build/Prepare +define Build/Prepare mkdir -p $(PKG_BUILD_DIR)/mac80211 $(CP) ./src/mac80211/* $(PKG_BUILD_DIR)/mac80211/ mkdir -p $(PKG_BUILD_DIR)/wireless $(CP) ./src/wireless/* $(PKG_BUILD_DIR)/wireless/ - endef +endef - define Build/Compile +define Build/Compile $(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/wireless" modules $(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/mac80211" modules - endef +endef - define Build/InstallDev +define Build/InstallDev mkdir -p $(1)/usr/include/mac80211 $(CP) ./src/include/* $(1)/usr/include/mac80211/ - endef +endef - define Build/UninstallDev +define Build/UninstallDev rm -rf $(1)/usr/include/mac80211 - endef +endef - define KernelPackage/mac80211/install +define KernelPackage/mac80211/install $(INSTALL_DIR) $(1)/lib/wifi $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi - endef -else - override CONFIG_PACKAGE_kmod-mac80211= -endif +endef $(eval $(call KernelPackage,mac80211)) diff --git a/package/p54/Makefile b/package/p54/Makefile index fc576866a4..a0b24a22a5 100644 --- a/package/p54/Makefile +++ b/package/p54/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/p54/Default SUBMENU:=Wireless Drivers TITLE:=Prism Wireless Support (mac80211) - DEPENDS:=@LINUX_2_6 +kmod-mac80211 + DEPENDS:=+kmod-mac80211 endef define KernelPackage/p54-common diff --git a/package/rt2x00/Makefile b/package/rt2x00/Makefile index 1e95e27a9e..fb0bd48d59 100644 --- a/package/rt2x00/Makefile +++ b/package/rt2x00/Makefile @@ -27,7 +27,6 @@ define KernelPackage/rt2x00/Default SUBMENU:=Wireless Drivers TITLE:=Ralink Drivers for RT2x00 cards DEPENDS:=@LINUX_2_6 @!TARGET_atheros @!TARGET_uml - KCONFIG:=CONFIG_MAC80211 endef define KernelPackage/rt2x00-lib @@ -102,53 +101,37 @@ $(DL_DIR)/$(PKG_FW6X_NAME): $(DL_DIR)/$(PKG_FW7X_NAME): $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW7X_NAME)" "$(PKG_FW7X_MD5SUM)" $(PKG_FW7X_URL) -# only try to build if the kernel is recent enough (has in-kernel mac80211) -ifndef ($(CONFIG_MAC80211),) - - PKG_EXTRA_KCONFIG:= \ +PKG_EXTRA_KCONFIG:= \ CONFIG_RT2X00=y \ CONFIG_RT2X00_DEBUG=y \ - ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-pci),) - PKG_EXTRA_KCONFIG+= CONFIG_RT2X00PCI=y - endif - ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-usb),) - PKG_EXTRA_KCONFIG+= CONFIG_RT2X00USB=y - endif - ifneq ($(CONFIG_PACKAGE_kmod-rt2400-pci),) - PKG_EXTRA_KCONFIG+= CONFIG_RT2400PCI=y - endif - ifneq ($(CONFIG_PACKAGE_kmod-rt2500-pci),) - PKG_EXTRA_KCONFIG+= CONFIG_RT2500PCI=y - endif - ifneq ($(CONFIG_PACKAGE_kmod-rt2500-usb),) - PKG_EXTRA_KCONFIG+= CONFIG_RT2500USB=y - endif - ifneq ($(CONFIG_PACKAGE_kmod-rt61-pci),) - PKG_EXTRA_KCONFIG+= CONFIG_RT61PCI=y - endif - ifneq ($(CONFIG_PACKAGE_kmod-rt73-usb),) - PKG_EXTRA_KCONFIG+= CONFIG_RT73USB=y - endif - - PKG_EXTRA_CFLAGS:= \ +ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-pci),) + PKG_EXTRA_KCONFIG+= CONFIG_RT2X00PCI=y +endif +ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-usb),) + PKG_EXTRA_KCONFIG+= CONFIG_RT2X00USB=y +endif +ifneq ($(CONFIG_PACKAGE_kmod-rt2400-pci),) + PKG_EXTRA_KCONFIG+= CONFIG_RT2400PCI=y +endif +ifneq ($(CONFIG_PACKAGE_kmod-rt2500-pci),) + PKG_EXTRA_KCONFIG+= CONFIG_RT2500PCI=y +endif +ifneq ($(CONFIG_PACKAGE_kmod-rt2500-usb),) + PKG_EXTRA_KCONFIG+= CONFIG_RT2500USB=y +endif +ifneq ($(CONFIG_PACKAGE_kmod-rt61-pci),) + PKG_EXTRA_KCONFIG+= CONFIG_RT61PCI=y +endif +ifneq ($(CONFIG_PACKAGE_kmod-rt73-usb),) + PKG_EXTRA_KCONFIG+= CONFIG_RT73USB=y +endif + +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)" \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - SUBDIRS="$(PKG_BUILD_DIR)" \ - $(PKG_EXTRA_KCONFIG) \ - EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \ - V="$(V)" \ - modules - endef - -endif - define Build/Prepare $(call Build/Prepare/Default) $(CP) -r src/* $(PKG_BUILD_DIR)/ @@ -161,7 +144,14 @@ define Build/Configure endef define Build/Compile -$(call Build/Compile/it) + $(MAKE) -C "$(LINUX_DIR)" \ + ARCH="$(LINUX_KARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + SUBDIRS="$(PKG_BUILD_DIR)" \ + $(PKG_EXTRA_KCONFIG) \ + EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \ + V="$(V)" \ + modules endef define KernelPackage/rt61-pci/install |