[LEDE-DEV] Using PROVIDES with kmod packages

[Rafał Miłecki]

I was doing some fun experiments with ssb/bcma/b43 as a research based on:
[PATCH RFC] kernel: allow selecting kmod-ssb on TARGET_brcm47xx_mips74k

I was trying to build 2 variants of ssb package and 2 variants of b43 package.
It didn't work, most likely because of the way PROVIDES is handled. I stripped
down my changes to a simple ssb module package dif (see below). With this change
applied I'm getting:

Collected errors:
  * satisfy_dependencies_for: Cannot satisfy the following dependencies for kmod-b43:
  *      kmod-ssb *
  * opkg_install_cmd: Cannot install package kmod-b43.

Is this possible to make PROVIDES work with kernel module packages?


diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 017a94c622..a7ba590593 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -414,10 +414,11 @@ endef
  $(eval $(call KernelPackage,softdog))


-define KernelPackage/ssb
+define KernelPackage/ssb-v1
    SUBMENU:=$(OTHER_MENU)
    TITLE:=Silicon Sonics Backplane glue code
    DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx @!TARGET_brcm63xx
+  PROVIDES:=kmod-ssb
    KCONFIG:=\
  	CONFIG_SSB \
  	CONFIG_SSB_B43_PCI_BRIDGE=y \
@@ -437,7 +438,7 @@ define KernelPackage/ssb/description
   Silicon Sonics Backplane glue code.
  endef

-$(eval $(call KernelPackage,ssb))
+$(eval $(call KernelPackage,ssb-v1))


  define KernelPackage/bcma
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index a5e56d9858..2cba074c81 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -501,7 +501,7 @@ config PACKAGE_B43_USE_BCMA
  		  This allows choosing buses that b43 should support.

  	config PACKAGE_B43_BUSES_BCMA_AND_SSB
-		depends on !TARGET_brcm47xx_legacy && !TARGET_brcm47xx_mips74k && !TARGET_bcm53xx
+		depends on !TARGET_brcm47xx_legacy && !TARGET_brcm47xx_mips74k
  		bool "BCMA and SSB"

  	config PACKAGE_B43_BUSES_BCMA
@@ -509,7 +509,7 @@ config PACKAGE_B43_USE_BCMA
  		bool "BCMA only"

  	config PACKAGE_B43_BUSES_SSB
-		depends on !TARGET_brcm47xx_mips74k && !TARGET_bcm53xx
+		depends on !TARGET_brcm47xx_mips74k
  		bool "SSB only"

  	endchoice