[source] mac80211: manually apply dependencies to prevent a recoursive one

LEDE Commits lede-commits at lists.infradead.org
Wed Apr 12 03:49:25 PDT 2017


jogo pushed a commit to source.git, branch master:
https://git.lede-project.org/5ba8185866a8d9b2e963551737533eb6208e504b

commit 5ba8185866a8d9b2e963551737533eb6208e504b
Author: Jonas Gorski <jonas.gorski at gmail.com>
AuthorDate: Wed Apr 12 12:44:12 2017 +0200

    mac80211: manually apply dependencies to prevent a recoursive one
    
    Apply the !UML dependency to both the symbol and the DEPENDS so there is
    no recursive dependency anymore.
    
    Signed-off-by: Jonas Gorski <jonas.gorski at gmail.com>
---
 package/kernel/mac80211/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 545ecdd..60efdaa 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -687,7 +687,7 @@ define KernelPackage/brcmfmac
   TITLE:=Broadcom IEEE802.11n USB FullMAC WLAN driver
   URL:=https://wireless.wiki.kernel.org/en/users/drivers/brcm80211
   DEPENDS+= @USB_SUPPORT +kmod-cfg80211 + at DRIVER_11N_SUPPORT + at DRIVER_11AC_SUPPORT +kmod-brcmutil \
-	+BRCMFMAC_SDIO:kmod-mmc \
+	+BRCMFMAC_SDIO&&!TARGET_uml:kmod-mmc \
 	+BRCMFMAC_USB:kmod-usb-core +BRCMFMAC_USB:brcmfmac-firmware-usb
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
   AUTOLOAD:=$(call AutoProbe,brcmfmac)
@@ -702,6 +702,7 @@ define KernelPackage/brcmfmac/config
 
 	config BRCMFMAC_SDIO
 		bool "Enable SDIO bus interface support"
+		depends on !TARGET_uml
 		default y if TARGET_brcm2708
 		default n
 		help



More information about the lede-commits mailing list