From 5471bac7483d0c315830b38ae252de3cd47c1853 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 10 Dec 2015 19:53:13 +0100 Subject: [PATCH] linux: add blind kconfig option to require kernel modules Currently, packages that need the kernel to have support for laodable modules have two ways to require it: - either the use the kernel-module infra, which does it automatically, - or they do not use it, and they need to require it manually by setting the corresponding Makefile variable; however, they must only set it when they are actually enabled, which makes for a slightly cumbersome and ugly code, like: ifeq ($(BR2_PACKAGE_FOO),y) LINUX_NEEDS_MODULES = y endif Introduce a new blind Kconfig option that packages can select to signify they need kernel modules. That Kconfig option is then used to set the Makefile variable. It makes it cleaner: - code is simpler (one Kconfig line instead of a Makefile if-block, - this is handled at the Kconfig level, which is where we usually handle such dependencies. Packages will be updated in follow-up commits. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- linux/Config.in | 6 ++++++ linux/linux.mk | 3 +++ 2 files changed, 9 insertions(+) diff --git a/linux/Config.in b/linux/Config.in index 8faf1c8462..4e2db473f0 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -8,6 +8,12 @@ config BR2_LINUX_KERNEL if BR2_LINUX_KERNEL +# Packages that need to have a kernel with support for loadable modules, +# but do not use the kernel-modules infrastructure, should select that +# option. +config BR2_LINUX_NEEDS_MODULES + bool + # # Version selection. We provide the choice between: # diff --git a/linux/linux.mk b/linux/linux.mk index 69a09aa206..045294b2ca 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -196,6 +196,9 @@ LINUX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_ LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) +# If no package has yet set it, set it from the Kconfig option +LINUX_NEEDS_MODULES ?= $(BR2_LINUX_NEEDS_MODULES) + define LINUX_KCONFIG_FIXUP_CMDS $(if $(LINUX_NEEDS_MODULES), $(call KCONFIG_ENABLE_OPT,CONFIG_MODULES,$(@D)/.config)) -- 2.30.2