From 9b45f89372cc1fb798691cf1abd7cb6807e8b200 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 20 Apr 2018 20:36:46 +0100 Subject: fix stupid regression and allow kernel modules to be built again --- mk/kernel-build.mk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'mk') diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index d53c5e8db..fb43cd930 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -6,10 +6,17 @@ include $(ADK_TOPDIR)/mk/$(ADK_TARGET_OS)-ver.mk include $(ADK_TOPDIR)/mk/$(ADK_TARGET_OS).mk include $(ADK_TOPDIR)/mk/kernel-vars.mk -ifeq ($(ADK_TARGET_KERNEL_USE_CUSTOMCONFIG),y) -KERNEL_MODULES_USED:=$(shell grep -s =m $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH)) -else -KERNEL_MODULES_USED:=$(shell grep ^ADK_$(ADK_TARGET_OS)_KERNEL $(ADK_TOPDIR)/.config|grep =m) +ifeq ($(ADK_TARGET_OS_LINUX),y) +KERNEL_MODULES_USED:=$(shell grep ^ADK_LINUX_KERNEL $(ADK_TOPDIR)/.config|grep =m) +endif +ifeq ($(ADK_TARGET_OS_WALDUX),y) +KERNEL_MODULES_USED:=$(shell grep ^ADK_WALDUX_KERNEL $(ADK_TOPDIR)/.config|grep =m) +endif +ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) +KERNEL_MODULES_USED:=$(shell grep -s =m $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH)) +endif +ifeq ($(ADK_TARGET_WALDUX_KERNEL_USE_CUSTOMCONFIG),y) +KERNEL_MODULES_USED:=$(shell grep -s =m $(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH)) endif KERNEL_FILE:=$(ADK_TARGET_KERNEL) -- cgit v1.2.3