diff --git a/root/package/kernel/linux/modules/crypto.mk b/root/package/kernel/linux/modules/crypto.mk index b37cd435..7ee603d5 100755 --- a/root/package/kernel/linux/modules/crypto.mk +++ b/root/package/kernel/linux/modules/crypto.mk @@ -466,16 +466,6 @@ define KernelPackage/crypto-lib-blake2s/x86/64 FILES+=$(LINUX_DIR)/arch/x86/crypto/blake2s-x86_64.ko endef -define KernelPackage/crypto-lib-blake2s/arm - KCONFIG+=CONFIG_CRYPTO_BLAKE2S_ARM - FILES+=$(LINUX_DIR)/arch/arm/crypto/blake2s-arm.ko -endef - -ifdef KernelPackage/crypto-lib-blake2s/$(ARCH) - KernelPackage/crypto-lib-blake2s/$(CRYPTO_TARGET)=\ - $(KernelPackage/crypto-lib-blake2s/$(ARCH)) -endif - $(eval $(call KernelPackage,crypto-lib-blake2s)) @@ -693,7 +683,7 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_KHAZAD \ CONFIG_CRYPTO_SERPENT \ CONFIG_CRYPTO_TEA \ - CONFIG_CRYPTO_TGR192@lt5.12 \ + CONFIG_CRYPTO_TGR192 \ CONFIG_CRYPTO_TWOFISH \ CONFIG_CRYPTO_TWOFISH_COMMON \ CONFIG_CRYPTO_TWOFISH_586 \ @@ -714,7 +704,7 @@ define KernelPackage/crypto-misc $(LINUX_DIR)/crypto/blowfish_generic.ko \ $(LINUX_DIR)/crypto/serpent_generic.ko AUTOLOAD:=$(call AutoLoad,10,anubis camellia_generic cast_common \ - cast5_generic cast6_generic khazad tea tgr192@lt5.12 twofish_common \ + cast5_generic cast6_generic khazad tea tgr192 twofish_common \ wp512 blowfish_common serpent_generic) ifndef CONFIG_TARGET_x86 AUTOLOAD+= $(call AutoLoad,10,twofish_generic blowfish_generic) diff --git a/root/package/kernel/linux/modules/fs.mk b/root/package/kernel/linux/modules/fs.mk index 70118786..8c5c787d 100755 --- a/root/package/kernel/linux/modules/fs.mk +++ b/root/package/kernel/linux/modules/fs.mk @@ -88,19 +88,14 @@ define KernelPackage/fs-cifs SUBMENU:=$(FS_MENU) TITLE:=CIFS support KCONFIG:= \ - CONFIG_SMBFS_COMMON@ge5.15 \ CONFIG_CIFS \ CONFIG_CIFS_DFS_UPCALL=n \ CONFIG_CIFS_UPCALL=n - FILES:= \ - $(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko@ge5.15 \ - $(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko@ge5.15 \ - $(LINUX_DIR)/fs/cifs/cifs.ko + FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko AUTOLOAD:=$(call AutoLoad,30,cifs) $(call AddDepends/nls) DEPENDS+= \ - +(LINUX_5_4||LINUX_5_10):kmod-crypto-md4\ - +(LINUX_5_4||LINUX_5_10):kmod-crypto-arc4 \ + +kmod-crypto-md4 \ +kmod-crypto-md5 \ +kmod-crypto-sha256 \ +kmod-crypto-sha512 \ @@ -110,9 +105,7 @@ define KernelPackage/fs-cifs +kmod-crypto-aead \ +kmod-crypto-ccm \ +kmod-crypto-ecb \ - +(LINUX_5_15):kmod-asn1-decoder \ - +(LINUX_5_15):kmod-oid-registry \ - +(LINUX_5_15):kmod-dnsresolver + +kmod-crypto-des endef define KernelPackage/fs-cifs/description @@ -245,21 +238,12 @@ define KernelPackage/fs-f2fs/description endef $(eval $(call KernelPackage,fs-f2fs)) -define KernelPackage/fs-netfs - SUBMENU:=$(FS_MENU) - TITLE:=Network Filesystems support - DEPENDS:=@LINUX_5_15 - KCONFIG:= CONFIG_NETFS_SUPPORT - FILES:=$(LINUX_DIR)/fs/netfs/netfs.ko - AUTOLOAD:=$(call AutoLoad,28,netfs) -endef -$(eval $(call KernelPackage,fs-netfs)) define KernelPackage/fs-fscache SUBMENU:=$(FS_MENU) TITLE:=General filesystem local cache manager - DEPENDS:=+kmod-fs-netfs + DEPENDS:= KCONFIG:=\ CONFIG_FSCACHE=m \ CONFIG_FSCACHE_STATS=y \ @@ -393,21 +377,10 @@ endef $(eval $(call KernelPackage,fs-nfs)) -define KernelPackage/fs-nfs-ssc - SUBMENU:=$(FS_MENU) - TITLE:=Common NFS filesystem SSC Helper module - KCONFIG:= CONFIG_NFS_V4_2@ge5.15 - FILES:= $(LINUX_DIR)/fs/nfs_common/nfs_ssc.ko@ge5.10 - AUTOLOAD:=$(call AutoLoad,30,nfs_ssc) -endef - -$(eval $(call KernelPackage,fs-nfs-ssc)) - define KernelPackage/fs-nfs-common SUBMENU:=$(FS_MENU) TITLE:=Common NFS filesystem modules - DEPENDS:=+LINUX_5_10:kmod-fs-nfs-ssc KCONFIG:= \ CONFIG_LOCKD \ CONFIG_SUNRPC \ @@ -415,7 +388,8 @@ define KernelPackage/fs-nfs-common FILES:= \ $(LINUX_DIR)/fs/lockd/lockd.ko \ $(LINUX_DIR)/net/sunrpc/sunrpc.ko \ - $(LINUX_DIR)/fs/nfs_common/grace.ko + $(LINUX_DIR)/fs/nfs_common/grace.ko \ + $(LINUX_DIR)/fs/nfs_common/nfs_ssc.ko@eq5.10 AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd) endef @@ -442,7 +416,7 @@ define KernelPackage/fs-nfs-common-rpcsec $(LINUX_DIR)/lib/oid_registry.ko \ $(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.ko \ $(LINUX_DIR)/net/sunrpc/auth_gss/rpcsec_gss_krb5.ko - AUTOLOAD:=$(call AutoLoad,31,auth_rpcgss rpcsec_gss_krb5) + AUTOLOAD:=$(call AutoLoad,31,oid_registry auth_rpcgss rpcsec_gss_krb5) endef define KernelPackage/fs-nfs-common-rpcsec/description @@ -455,7 +429,7 @@ $(eval $(call KernelPackage,fs-nfs-common-rpcsec)) define KernelPackage/fs-nfs-v3 SUBMENU:=$(FS_MENU) TITLE:=NFS3 filesystem client support - DEPENDS:=+kmod-fs-nfs +LINUX_5_15:kmod-fs-nfs-ssc + DEPENDS:=+kmod-fs-nfs FILES:= \ $(LINUX_DIR)/fs/nfs/nfsv3.ko AUTOLOAD:=$(call AutoLoad,41,nfsv3) diff --git a/root/package/kernel/linux/modules/netfilter.mk b/root/package/kernel/linux/modules/netfilter.mk index 980d9a4d..7d185802 100755 --- a/root/package/kernel/linux/modules/netfilter.mk +++ b/root/package/kernel/linux/modules/netfilter.mk @@ -1085,7 +1085,7 @@ define KernelPackage/nft-bridge FILES:=$(foreach mod,$(NFT_BRIDGE-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_BRIDGE-m))) KCONFIG:= \ - CONFIG_NF_LOG_BRIDGE=n@lt5.13 \ + CONFIG_NF_LOG_BRIDGE=n \ $(KCONFIG_NFT_BRIDGE) endef diff --git a/root/package/kernel/linux/modules/other.mk b/root/package/kernel/linux/modules/other.mk index fafb17b9..12bf1872 100755 --- a/root/package/kernel/linux/modules/other.mk +++ b/root/package/kernel/linux/modules/other.mk @@ -912,6 +912,7 @@ $(eval $(call KernelPackage,ikconfig)) define KernelPackage/zram SUBMENU:=$(OTHER_MENU) TITLE:=ZRAM + DEPENDS:=+kmod-lib-lzo KCONFIG:= \ CONFIG_ZSMALLOC \ CONFIG_ZRAM \ @@ -928,30 +929,6 @@ define KernelPackage/zram/description Compressed RAM block device support endef -define KernelPackage/zram/config - choice - prompt "ZRAM Default compressor" - default ZRAM_DEF_COMP_LZORLE - - config ZRAM_DEF_COMP_LZORLE - bool "lzo-rle" - select PACKAGE_kmod-lib-lzo - - config ZRAM_DEF_COMP_LZO - bool "lzo" - select PACKAGE_kmod-lib-lzo - - config ZRAM_DEF_COMP_LZ4 - bool "lz4" - select PACKAGE_kmod-lib-lz4 - - config ZRAM_DEF_COMP_ZSTD - bool "zstd" - select PACKAGE_kmod-lib-zstd - - endchoice -endef - $(eval $(call KernelPackage,zram)) @@ -1029,7 +1006,7 @@ $(eval $(call KernelPackage,ptp)) define KernelPackage/ptp-qoriq SUBMENU:=$(OTHER_MENU) TITLE:=Freescale QorIQ PTP support - DEPENDS:=@(TARGET_mpc85xx||TARGET_qoriq) +kmod-ptp + DEPENDS:=@TARGET_mpc85xx +kmod-ptp KCONFIG:=CONFIG_PTP_1588_CLOCK_QORIQ FILES:=$(LINUX_DIR)/drivers/ptp/ptp-qoriq.ko AUTOLOAD:=$(call AutoProbe,ptp-qoriq) @@ -1166,8 +1143,7 @@ $(eval $(call KernelPackage,keys-trusted)) define KernelPackage/tpm SUBMENU:=$(OTHER_MENU) TITLE:=TPM Hardware Support - DEPENDS:= +kmod-random-core +(LINUX_5_15):kmod-asn1-decoder \ - +(LINUX_5_15):kmod-asn1-encoder +(LINUX_5_15):kmod-oid-registry + DEPENDS:= +kmod-random-core KCONFIG:= CONFIG_TCG_TPM FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko AUTOLOAD:=$(call AutoLoad,10,tpm,1) @@ -1294,66 +1270,3 @@ define KernelPackage/f71808e-wdt/description endef $(eval $(call KernelPackage,f71808e-wdt)) - -define KernelPackage/qcom-qmi-helpers - SUBMENU:=$(OTHER_MENU) - TITLE:=Qualcomm QMI Helpers - KCONFIG:=CONFIG_QCOM_QMI_HELPERS - FILES:=$(LINUX_DIR)/drivers/soc/qcom/qmi_helpers.ko - AUTOLOAD:=$(call AutoProbe,qmi_helpers) -endef - -define KernelPackage/qcom-qmi-helpers/description - Qualcomm QMI Helpers -endef - -$(eval $(call KernelPackage,qcom-qmi-helpers)) - -define KernelPackage/mhi - SUBMENU:=$(OTHER_MENU) - TITLE:=Modem Host Interface (MHI) bus - DEPENDS:=@LINUX_5_15 - KCONFIG:=CONFIG_MHI_BUS \ - CONFIG_MHI_BUS_DEBUG=y \ - CONFIG_MHI_BUS_PCI_GENERIC=n \ - CONFIG_MHI_NET=n - FILES:=$(LINUX_DIR)/drivers/bus/mhi/core/mhi.ko - AUTOLOAD:=$(call AutoProbe,mhi) -endef - -define KernelPackage/mhi/description - Bus driver for MHI protocol. -endef - -$(eval $(call KernelPackage,mhi)) -define KernelPackage/qcom-qmi-helpers - SUBMENU:=$(OTHER_MENU) - TITLE:=Qualcomm QMI Helpers - KCONFIG:=CONFIG_QCOM_QMI_HELPERS - FILES:=$(LINUX_DIR)/drivers/soc/qcom/qmi_helpers.ko - AUTOLOAD:=$(call AutoProbe,qmi_helpers) -endef - -define KernelPackage/qcom-qmi-helpers/description - Qualcomm QMI Helpers -endef - -$(eval $(call KernelPackage,qcom-qmi-helpers)) - -define KernelPackage/mhi - SUBMENU:=$(OTHER_MENU) - TITLE:=Modem Host Interface (MHI) bus - DEPENDS:=@LINUX_5_15 - KCONFIG:=CONFIG_MHI_BUS \ - CONFIG_MHI_BUS_DEBUG=y \ - CONFIG_MHI_BUS_PCI_GENERIC=n \ - CONFIG_MHI_NET=n - FILES:=$(LINUX_DIR)/drivers/bus/mhi/core/mhi.ko - AUTOLOAD:=$(call AutoProbe,mhi) -endef - -define KernelPackage/mhi/description - Bus driver for MHI protocol. -endef - -$(eval $(call KernelPackage,mhi))