From: Sungbo Eo Date: Fri, 6 Dec 2019 13:49:16 +0000 (+0900) Subject: kernel: remove LINUX_4_9 dependency of kmod-dax X-Git-Tag: v19.07.0~44 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7203a58d7b5102c0c401ac81a5fa85d8dca64dc6;p=oweals%2Fopenwrt.git kernel: remove LINUX_4_9 dependency of kmod-dax This patch resolves recursive dependency warning on a feed package: $ make defconfig Collecting package info: done tmp/.config-package.in:104721:error: recursive dependency detected! For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" tmp/.config-package.in:104721:symbol PACKAGE_nfs-kernel-server depends on NFS_KERNEL_SERVER_V4 For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" feeds/packages/net/nfs-kernel-server/Config.in:4:symbol NFS_KERNEL_SERVER_V4 depends on PACKAGE_nfs-kernel-server # # configuration written to .config # 19.07 branch uses kernel 4.14 only, so CONFIG_LINUX_4_9 symbol is not needed anyway. Ref: https://github.com/openwrt/packages/issues/10490 Signed-off-by: Sungbo Eo --- diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index 3bc607c12e..f7fc532599 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -209,7 +209,6 @@ $(eval $(call KernelPackage,block2mtd)) define KernelPackage/dax SUBMENU:=$(BLOCK_MENU) TITLE:=DAX: direct access to differentiated memory - DEPENDS:=@!LINUX_4_9 KCONFIG:=CONFIG_DAX FILES:=$(LINUX_DIR)/drivers/dax/dax.ko endef @@ -220,7 +219,7 @@ $(eval $(call KernelPackage,dax)) define KernelPackage/dm SUBMENU:=$(BLOCK_MENU) TITLE:=Device Mapper - DEPENDS:=+kmod-crypto-manager +!LINUX_4_9:kmod-dax + DEPENDS:=+kmod-crypto-manager +kmod-dax # All the "=n" are unnecessary, they're only there # to stop the config from asking the question. # MIRROR is M because I've needed it for pvmove.