[OpenWrt-Devel] [PATCH] mac80211: b43: rework package dependency
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
Re: [OpenWrt-Devel] [PATCH] mac80211: b43: rework package dependency
On Fri, Jun 6, 2014 at 12:50 PM, Rafał Miłecki zaj...@gmail.com wrote: 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 \ brcm63xx does not have bcma built-in, so the dependency is still required there. + +(!(TARGET_brcm47xx||TARGET_brcm63xx)PACKAGE_B43_BUSES_BCMA_AND_SSB):kmod-ssb \ + +(!(TARGET_brcm47xx||TARGET_brcm63xx)PACKAGE_B43_BUSES_BCMA):kmod-bcma \ Same here. + +(!(TARGET_brcm47xx||TARGET_brcm63xx)PACKAGE_B43_BUSES_SSB):kmod-ssb Since we now support building empty ipks for modules built into the kernel, I wonder if we shouldn't just drop the ! dependency of bcma/ssb to bcm47xx/bcm63xx. Then the dependencies could be written much simpler as +(PACKAGE_B43_BUSES_BCMA_AND_SSB||PACKAGE_B43_BUSES_SSB):kmod-ssb \ +(PACKAGE_B43_BUSES_BCMA||PACKAGE_B43_BUSES_BCMA):kmod-bcma Regards Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] mac80211: b43: rework package dependency
On 6 June 2014 13:25, Jonas Gorski j...@openwrt.org wrote: Since we now support building empty ipks for modules built into the kernel, I wonder if we shouldn't just drop the ! dependency of bcma/ssb to bcm47xx/bcm63xx. We definitely need to rethink think... with my patch I got: tmp/.config-package.in:9597:error: recursive dependency detected! tmp/.config-package.in:9597: choice choice contains symbol PACKAGE_kmod-b43 tmp/.config-package.in:9470: symbol PACKAGE_kmod-b43 depends on PACKAGE_B43_BUSES_SSB tmp/.config-package.in:9609: symbol PACKAGE_B43_BUSES_SSB is part of choice choice (didn't notice it earlier :/ ) -- Rafał ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
