aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2019-02-09 15:23:18 -0800
committerEthan Chen <intervigil@gmail.com>2019-03-09 13:41:19 -0800
commita8750b4a6ee5ade9f136988ccdc6c0a9f858000d (patch)
tree7e76459bd6f480e3e8c55e118cb32e992fb6d145
parent117a0fd3b2977316664d9ce787e2e53c24a0273e (diff)
downloadvendor_lineage-a8750b4a6ee5ade9f136988ccdc6c0a9f858000d.tar.gz
vendor_lineage-a8750b4a6ee5ade9f136988ccdc6c0a9f858000d.tar.bz2
vendor_lineage-a8750b4a6ee5ade9f136988ccdc6c0a9f858000d.zip
kernel: Move kernel module dir cleanup/creation to module install target
* The directories used by the kernel module install rules are performed as part of the rules in the kernel build itself. This is likely a leftover from before kernel module install was separated. Change-Id: Iee2f73a0f8e0f274b1c2931ba57277ff14d7f5cc
-rw-r--r--build/tasks/kernel.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 6dd06b55..fa7cb964 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -212,9 +212,6 @@ $(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT)
.PHONY: TARGET_KERNEL_BINARIES
TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
@echo "Building Kernel"
- $(hide) rm -rf $(KERNEL_MODULES_OUT)
- $(hide) mkdir -p $(KERNEL_MODULES_OUT)
- $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR)
$(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)
$(hide) if grep -q '^CONFIG_OF=y' $(KERNEL_CONFIG); then \
echo "Building DTBs"; \
@@ -227,6 +224,9 @@ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
.PHONY: INSTALLED_KERNEL_MODULES
INSTALLED_KERNEL_MODULES: depmod-host
+ $(hide) rm -rf $(KERNEL_MODULES_OUT)
+ $(hide) mkdir -p $(KERNEL_MODULES_OUT)
+ $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR)
$(hide) if grep -q '^CONFIG_MODULES=y' $(KERNEL_CONFIG); then \
echo "Installing Kernel Modules"; \
$(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 && \