From 9f4f194b304af3ff8b41b18e455147703d8d29a9 Mon Sep 17 00:00:00 2001 From: aiamadeus <42570690+aiamadeus@users.noreply.github.com> Date: Sun, 15 Jun 2025 23:09:20 +0800 Subject: [PATCH] kernel/modules: refresh kernel limit judgment Fixes: #13580 --- package/kernel/linux/modules/crypto.mk | 4 ++-- package/kernel/linux/modules/fs.mk | 18 ++++++++++-------- package/kernel/linux/modules/netdevices.mk | 2 +- package/kernel/linux/modules/netsupport.mk | 2 +- package/kernel/linux/modules/other.mk | 2 +- package/kernel/linux/modules/usb.mk | 13 +++++++------ package/kernel/linux/modules/video.mk | 8 ++++---- target/linux/phytium/modules.mk | 4 ++-- target/linux/x86/modules.mk | 4 ++-- 9 files changed, 30 insertions(+), 27 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index d69d11d0e..6648a5ad8 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -893,8 +893,8 @@ define KernelPackage/crypto-rng TITLE:=CryptoAPI random number generation DEPENDS:=+kmod-crypto-hash +kmod-crypto-hmac \ +(LINUX_5_4||LINUX_5_10):kmod-crypto-sha256 \ - +(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-crypto-sha512 \ - +(LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-crypto-sha3 + +!(LINUX_5_4||LINUX_5_10):kmod-crypto-sha512 \ + +!(LINUX_5_4||LINUX_5_10||LINUX_5_15):kmod-crypto-sha3 KCONFIG:= \ CONFIG_CRYPTO_DRBG \ CONFIG_CRYPTO_DRBG_HMAC=y \ diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 443126999..214a9b66d 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -10,7 +10,7 @@ FS_MENU:=Filesystems define KernelPackage/fs-9p SUBMENU:=$(FS_MENU) TITLE:=Plan 9 Resource Sharing Support - DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs +LINUX_6_6||LINUX_6_12:kmod-fs-netfs + DEPENDS:=+kmod-9pnet +(LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-fs-netfs KCONFIG:=\ CONFIG_9P_FS \ CONFIG_9P_FS_POSIX_ACL=n \ @@ -93,7 +93,8 @@ define KernelPackage/fs-smbfs-common DEPENDS:= \ +(LINUX_5_4||LINUX_5_10):kmod-crypto-arc4 \ +(LINUX_5_4||LINUX_5_10):kmod-crypto-md4 \ - +LINUX_6_6||LINUX_6_12:kmod-fs-netfs +LINUX_6_6||LINUX_6_12:kmod-nls-ucs2-utils + +(LINUX_6_6||LINUX_6_12):kmod-fs-netfs \ + +(LINUX_6_6||LINUX_6_12):kmod-nls-ucs2-utils FILES:= \ $(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko@lt6.1 \ $(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko@lt6.1 \ @@ -131,9 +132,9 @@ define KernelPackage/fs-cifs +kmod-crypto-ccm \ +kmod-crypto-ecb \ +kmod-crypto-des \ - +(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-asn1-decoder \ - +(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-oid-registry \ - +(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-dnsresolver + +!(LINUX_5_4||LINUX_5_10):kmod-asn1-decoder \ + +!(LINUX_5_4||LINUX_5_10):kmod-oid-registry \ + +!(LINUX_5_4||LINUX_5_10):kmod-dnsresolver endef define KernelPackage/fs-cifs/description @@ -349,7 +350,7 @@ define KernelPackage/fs-jfs KCONFIG:=CONFIG_JFS_FS FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko AUTOLOAD:=$(call AutoLoad,30,jfs,1) - DEPENDS:=+LINUX_6_6||LINUX_6_12:kmod-nls-ucs2-utils + DEPENDS:=+(LINUX_6_6||LINUX_6_12):kmod-nls-ucs2-utils $(call AddDepends/nls) endef @@ -394,7 +395,7 @@ $(eval $(call KernelPackage,fs-msdos)) define KernelPackage/fs-netfs SUBMENU:=$(FS_MENU) TITLE:=Network Filesystems support - DEPENDS:=@(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12) + DEPENDS:=@!(LINUX_5_4||LINUX_5_10) KCONFIG:= CONFIG_NETFS_SUPPORT FILES:=$(LINUX_DIR)/fs/netfs/netfs.ko AUTOLOAD:=$(call AutoLoad,28,netfs) @@ -682,7 +683,8 @@ define KernelPackage/pstore CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y FILES:= $(LINUX_DIR)/fs/pstore/pstore.ko AUTOLOAD:=$(call AutoLoad,30,pstore,1) - DEPENDS:=+LINUX_6_6||LINUX_6_12:kmod-lib-zlib-deflate +LINUX_6_6||LINUX_6_12:kmod-lib-zlib-inflate + DEPENDS:=+(LINUX_6_6||LINUX_6_12):kmod-lib-zlib-deflate \ + +(LINUX_6_6||LINUX_6_12):kmod-lib-zlib-inflate endef define KernelPackage/pstore/description diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 856711118..c2a2a0071 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1967,7 +1967,7 @@ $(eval $(call KernelPackage,stmmac-core)) define KernelPackage/wwan SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=WWAN Driver Core - DEPENDS:=@(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12) + DEPENDS:=@!(LINUX_5_4||LINUX_5_10) KCONFIG:= \ CONFIG_WWAN \ CONFIG_WWAN_DEBUGFS=y@ge5.17 diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 3fa6a0547..7a16ce3d6 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -927,7 +927,7 @@ $(eval $(call KernelPackage,sched-mqprio-common)) define KernelPackage/sched-mqprio SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Multi-queue priority scheduler (MQPRIO) - DEPENDS:=+kmod-sched-core +LINUX_6_6||LINUX_6_12:kmod-sched-mqprio-common + DEPENDS:=+kmod-sched-core +(LINUX_6_6||LINUX_6_12):kmod-sched-mqprio-common KCONFIG:=CONFIG_NET_SCH_MQPRIO FILES:=$(LINUX_DIR)/net/sched/sch_mqprio.ko AUTOLOAD:=$(call AutoProbe, sch_mqprio) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 9a82cfc2b..ac6019380 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -1358,7 +1358,7 @@ $(eval $(call KernelPackage,itco-wdt)) define KernelPackage/mhi-bus SUBMENU:=$(OTHER_MENU) TITLE:=MHI bus - DEPENDS:=@(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12) + DEPENDS:=@!(LINUX_5_4||LINUX_5_10) KCONFIG:=CONFIG_MHI_BUS \ CONFIG_MHI_BUS_DEBUG=y FILES:=$(LINUX_DIR)/drivers/bus/mhi/host/mhi.ko diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index f87f66978..5bd87d7a2 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -576,7 +576,7 @@ define KernelPackage/usb-audio CONFIG_SND_USB_AUDIO $(call AddDepends/usb) $(call AddDepends/sound) - DEPENDS+=+(LINUX_6_1||LINUX_6_6):kmod-media-core + DEPENDS+=+(LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-media-core FILES:= \ $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \ $(LINUX_DIR)/sound/usb/snd-usb-audio.ko @@ -661,7 +661,7 @@ define KernelPackage/usb-serial-ch348 KCONFIG:=CONFIG_USB_SERIAL_CH348 FILES:=$(LINUX_DIR)/drivers/usb/serial/ch348.ko AUTOLOAD:=$(call AutoProbe,ch348) - DEPENDS:=@(LINUX_6_1||LINUX_6_6) + DEPENDS:=@(LINUX_6_1||LINUX_6_6||LINUX_6_12) $(call AddDepends/usb-serial) endef @@ -1201,9 +1201,10 @@ $(eval $(call KernelPackage,usb-net-aqc111)) define KernelPackage/usb-net-asix TITLE:=Kernel module for USB-to-Ethernet Asix convertors - DEPENDS:=+kmod-phy-ax88796b +(LINUX_6_1||LINUX_6_6):kmod-phylink \ - +(LINUX_5_15||LINUX_6_1||LINUX_6_6):kmod-mdio-devres \ - +(LINUX_5_15||LINUX_6_1||LINUX_6_6):kmod-net-selftests + DEPENDS:=+kmod-phy-ax88796b \ + +!(LINUX_5_4||LINUX_5_10||LINUX_5_15):kmod-phylink \ + +!(LINUX_5_4||LINUX_5_10):kmod-mdio-devres \ + +!(LINUX_5_4||LINUX_5_10):kmod-net-selftests KCONFIG:=CONFIG_USB_NET_AX8817X FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko AUTOLOAD:=$(call AutoProbe,asix) @@ -1332,7 +1333,7 @@ $(eval $(call KernelPackage,usb-net-smsc75xx)) define KernelPackage/usb-net-smsc95xx TITLE:=SMSC LAN95XX based USB 2.0 10/100 ethernet devices DEPENDS:=+!LINUX_5_4:kmod-libphy +kmod-phy-smsc \ - +(LINUX_6_1||LINUX_6_6):kmod-net-selftests + +(LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-net-selftests KCONFIG:=CONFIG_USB_NET_SMSC95XX FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc95xx.ko AUTOLOAD:=$(call AutoProbe,smsc95xx) diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index b69952cfe..f10d20563 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -302,7 +302,7 @@ define KernelPackage/drm TITLE:=Direct Rendering Manager (DRM) support HIDDEN:=1 DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-backlight \ - +(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-fb + +!(LINUX_5_4||LINUX_5_10):kmod-fb KCONFIG:=CONFIG_DRM FILES:= \ $(LINUX_DIR)/drivers/gpu/drm/drm.ko \ @@ -481,7 +481,7 @@ define KernelPackage/drm-amdgpu DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-ttm \ +kmod-drm-ttm-helper +kmod-drm-kms-helper +kmod-i2c-algo-bit +amdgpu-firmware \ +kmod-drm-display-helper +kmod-drm-buddy +kmod-acpi-video \ - +LINUX_6_6||LINUX_6_12:kmod-drm-exec +LINUX_6_6||LINUX_6_12:kmod-drm-suballoc-helper + +(LINUX_6_6||LINUX_6_12):kmod-drm-exec +(LINUX_6_6||LINUX_6_12):kmod-drm-suballoc-helper KCONFIG:=CONFIG_DRM_AMDGPU \ CONFIG_DRM_AMDGPU_SI=y \ CONFIG_DRM_AMDGPU_CIK=y \ @@ -693,7 +693,7 @@ define KernelPackage/drm-radeon DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-kms-helper \ +kmod-drm-ttm +kmod-drm-ttm-helper +kmod-i2c-algo-bit +radeon-firmware \ +kmod-drm-display-helper +(LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-acpi-video \ - +LINUX_6_6||LINUX_6_12:kmod-drm-suballoc-helper + +(LINUX_6_6||LINUX_6_12):kmod-drm-suballoc-helper KCONFIG:=CONFIG_DRM_RADEON FILES:=$(LINUX_DIR)/drivers/gpu/drm/radeon/radeon.ko AUTOLOAD:=$(call AutoProbe,radeon) @@ -747,7 +747,7 @@ define KernelPackage/video-core SUBMENU:=$(VIDEO_MENU) TITLE=Video4Linux support DEPENDS:=+PACKAGE_kmod-i2c-core:kmod-i2c-core \ - +LINUX_6_1||LINUX_6_6||LINUX_6_12:kmod-media-core + +(LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-media-core KCONFIG:= \ CONFIG_VIDEO_DEV \ CONFIG_V4L_PLATFORM_DRIVERS=y diff --git a/target/linux/phytium/modules.mk b/target/linux/phytium/modules.mk index 2ed807460..22ee0a485 100644 --- a/target/linux/phytium/modules.mk +++ b/target/linux/phytium/modules.mk @@ -16,8 +16,8 @@ $(eval $(call KernelPackage,hwmon-phytium)) define KernelPackage/drm-phytium SUBMENU:=$(VIDEO_MENU) TITLE:=DRM Support for Phytium Graphics Card - DEPENDS:=@TARGET_phytium @DISPLAY_SUPPORT +kmod-drm +kmod-drm-kms-helper \ - +(LINUX_5_10||LINUX_6_1||LINUX_6_3||LINUX_6_4||LINUX_6_5||LINUX_6_6):kmod-acpi-video + DEPENDS:=@TARGET_phytium @DISPLAY_SUPPORT +kmod-drm \ + +kmod-drm-kms-helper +LINUX_5_10:kmod-acpi-video KCONFIG:=CONFIG_DRM_PHYTIUM FILES:=$(LINUX_DIR)/drivers/gpu/drm/phytium/phytium-dc-drm.ko AUTOLOAD:=$(call AutoProbe,phytium-dc-drm) diff --git a/target/linux/x86/modules.mk b/target/linux/x86/modules.mk index 8a4b92c81..af1ea5a88 100644 --- a/target/linux/x86/modules.mk +++ b/target/linux/x86/modules.mk @@ -5,8 +5,8 @@ define KernelPackage/amd-xgbe SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=AMD Ethernet on SoC support - DEPENDS:=@PCI_SUPPORT @TARGET_x86_64 +kmod-lib-crc32c +kmod-ptp +kmod-libphy \ - +(LINUX_5_10||LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-mdio-devres + DEPENDS:=@PCI_SUPPORT @TARGET_x86_64 +kmod-lib-crc32c \ + +kmod-ptp +kmod-libphy +!LINUX_5_4:kmod-mdio-devres KCONFIG:=CONFIG_AMD_XGBE FILES:=$(LINUX_DIR)/drivers/net/ethernet/amd/xgbe/amd-xgbe.ko AUTOLOAD:=$(call AutoLoad,35,amd-xgbe)