move the crda dependency to the kmod-cfg80211 package, get rid of crda's dependency on mac80211. this fixes circular dependency issues

SVN-Revision: 22304
master
Felix Fietkau 14 years ago
parent bced5d7d74
commit ae2c9dcb2b
  1. 2
      package/crda/Makefile
  2. 2
      package/hostapd/Makefile
  3. 2
      package/mac80211/Makefile

@ -28,7 +28,7 @@ define Package/crda
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=Central Regulatory Domain Agent (CRDA) TITLE:=Central Regulatory Domain Agent (CRDA)
DEPENDS:=+kmod-mac80211 +libnl-tiny DEPENDS:=+libnl-tiny
URL:=http://wireless.kernel.org/en/developers/Regulatory/CRDA URL:=http://wireless.kernel.org/en/developers/Regulatory/CRDA
endef endef

@ -82,7 +82,7 @@ ifneq ($(LOCAL_TYPE),hostapd)
CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch) CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch)
endif endif
DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN) DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny @(!(TARGET_avr32||TARGET_etrax)||BROKEN)
define Package/hostapd/Default define Package/hostapd/Default
SECTION:=net SECTION:=net

@ -41,7 +41,7 @@ endef
define KernelPackage/cfg80211 define KernelPackage/cfg80211
$(call KernelPackage/mac80211/Default) $(call KernelPackage/mac80211/Default)
TITLE:=cfg80211 - wireless configuration API TITLE:=cfg80211 - wireless configuration API
DEPENDS+= +wireless-tools +iw @!LINUX_2_6_25 DEPENDS+= +wireless-tools +iw @!LINUX_2_6_25 +crda
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1)
FILES:= \ FILES:= \
$(PKG_BUILD_DIR)/compat/compat.ko \ $(PKG_BUILD_DIR)/compat/compat.ko \

Loading…
Cancel
Save