kernel/r8169: provide a virtual kmod

Switch r8169 and related kmods to use the new virtual kmod provides
semantic and mark r8169 as the default variant.

Signed-off-by: George Sapkin <george@sapk.in>
Link: https://github.com/openwrt/openwrt/pull/21288
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index b92c060c1db3ddde9eb468bdb24d726415b902d0..11d7b32c27e4461b784c07a22943410c067c2cee 100644 (file)
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -1207,6 +1207,7 @@ define KernelPackage/r8169
     CONFIG_R8169_LEDS=y
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/r8169.ko
   AUTOLOAD:=$(call AutoProbe,r8169,1)
+  DEFAULT_VARIANT:=1
 endef
 
 define KernelPackage/r8169/description

diff --git a/package/kernel/r8101/Makefile b/package/kernel/r8101/Makefile
index 993e0de13a56c76f52141b61bfd13c40008b5b63..a13cd83e217adde84e19c723679509daba1e19b5 100644 (file)
--- a/package/kernel/r8101/Makefile
+++ b/package/kernel/r8101/Makefile
@@ -21,7 +21,7 @@ define KernelPackage/r8101
   DEPENDS:=@PCI_SUPPORT +kmod-libphy
   FILES:=$(PKG_BUILD_DIR)/src/r8101.ko
   AUTOLOAD:=$(call AutoProbe,r8101,1)
-  PROVIDES:=kmod-r8169
+  PROVIDES:=@kmod-r8169-any
 endef
 
 define Build/Compile

diff --git a/package/kernel/r8125/Makefile b/package/kernel/r8125/Makefile
index 7cb28c9980482511fa143d6243fea63fd3f23f41..032559f4c4156cd72d2ba82ec9567449b09cd9b3 100644 (file)
--- a/package/kernel/r8125/Makefile
+++ b/package/kernel/r8125/Makefile
@@ -21,7 +21,7 @@ define KernelPackage/r8125
   DEPENDS:=@PCI_SUPPORT +kmod-libphy
   FILES:=$(PKG_BUILD_DIR)/src/r8125.ko
   AUTOLOAD:=$(call AutoProbe,r8125,1)
-  PROVIDES:=kmod-r8169
+  PROVIDES:=@kmod-r8169-any
   VARIANT:=regular
   PKG_MAKE_FLAGS += CONFIG_ASPM=n
 endef

diff --git a/package/kernel/r8126/Makefile b/package/kernel/r8126/Makefile
index 6bc39a936a5c0074fec6b3aacb21550a5a1c2972..2b6c9427f093eeb559c8bd0b55811d476e3ec029 100644 (file)
--- a/package/kernel/r8126/Makefile
+++ b/package/kernel/r8126/Makefile
@@ -21,7 +21,7 @@ define KernelPackage/r8126
   DEPENDS:=@PCI_SUPPORT +kmod-libphy
   FILES:=$(PKG_BUILD_DIR)/src/r8126.ko
   AUTOLOAD:=$(call AutoProbe,r8126,1)
-  PROVIDES:=kmod-r8169
+  PROVIDES:=@kmod-r8169-any
   VARIANT:=regular
 endef
 

diff --git a/package/kernel/r8127/Makefile b/package/kernel/r8127/Makefile
index 38be4ae82d7c78649ff64e898353b57798d287cf..11331390c8462aecd3fa2ba733730d193507ca00 100644 (file)
--- a/package/kernel/r8127/Makefile
+++ b/package/kernel/r8127/Makefile
@@ -21,7 +21,7 @@ define KernelPackage/r8127
   DEPENDS:=@PCI_SUPPORT +kmod-libphy
   FILES:=$(PKG_BUILD_DIR)/src/r8127.ko
   AUTOLOAD:=$(call AutoProbe,r8127,1)
-  PROVIDES:=kmod-r8169
+  PROVIDES:=@kmod-r8169-any
   VARIANT:=regular
 endef
 

diff --git a/package/kernel/r8168/Makefile b/package/kernel/r8168/Makefile
index 812cbad61d5dfbcc2c9e55e4a4b93b7ac71f4f06..79117346eda2514d6a4609f1a47e0d2bb1de338f 100644 (file)
--- a/package/kernel/r8168/Makefile
+++ b/package/kernel/r8168/Makefile
@@ -21,7 +21,7 @@ define KernelPackage/r8168
   DEPENDS:=@PCI_SUPPORT +kmod-libphy
   FILES:=$(PKG_BUILD_DIR)/src/r8168.ko
   AUTOLOAD:=$(call AutoProbe,r8168,1)
-  PROVIDES:=kmod-r8169
+  PROVIDES:=@kmod-r8169-any
   VARIANT:=regular
 endef