Changeset 28437


Ignore:
Timestamp:
2011-10-13T14:13:25+02:00 (6 years ago)
Author:
hauke
Message:

mac80211: fix some dependencies and make lib80211 compile without cfg80211 selected

  • libertas: does not depend on mac80211 but on cfg80211 and it uses wext
  • libipw: also uses wext
  • net-hermes: it is enough if the main package net-hermes depends on cfg80211
  • Now it is possible to build it without cfg80211 at all
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/Makefile

    r28436 r28437  
    490490define KernelPackage/libertas-usb 
    491491  $(call KernelPackage/mac80211/Default) 
    492   DEPENDS+= @USB_SUPPORT +kmod-mac80211 +kmod-usb-core +kmod-lib80211 
     492  DEPENDS+= @USB_SUPPORT +kmod-cfg80211 +kmod-usb-core +kmod-lib80211 +@DRIVER_WEXT_SUPPORT 
    493493  TITLE:=Marvell 88W8015 Wireless Driver 
    494494  FILES:= \ 
     
    500500define KernelPackage/libertas-sd 
    501501  $(call KernelPackage/mac80211/Default) 
    502   DEPENDS+= +kmod-mac80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT 
     502  DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT 
    503503  TITLE:=Marvell 88W8686 Wireless Driver 
    504504  FILES:= \ 
     
    519519  $(call KernelPackage/mac80211/Default) 
    520520  TITLE:=libipw for ipw2100 and ipw2200 
    521   DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 
     521  DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT 
    522522  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/libipw.ko 
    523523  AUTOLOAD:=$(call AutoLoad,49,libipw) 
     
    592592  $(call KernelPackage/mac80211/Default) 
    593593  TITLE:=Intersil Prism 2.5 PCI support 
    594   DEPENDS:=@PCI_SUPPORT +kmod-net-hermes +kmod-cfg80211 
     594  DEPENDS:=@PCI_SUPPORT +kmod-net-hermes 
    595595  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko 
    596596  AUTOLOAD:=$(call AutoLoad,55,orinoco_pci) 
     
    604604  $(call KernelPackage/mac80211/Default) 
    605605  TITLE:=PLX9052 based PCI adaptor 
    606   DEPENDS:=@PCI_SUPPORT +kmod-net-hermes +kmod-cfg80211 
     606  DEPENDS:=@PCI_SUPPORT +kmod-net-hermes 
    607607  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko 
    608608  AUTOLOAD:=$(call AutoLoad,55,orinoco_plx) 
     
    616616  $(call KernelPackage/mac80211/Default) 
    617617  TITLE:=Hermes based PCMCIA adaptors 
    618   DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes +kmod-cfg80211 @BROKEN 
     618  DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes @BROKEN 
    619619  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_cs.ko 
    620620  AUTOLOAD:=$(call AutoLoad,55,orinoco_cs) 
     
    10831083        EXTRA_CFLAGS="$(BUILDFLAGS)" \ 
    10841084        $(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \ 
     1085        CONFIG_CFG80211=$(if $(CONFIG_PACKAGE_kmod-cfg80211),m) \ 
    10851086        CONFIG_MAC80211=$(if $(CONFIG_PACKAGE_kmod-mac80211),m) \ 
    10861087        CONFIG_MAC80211_RC_MINSTREL=y \ 
     
    12261227endef 
    12271228 
    1228 ifneq ($(CONFIG_PACKAGE_kmod-cfg80211),) 
     1229ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),) 
    12291230 define Build/Compile/kmod 
    12301231        rm -rf $(PKG_BUILD_DIR)/modules 
Note: See TracChangeset for help on using the changeset viewer.