qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 23:17:31 +02:00
Code

clean up mac80211 related kernel version deps

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9522 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-11-10 15:23:02 +00:00
parent ab4c638f6a
commit 85c1d5c751
5 changed files with 54 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/acx-mac80211/Makefile
View File

@ -27,8 +27,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/acx-mac80211 define KernelPackage/acx-mac80211
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
TITLE:=ACX111 Mac80211 driver TITLE:=ACX111 Mac80211 driver
DEPENDS:=@LINUX_2_6 +kmod-mac80211 @!TARGET_atheros DEPENDS:=+kmod-mac80211 @!TARGET_atheros
# KCONFIG:=CONFIG_MAC80211
FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX) FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,acx-mac80211) AUTOLOAD:=$(call AutoLoad,50,acx-mac80211)
endef endef
@ -42,16 +41,15 @@ $(STAMP_BUILT): $(DL_DIR)/$(PKG_FW_NAME)
$(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) $(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=m \
CONFIG_ACX_MAC80211_PCI=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 %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \ $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
define Build/Compile define Build/Compile
$(MAKE) -C "$(LINUX_DIR)" \ $(MAKE) -C "$(LINUX_DIR)" \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
@ -62,10 +60,7 @@ ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),)
-include linux/autoconf.h" \ -include linux/autoconf.h" \
V="$(V)" \ V="$(V)" \
modules modules
endef endef
else
override CONFIG_PACKAGE_kmod-acx-mac80211=
endif
define Build/Configure define Build/Configure
endef endef

16
package/b43/Makefile
View File

