modules: generate plain module names via version filters

Replace conditional "LINUX_6_12:mod" / "!LINUX_6_12:mod" AUTOLOAD entries
with version-filtered module names using @lt6.18 / @ge6.18. This makes
version_filter emit plain module names into /etc/modules.d(e.g. "crc32c_generic"),
allowing kmodloader to find and load the correct module for the running kernel.
Fixes crc32c (and related crypto modules) not being autoloaded on 6.12 kernels.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/22798
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index 3fb94ea13986db4f335e4174c2f91016641b970a..baf936a3c14846e088cfcefd43f859fb44240ac2 100644 (file)
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -145,7 +145,7 @@ define KernelPackage/crypto-crc32
   HIDDEN:=1
   FILES:=$(LINUX_DIR)/crypto/crc32_generic.ko@lt6.18 \
        $(LINUX_DIR)/crypto/crc32-cryptoapi.ko@ge6.18
-  AUTOLOAD:=$(call AutoLoad,04,LINUX_6_12:crc32_generic !LINUX_6_12:crc32-cryptoapi,1)
+  AUTOLOAD:=$(call AutoLoad,04,crc32_generic@lt6.18 crc32-cryptoapi@ge6.18,1)
   $(call AddDepends/crypto)
 endef
 
@@ -158,7 +158,7 @@ define KernelPackage/crypto-crc32c
   KCONFIG:=CONFIG_CRYPTO_CRC32C
   FILES:=$(LINUX_DIR)/crypto/crc32c_generic.ko@lt6.18 \
        $(LINUX_DIR)/crypto/crc32c-cryptoapi.ko@ge6.18
-  AUTOLOAD:=$(call AutoLoad,04,LINUX_6_12:crc32c_generic !LINUX_6_12:crc32c-cryptoapi,1)
+  AUTOLOAD:=$(call AutoLoad,04,crc32c_generic@lt6.18 crc32c-cryptoapi@ge6.18,1)
   $(call AddDepends/crypto)
 endef
 
@@ -744,7 +744,7 @@ define KernelPackage/crypto-md5
        CONFIG_CRYPTO_MD5_PPC
   FILES:=$(LINUX_DIR)/crypto/md5.ko \
        $(LINUX_DIR)/lib/crypto/libmd5.ko@ge6.18
-  AUTOLOAD:=$(call AutoLoad,09,md5 !LINUX_6_12:libmd5)
+  AUTOLOAD:=$(call AutoLoad,09,md5 libmd5@ge6.18)
   $(call AddDepends/crypto)
 endef
 
@@ -838,7 +838,7 @@ ifndef CONFIG_TARGET_x86_64
        $(LINUX_DIR)/arch/x86/crypto/serpent-sse2-i586.ko \
        $(LINUX_DIR)/crypto/cryptd.ko@lt6.18 \
        $(LINUX_DIR)/crypto/crypto_simd.ko@lt6.18
-    AUTOLOAD+= $(call AutoLoad,10,LINUX_6_12:cryptd \
+    AUTOLOAD+= $(call AutoLoad,10,cryptd@lt6.18 \
        serpent-sse2-i586 twofish-i586 blowfish_generic)
   endef
 endif
@@ -983,7 +983,7 @@ define KernelPackage/crypto-sha1
        CONFIG_CRYPTO_SHA1_SSSE3@lt6.18
   FILES:=$(LINUX_DIR)/crypto/sha1_generic.ko@lt6.18 \
        $(LINUX_DIR)/crypto/sha1.ko@ge6.18
-  AUTOLOAD:=$(call AutoLoad,09,LINUX_6_12:sha1_generic !LINUX_6_12:sha1)
+  AUTOLOAD:=$(call AutoLoad,09,sha1_generic@lt6.18 sha1@ge6.18)
   $(call AddDepends/crypto)
 endef
 
@@ -1069,7 +1069,7 @@ define KernelPackage/crypto-sha256
        $(LINUX_DIR)/crypto/sha256_generic.ko@lt6.18 \
        $(LINUX_DIR)/crypto/sha256.ko@ge6.18 \
        $(LINUX_DIR)/lib/crypto/libsha256.ko
-  AUTOLOAD:=$(call AutoLoad,09,LINUX_6_12:sha256_generic !LINUX_6_12:sha256)
+  AUTOLOAD:=$(call AutoLoad,09,sha256_generic@lt6.18 sha256@ge6.18)
   $(call AddDepends/crypto)
 endef
 
@@ -1130,7 +1130,7 @@ define KernelPackage/crypto-sha512
   FILES:=$(LINUX_DIR)/crypto/sha512_generic.ko@lt6.18 \
        $(LINUX_DIR)/crypto/sha512.ko@ge6.18 \
        $(LINUX_DIR)/lib/crypto/libsha512.ko@ge6.18
-  AUTOLOAD:=$(call AutoLoad,09,LINUX_6_12:sha512_generic !LINUX_6_12:sha512)
+  AUTOLOAD:=$(call AutoLoad,09,sha512_generic@lt6.18 sha512@ge6.18)
   $(call AddDepends/crypto)
 endef
 

diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 75aa1a1558be5158b9deaf2074c335625f75e2ff..c96c52f713d781d030e7631b48167a09b1f93060 100644 (file)
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -191,7 +191,7 @@ define KernelPackage/libphy
           CONFIG_MDIO_BUS
   FILES:=$(LINUX_DIR)/drivers/net/phy/libphy.ko \
     $(LINUX_DIR)/drivers/net/phy/mdio-bus.ko@ge6.18
-  AUTOLOAD:=$(call AutoLoad,15,libphy !LINUX_6_12:mdio-bus,1)
+  AUTOLOAD:=$(call AutoLoad,15,libphy mdio-bus@ge6.18,1)
 endef
 
 define KernelPackage/libphy/description

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index f206e5cf6879634b0004708ace9242959ab03aab..4ddab00bc082f9298f679b73de5845992fe20c99 100644 (file)
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -584,7 +584,7 @@ define KernelPackage/usb-dwc3-qcom
   FILES:= \
        $(LINUX_DIR)/drivers/usb/dwc3/dwc3-qcom.ko \
        $(LINUX_DIR)/drivers/usb/dwc3/dwc3-qcom-legacy.ko@ge6.18
-  AUTOLOAD:=$(call AutoLoad,53,dwc3-qcom !LINUX_6_12:dwc3-qcom-legacy,1)
+  AUTOLOAD:=$(call AutoLoad,53,dwc3-qcom dwc3-qcom-legacy@ge6.18,1)
   $(call AddDepends/usb)
 endef