qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 07:51:55 +02:00
Code

mac80211: fix build problems with kmod-mac80211=n

Browse Source 
Build compat-wireless also if kmod-mac80211=n, but do not build mac80211.ko.

Fix problem in ticket #6813.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20125 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2010-03-10 21:51:17 +00:00
parent a1db51bb9b
commit 684b72e150
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/mac80211/Makefile
View File

@ -606,6 +606,7 @@ MAKE_OPTS:= \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
EXTRA_CFLAGS="$(BUILDFLAGS)" \ EXTRA_CFLAGS="$(BUILDFLAGS)" \
$(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \ $(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \
CONFIG_MAC80211=$(if $(CONFIG_PACKAGE_kmod-mac80211),m) \
CONFIG_MAC80211_RC_PID=y \ CONFIG_MAC80211_RC_PID=y \
CONFIG_MAC80211_RC_MINSTREL=y \ CONFIG_MAC80211_RC_MINSTREL=y \
CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
@ -702,7 +703,7 @@ define Build/Prepare
rm $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h rm $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h
endef endef
ifneq ($(CONFIG_PACKAGE_kmod-mac80211),) ifneq ($(CONFIG_PACKAGE_kmod-cfg80211),)
define Build/Compile/kmod define Build/Compile/kmod
rm -rf $(PKG_BUILD_DIR)/modules rm -rf $(PKG_BUILD_DIR)/modules
$(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) all $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) all
@ -728,7 +729,7 @@ define KernelPackage/libertas/install
$(INSTALL_DATA) $(DL_DIR)/$(USB8388FW_NAME)-$(USB8388FW_VERSION).bin $(1)/lib/firmware/$(USB8388FW_NAME).bin $(INSTALL_DATA) $(DL_DIR)/$(USB8388FW_NAME)-$(USB8388FW_VERSION).bin $(1)/lib/firmware/$(USB8388FW_NAME).bin
endef endef
define KernelPackage/mac80211/install define KernelPackage/cfg80211/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