domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: remove LINUX_4_9 dependency of kmod-dax

Browse Source 
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 <mans0n@gorani.run>
This commit is contained in:
Sungbo Eo
2019-12-06 22:49:16 +09:00
committed by Hauke Mehrtens
parent 0c07224b5a
commit 7203a58d7b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package/kernel/linux/modules/block.mk
View File

@@ -209,7 +209,6 @@ $(eval $(call KernelPackage,block2mtd))
define KernelPackage/dax define KernelPackage/dax
SUBMENU:=$(BLOCK_MENU) SUBMENU:=$(BLOCK_MENU)
TITLE:=DAX: direct access to differentiated memory TITLE:=DAX: direct access to differentiated memory
DEPENDS:=@!LINUX_4_9
KCONFIG:=CONFIG_DAX KCONFIG:=CONFIG_DAX
FILES:=$(LINUX_DIR)/drivers/dax/dax.ko FILES:=$(LINUX_DIR)/drivers/dax/dax.ko
endef endef
@@ -220,7 +219,7 @@ $(eval $(call KernelPackage,dax))
define KernelPackage/dm define KernelPackage/dm
SUBMENU:=$(BLOCK_MENU) SUBMENU:=$(BLOCK_MENU)
TITLE:=Device Mapper 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 # All the "=n" are unnecessary, they're only there
# to stop the config from asking the question. # to stop the config from asking the question.
# MIRROR is M because I've needed it for pvmove. # MIRROR is M because I've needed it for pvmove.