On Fri, Jun 6, 2014 at 12:50 PM, Rafał Miłecki <[email protected]> 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 <[email protected]> > --- > 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 [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
