[openwrt/openwrt] kernel: modules: don't override NLS dependencies

LEDE Commits lede-commits at lists.infradead.org
Mon Mar 11 16:50:23 PDT 2024


dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/f7a68458b42d30ae4bb03f0be66cfd4cfae9602d

commit f7a68458b42d30ae4bb03f0be66cfd4cfae9602d
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Mon Mar 11 23:23:23 2024 +0000

    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 <daniel at makrotopia.org>
---
 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




More information about the lede-commits mailing list