[openwrt/openwrt] mac80211: fixed missing cfg80211 dependency on kmod-rfkill

LEDE Commits lede-commits at lists.infradead.org
Mon Nov 29 13:55:27 PST 2021


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8d6a534cc12cb4b4d9f0f21324cb752365a71743

commit 8d6a534cc12cb4b4d9f0f21324cb752365a71743
Author: Oldřich Jedlička <oldium.pro at gmail.com>
AuthorDate: Sun Nov 7 20:30:25 2021 +0100

    mac80211: fixed missing cfg80211 dependency on kmod-rfkill
    
    When compiling with CONFIG_USE_RFKILL=y, the build fails and mentions that
    dependency on kmod-rfkill is missing, which is correct [1]. Add this
    dependency to the Makefile.
    
    Depend on +USE_RFKILL and not PACKAGE_kmod-rfkill, because it forces
    selection of kmod-rfkill package. Other combinations in DEPENDS like
    USE_RFKILL:kmod-rfkill or (+)PACKAGE_kmod-rfkill:kmod-rfkill do not force
    selection of kmod-rfkill package.
    
    The kmod-rfkill package itself depends on USE_RFKILL, so with +USE_RFKILL
    in kmod-cfg80211 package it is not possible to select wrong combination of
    packages.
    
    [1] https://linux-wireless.vger.kernel.narkive.com/m8JY9Iks/cfg80211-depends-on-rfkill-or-not
    
    Signed-off-by: Oldřich Jedlička <oldium.pro at gmail.com>
---
 package/kernel/mac80211/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 89e078b0c3..e3cf2d3800 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -97,7 +97,7 @@ PKG_CONFIG_DEPENDS += \
 define KernelPackage/cfg80211
   $(call KernelPackage/mac80211/Default)
   TITLE:=cfg80211 - wireless configuration API
-  DEPENDS+= +iw +iwinfo +wireless-regdb
+  DEPENDS+= +iw +iwinfo +wireless-regdb +USE_RFKILL:kmod-rfkill
   ABI_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
   FILES:= \
 	$(PKG_BUILD_DIR)/compat/compat.ko \



More information about the lede-commits mailing list