This fixes:
> Package kmod-b43 is missing dependencies for the following libraries:
> bcma.ko
> ssb.ko
on non-Broadcom targets.

Signed-off-by: Rafał Miłecki <zaj...@gmail.com>
---
 package/kernel/mac80211/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 5654ada..e27b6c5 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -1071,7 +1071,12 @@ define KernelPackage/b43
   KCONFIG:= \
        CONFIG_HW_RANDOM=y
   # Depend on PCI_SUPPORT to make sure we can select kmod-bcma or kmod-ssb
-  DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):PCI_SUPPORT
+  DEPENDS+=+kmod-mac80211 \
+       +!(TARGET_brcm47xx||TARGET_brcm63xx):PCI_SUPPORT \
+       
+(!(TARGET_brcm47xx||TARGET_brcm63xx)&&PACKAGE_B43_BUSES_BCMA_AND_SSB):kmod-bcma
 \
+       
+(!(TARGET_brcm47xx||TARGET_brcm63xx)&&PACKAGE_B43_BUSES_BCMA_AND_SSB):kmod-ssb 
\
+       
+(!(TARGET_brcm47xx||TARGET_brcm63xx)&&PACKAGE_B43_BUSES_BCMA):kmod-bcma \
+       +(!(TARGET_brcm47xx||TARGET_brcm63xx)&&PACKAGE_B43_BUSES_SSB):kmod-ssb
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.ko
   AUTOLOAD:=$(call AutoProbe,b43)
   MENU:=1
@@ -1187,16 +1192,12 @@ define KernelPackage/b43/config
 
        config PACKAGE_B43_BUSES_BCMA_AND_SSB
                bool "BCMA and SSB"
-               select PACKAGE_kmod-bcma if !TARGET_brcm47xx
-               select PACKAGE_kmod-ssb if !(TARGET_brcm47xx || TARGET_brcm63xx)
 
        config PACKAGE_B43_BUSES_BCMA
                bool "BCMA only"
-               select PACKAGE_kmod-bcma if !TARGET_brcm47xx
 
        config PACKAGE_B43_BUSES_SSB
                bool "SSB only"
-               select PACKAGE_kmod-ssb if !(TARGET_brcm47xx || TARGET_brcm63xx)
 
        endchoice
 
-- 
1.8.4.5
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to