From f7a68458b42d30ae4bb03f0be66cfd4cfae9602d Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 11 Mar 2024 23:23:23 +0000 Subject: [PATCH] kernel: modules: don't override NLS dependencies Recent changes for Linux 6.6 broke things when building with older kernels: Package kmod-fs-jfs is missing dependencies for the following libraries: nls_base.ko Fix this by adding NLS dependencies after the added dependency applying on Linux 6.6. Fixes: f9198480da ("kernel: modules: fs: adapt for kernel 6.6") Signed-off-by: Daniel Golle --- package/kernel/linux/modules/fs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 8f1ed41484..0d98c5a681 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -344,8 +344,8 @@ define KernelPackage/fs-jfs KCONFIG:=CONFIG_JFS_FS FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko AUTOLOAD:=$(call AutoLoad,30,jfs,1) - $(call AddDepends/nls) DEPENDS:=+LINUX_6_6:kmod-nls-ucs2-utils + $(call AddDepends/nls) endef define KernelPackage/fs-jfs/description