From b7c32c98bc810b88e0391117f225658f82b44995 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 3 Sep 2015 14:54:19 +0200 Subject: [PATCH] core/pkg-kernel-module: ensure linux supports modules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When a package wants to build a kernel module, we should ensure that the kernel does support modules. This patch does it automatically for packages using the kernel-module infrastructure. Packages that do not use it will have to set it manually (to be done in a followup patch). Suggested-by: Peter Korsgaard Signed-off-by: "Yann E. MORIN" Cc: Peter Korsgaard Cc: Thomas Petazzoni Cc: Noé Rubinstein Cc: Jan Viktorin Cc: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 2 ++ package/pkg-kernel-module.mk | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 48f9c740f4..bbcc54bfd1 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -175,6 +175,8 @@ LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) define LINUX_KCONFIG_FIXUP_CMDS + $(if $(LINUX_NEEDS_MODULES), + $(call KCONFIG_ENABLE_OPT,CONFIG_MODULES,$(@D)/.config)) $(if $(BR2_arm)$(BR2_armeb), $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config)) $(if $(BR2_TARGET_ROOTFS_CPIO), diff --git a/package/pkg-kernel-module.mk b/package/pkg-kernel-module.mk index 6fb7704e32..f6730b882d 100644 --- a/package/pkg-kernel-module.mk +++ b/package/pkg-kernel-module.mk @@ -44,6 +44,11 @@ define inner-kernel-module +# If the package is enabled, ensure the kernel will support modules +ifeq ($$(BR2_PACKAGE_$(2)),y) +LINUX_NEEDS_MODULES = y +endif + # The kernel must be built first. $(2)_DEPENDENCIES += linux -- 2.30.2