| Jackeagle | a76b726 | 2019-05-03 14:53:47 +0200 | [diff] [blame] | 1 | From 185f7500ccc2876cf8bf2fe0433ae7b0f70550ce Mon Sep 17 00:00:00 2001 |
| 2 | From: Jackeagle <jackeagle102@gmail.com> |
| 3 | Date: Fri, 3 May 2019 14:49:43 +0200 |
| 4 | Subject: [PATCH 12/17] Revert "kernel: Detect kernel module usage better" |
| 5 | |
| 6 | This reverts commit fd354f2a6a73337bc89dbd77ded583617603edb0. |
| 7 | --- |
| 8 | build/tasks/kernel.mk | 4 ++-- |
| 9 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 10 | |
| 11 | diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk |
| 12 | index 5df1ec54..6d8e2aa4 100644 |
| 13 | --- a/build/tasks/kernel.mk |
| 14 | +++ b/build/tasks/kernel.mk |
| 15 | @@ -226,7 +226,7 @@ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG) |
| 16 | echo "Building DTBs"; \ |
| 17 | $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) dtbs; \ |
| 18 | fi |
| 19 | - $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \ |
| 20 | + $(hide) if grep -q '^CONFIG_MODULES=y' $(KERNEL_CONFIG); then \ |
| 21 | echo "Building Kernel Modules"; \ |
| 22 | $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) modules; \ |
| 23 | fi |
| 24 | @@ -236,7 +236,7 @@ INSTALLED_KERNEL_MODULES: depmod-host |
| 25 | $(hide) rm -rf $(KERNEL_MODULES_OUT) |
| 26 | $(hide) mkdir -p $(KERNEL_MODULES_OUT) |
| 27 | $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR) |
| 28 | - $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \ |
| 29 | + $(hide) if grep -q '^CONFIG_MODULES=y' $(KERNEL_CONFIG); then \ |
| 30 | echo "Installing Kernel Modules"; \ |
| 31 | $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) modules_install && \ |
| 32 | mofile=$$(find $(KERNEL_MODULES_OUT) -type f -name modules.order) && \ |
| 33 | -- |
| 34 | 2.21.0 |
| 35 | |