@ -44,22 +44,18 @@ MAKE_OPTS:= \
LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include -include linux/autoconf.h" \ LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include -include linux/autoconf.h" \
$(EXTRA_KCONFIG) $(EXTRA_KCONFIG)
ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),) define Build/Prepare
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR) mkdir -p $(PKG_BUILD_DIR)
$(CP) ./src/* $(PKG_BUILD_DIR)/ $(CP) ./src/* $(PKG_BUILD_DIR)/
endef endef
define Build/Configure define Build/Configure
endef endef
define Build/Compile define Build/Compile
$(MAKE) -C "$(LINUX_DIR)" \ $(MAKE) -C "$(LINUX_DIR)" \
$(MAKE_OPTS) \ $(MAKE_OPTS) \
modules modules
endef endef
else
override CONFIG_PACKAGE_kmod-b43=
endif
$(eval $(call KernelPackage,b43)) $(eval $(call KernelPackage,b43))

26
package/mac80211/Makefile
View File

@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/mac80211 define KernelPackage/mac80211
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
TITLE:=Linux 802.11 Wireless Networking Stack 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:= \ FILES:= \
$(PKG_BUILD_DIR)/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX) \
@ -44,34 +44,30 @@ MAKE_OPTS:= \
CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
LINUXINCLUDE="-I${CURDIR}/src/include -I$(LINUX_DIR)/include -include linux/autoconf.h" \ 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 mkdir -p $(PKG_BUILD_DIR)/mac80211
$(CP) ./src/mac80211/* $(PKG_BUILD_DIR)/mac80211/ $(CP) ./src/mac80211/* $(PKG_BUILD_DIR)/mac80211/
mkdir -p $(PKG_BUILD_DIR)/wireless mkdir -p $(PKG_BUILD_DIR)/wireless
$(CP) ./src/wireless/* $(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)/wireless" modules
$(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/mac80211" 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 mkdir -p $(1)/usr/include/mac80211
$(CP) ./src/include/* $(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 rm -rf $(1)/usr/include/mac80211
endef endef
define KernelPackage/mac80211/install define KernelPackage/mac80211/install
$(INSTALL_DIR) $(1)/lib/wifi $(INSTALL_DIR) $(1)/lib/wifi
$(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi
endef endef
else
override CONFIG_PACKAGE_kmod-mac80211=
endif
$(eval $(call KernelPackage,mac80211)) $(eval $(call KernelPackage,mac80211))

2
package/p54/Makefile
View File

@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/p54/Default define KernelPackage/p54/Default
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
TITLE:=Prism Wireless Support (mac80211) TITLE:=Prism Wireless Support (mac80211)
DEPENDS:=@LINUX_2_6 +kmod-mac80211 DEPENDS:=+kmod-mac80211
endef endef
define KernelPackage/p54-common define KernelPackage/p54-common

58
package/rt2x00/Makefile
View File

@ -27,7 +27,6 @@ define KernelPackage/rt2x00/Default
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
TITLE:=Ralink Drivers for RT2x00 cards TITLE:=Ralink Drivers for RT2x00 cards
DEPENDS:=@LINUX_2_6 @!TARGET_atheros @!TARGET_uml DEPENDS:=@LINUX_2_6 @!TARGET_atheros @!TARGET_uml
KCONFIG:=CONFIG_MAC80211
endef endef
define KernelPackage/rt2x00-lib define KernelPackage/rt2x00-lib
@ -102,53 +101,37 @@ $(DL_DIR)/$(PKG_FW6X_NAME):
$(DL_DIR)/$(PKG_FW7X_NAME): $(DL_DIR)/$(PKG_FW7X_NAME):
$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW7X_NAME)" "$(PKG_FW7X_MD5SUM)" $(PKG_FW7X_URL) $(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) PKG_EXTRA_KCONFIG:= \
ifndef ($(CONFIG_MAC80211),)
PKG_EXTRA_KCONFIG:= \
CONFIG_RT2X00=y \ CONFIG_RT2X00=y \
CONFIG_RT2X00_DEBUG=y \ CONFIG_RT2X00_DEBUG=y \
ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-pci),) ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-pci),)
PKG_EXTRA_KCONFIG+= CONFIG_RT2X00PCI=y PKG_EXTRA_KCONFIG+= CONFIG_RT2X00PCI=y
endif endif
ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-usb),) ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-usb),)
PKG_EXTRA_KCONFIG+= CONFIG_RT2X00USB=y PKG_EXTRA_KCONFIG+= CONFIG_RT2X00USB=y
endif endif
ifneq ($(CONFIG_PACKAGE_kmod-rt2400-pci),) ifneq ($(CONFIG_PACKAGE_kmod-rt2400-pci),)
PKG_EXTRA_KCONFIG+= CONFIG_RT2400PCI=y PKG_EXTRA_KCONFIG+= CONFIG_RT2400PCI=y
endif endif
ifneq ($(CONFIG_PACKAGE_kmod-rt2500-pci),) ifneq ($(CONFIG_PACKAGE_kmod-rt2500-pci),)
PKG_EXTRA_KCONFIG+= CONFIG_RT2500PCI=y PKG_EXTRA_KCONFIG+= CONFIG_RT2500PCI=y
endif endif
ifneq ($(CONFIG_PACKAGE_kmod-rt2500-usb),) ifneq ($(CONFIG_PACKAGE_kmod-rt2500-usb),)
PKG_EXTRA_KCONFIG+= CONFIG_RT2500USB=y PKG_EXTRA_KCONFIG+= CONFIG_RT2500USB=y
endif endif
ifneq ($(CONFIG_PACKAGE_kmod-rt61-pci),) ifneq ($(CONFIG_PACKAGE_kmod-rt61-pci),)
PKG_EXTRA_KCONFIG+= CONFIG_RT61PCI=y PKG_EXTRA_KCONFIG+= CONFIG_RT61PCI=y
endif endif
ifneq ($(CONFIG_PACKAGE_kmod-rt73-usb),) ifneq ($(CONFIG_PACKAGE_kmod-rt73-usb),)
PKG_EXTRA_KCONFIG+= CONFIG_RT73USB=y PKG_EXTRA_KCONFIG+= CONFIG_RT73USB=y
endif endif
PKG_EXTRA_CFLAGS:= \ PKG_EXTRA_CFLAGS:= \
-I$(STAGING_DIR)/usr/include/mac80211 \ -I$(STAGING_DIR)/usr/include/mac80211 \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \ $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(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 define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
$(CP) -r src/* $(PKG_BUILD_DIR)/ $(CP) -r src/* $(PKG_BUILD_DIR)/
@ -161,7 +144,14 @@ define Build/Configure
endef endef
define Build/Compile 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 endef
define KernelPackage/rt61-pci/install define KernelPackage/rt61-pci/install