| Jackeagle | a76b726 | 2019-05-03 14:53:47 +0200 | [diff] [blame^] | 1 | From 5a2a16ba3c0669c148a1e500d7c153debaa5f09f Mon Sep 17 00:00:00 2001 |
| 2 | From: Jackeagle <jackeagle102@gmail.com> |
| 3 | Date: Fri, 3 May 2019 14:49:52 +0200 |
| 4 | Subject: [PATCH 13/17] Revert "kernel: Move kernel module dir cleanup/creation |
| 5 | to module install target" |
| 6 | |
| 7 | This reverts commit bfc20a2ec6d7d5d3bf90e6273e2406f5f2259508. |
| 8 | --- |
| 9 | build/tasks/kernel.mk | 6 +++--- |
| 10 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 11 | |
| 12 | diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk |
| 13 | index 6d8e2aa4..869bc7b9 100644 |
| 14 | --- a/build/tasks/kernel.mk |
| 15 | +++ b/build/tasks/kernel.mk |
| 16 | @@ -221,6 +221,9 @@ $(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT) |
| 17 | .PHONY: TARGET_KERNEL_BINARIES |
| 18 | TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG) |
| 19 | @echo "Building Kernel" |
| 20 | + $(hide) rm -rf $(KERNEL_MODULES_OUT) |
| 21 | + $(hide) mkdir -p $(KERNEL_MODULES_OUT) |
| 22 | + $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR) |
| 23 | $(PATH_OVERRIDE) $(MAKE) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(BOARD_KERNEL_IMAGE_NAME) |
| 24 | $(hide) if grep -q '^CONFIG_OF=y' $(KERNEL_CONFIG); then \ |
| 25 | echo "Building DTBs"; \ |
| 26 | @@ -233,9 +236,6 @@ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG) |
| 27 | |
| 28 | .PHONY: INSTALLED_KERNEL_MODULES |
| 29 | INSTALLED_KERNEL_MODULES: depmod-host |
| 30 | - $(hide) rm -rf $(KERNEL_MODULES_OUT) |
| 31 | - $(hide) mkdir -p $(KERNEL_MODULES_OUT) |
| 32 | - $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR) |
| 33 | $(hide) if grep -q '^CONFIG_MODULES=y' $(KERNEL_CONFIG); then \ |
| 34 | echo "Installing Kernel Modules"; \ |
| 35 | $(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 && \ |
| 36 | -- |
| 37 | 2.21.0 |
| 38 | |