298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 14:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

modules: fix nls.mk support for linux 6.6

Browse Source
This commit is contained in:
coolsnowwolf 2024-01-25 20:00:54 +08:00
parent 9745339664
commit 6022ecc6bc
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
package/kernel/linux/modules/fs.mk
View File

@ -10,7 +10,7 @@ FS_MENU:=Filesystems
define KernelPackage/fs-9p define KernelPackage/fs-9p
SUBMENU:=$(FS_MENU) SUBMENU:=$(FS_MENU)
TITLE:=Plan 9 Resource Sharing Support TITLE:=Plan 9 Resource Sharing Support
DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs +LINUX_6_6:kmod-fs-netfs
KCONFIG:=\ KCONFIG:=\
CONFIG_9P_FS \ CONFIG_9P_FS \
CONFIG_9P_FS_POSIX_ACL=n \ CONFIG_9P_FS_POSIX_ACL=n \
@ -91,6 +91,7 @@ define KernelPackage/fs-smbfs-common
CONFIG_SMBFS_COMMON@lt6.1 \ CONFIG_SMBFS_COMMON@lt6.1 \
CONFIG_SMBFS@ge6.1 CONFIG_SMBFS@ge6.1
DEPENDS:= \ DEPENDS:= \
+LINUX_6_6:kmod-fs-netfs +LINUX_6_6:kmod-nls-ucs2-utils \
+(LINUX_5_4||LINUX_5_10):kmod-crypto-arc4 \ +(LINUX_5_4||LINUX_5_10):kmod-crypto-arc4 \
+(LINUX_5_4||LINUX_5_10):kmod-crypto-md4 +(LINUX_5_4||LINUX_5_10):kmod-crypto-md4
FILES:= \ FILES:= \
@ -349,6 +350,7 @@ define KernelPackage/fs-jfs
FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko
AUTOLOAD:=$(call AutoLoad,30,jfs,1) AUTOLOAD:=$(call AutoLoad,30,jfs,1)
$(call AddDepends/nls) $(call AddDepends/nls)
DEPENDS:=+LINUX_6_6:kmod-nls-ucs2-utils
endef endef
define KernelPackage/fs-jfs/description define KernelPackage/fs-jfs/description
@ -683,3 +685,24 @@ define KernelPackage/fuse/description
endef endef
$(eval $(call KernelPackage,fuse)) $(eval $(call KernelPackage,fuse))
define KernelPackage/pstore
SUBMENU:=$(FS_MENU)
TITLE:=Pstore file system
DEFAULT:=m if ALL_KMODS
KCONFIG:= \
CONFIG_PSTORE \
CONFIG_PSTORE_COMPRESS=y \
CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" \
CONFIG_PSTORE_DEFLATE_COMPRESS=y \
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
FILES:= $(LINUX_DIR)/fs/pstore/pstore.ko
AUTOLOAD:=$(call AutoLoad,30,pstore,1)
DEPENDS:=+LINUX_6_6:kmod-lib-zlib-deflate +LINUX_6_6:kmod-lib-zlib-inflate
endef
define KernelPackage/pstore/description
Kernel module for pstore filesystem support
endef
$(eval $(call KernelPackage,pstore))

16
package/kernel/linux/modules/nls.mk
View File

@ -339,3 +339,19 @@ define KernelPackage/nls-utf8/description
endef endef
$(eval $(call KernelPackage,nls-utf8)) $(eval $(call KernelPackage,nls-utf8))
define KernelPackage/nls-ucs2-utils
SUBMENU:=Native Language Support
TITLE:=UCS-2 common library
DEPENDS+=@LINUX_6_6
HIDDEN:=1
KCONFIG:=CONFIG_NLS_UCS2_UTILS
FILES:=$(LINUX_DIR)/fs/nls/nls_ucs2_utils.ko
$(call AddDepends/nls)
endef
define KernelPackage/nls-ucs2-utils/description
UCS-2 common library
endef
$(eval $(call KernelPackage,nls-ucs2-utils))