| Jackeagle | a76b726 | 2019-05-03 14:53:47 +0200 | [diff] [blame^] | 1 | From 51c9997f5ec7f6735480441b045a129dc327416f Mon Sep 17 00:00:00 2001 |
| 2 | From: Jackeagle <jackeagle102@gmail.com> |
| 3 | Date: Fri, 3 May 2019 14:49:16 +0200 |
| 4 | Subject: [PATCH 10/17] Revert "kernel: Use build-image-kernel-modules instead |
| 5 | of copying it" |
| 6 | |
| 7 | This reverts commit dbda78c5e62807ec700be086216d5e2cbb28330f. |
| 8 | --- |
| 9 | build/tasks/kernel.mk | 29 ++++++++++++++++++++--------- |
| 10 | 1 file changed, 20 insertions(+), 9 deletions(-) |
| 11 | |
| 12 | diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk |
| 13 | index eeba2c0d..d1862031 100644 |
| 14 | --- a/build/tasks/kernel.mk |
| 15 | +++ b/build/tasks/kernel.mk |
| 16 | @@ -155,19 +155,21 @@ KERNEL_HEADERS_INSTALL_DIR := $(KERNEL_OUT)/usr |
| 17 | KERNEL_HEADERS_INSTALL_DEPS := $(KERNEL_OUT)/.headers_install_deps |
| 18 | |
| 19 | ifeq ($(NEED_KERNEL_MODULE_ROOT),true) |
| 20 | -KERNEL_MODULES_OUT := $(TARGET_ROOT_OUT) |
| 21 | +KERNEL_MODULES_INSTALL := root |
| 22 | +KERNEL_MODULES_OUT := $(TARGET_ROOT_OUT)/lib/modules |
| 23 | KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_recovery) |
| 24 | KERNEL_MODULE_MOUNTPOINT := |
| 25 | else ifeq ($(NEED_KERNEL_MODULE_SYSTEM),true) |
| 26 | -KERNEL_MODULES_OUT := $(TARGET_OUT) |
| 27 | +KERNEL_MODULES_INSTALL := $(TARGET_COPY_OUT_SYSTEM) |
| 28 | +KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules |
| 29 | KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_system) |
| 30 | KERNEL_MODULE_MOUNTPOINT := system |
| 31 | else |
| 32 | -KERNEL_MODULES_OUT := $(TARGET_OUT_VENDOR) |
| 33 | +KERNEL_MODULES_INSTALL := $(TARGET_COPY_OUT_VENDOR) |
| 34 | +KERNEL_MODULES_OUT := $(TARGET_OUT_VENDOR)/lib/modules |
| 35 | KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_vendor) |
| 36 | KERNEL_MODULE_MOUNTPOINT := vendor |
| 37 | endif |
| 38 | -MODULES_INTERMEDIATES := $(call intermediates-dir-for,PACKAGING,kernel_modules) |
| 39 | |
| 40 | ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true) |
| 41 | ifneq ($(TARGET_KERNEL_CLANG_VERSION),) |
| 42 | @@ -252,14 +254,23 @@ TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG) |
| 43 | |
| 44 | .PHONY: INSTALLED_KERNEL_MODULES |
| 45 | INSTALLED_KERNEL_MODULES: depmod-host |
| 46 | + $(hide) rm -rf $(KERNEL_MODULES_OUT) |
| 47 | + $(hide) mkdir -p $(KERNEL_MODULES_OUT) |
| 48 | + $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR) |
| 49 | $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \ |
| 50 | echo "Installing Kernel Modules"; \ |
| 51 | - $(call make-kernel-target,INSTALL_MOD_PATH=$(MODULES_INTERMEDIATES) modules_install); \ |
| 52 | - modules=$$(find $(MODULES_INTERMEDIATES) -type f -name '*.ko'); \ |
| 53 | - for f in $$modules; do \ |
| 54 | + $(call make-kernel-target,INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) modules_install) && \ |
| 55 | + mofile=$$(find $(KERNEL_MODULES_OUT) -type f -name modules.order) && \ |
| 56 | + mpath=$$(dirname $$mofile) && \ |
| 57 | + for f in $$(find $$mpath/kernel -type f -name '*.ko'); do \ |
| 58 | $(KERNEL_TOOLCHAIN_PATH)strip --strip-unneeded $$f; \ |
| 59 | - done; \ |
| 60 | - ($(call build-image-kernel-modules,$$modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT),$(KERNEL_DEPMOD_STAGING_DIR))); \ |
| 61 | + mv $$f $(KERNEL_MODULES_OUT); \ |
| 62 | + done && \ |
| 63 | + rm -rf $$mpath && \ |
| 64 | + mkdir -p $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/$(KERNEL_MODULE_MOUNTPOINT)/lib/modules && \ |
| 65 | + find $(KERNEL_MODULES_OUT) -name *.ko -exec cp {} $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/$(KERNEL_MODULE_MOUNTPOINT)/lib/modules \; && \ |
| 66 | + $(DEPMOD) -b $(KERNEL_DEPMOD_STAGING_DIR) 0.0 && \ |
| 67 | + sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/modules.dep > $(KERNEL_MODULES_OUT)/modules.dep; \ |
| 68 | fi |
| 69 | |
| 70 | $(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES |
| 71 | -- |
| 72 | 2.21.0 |
| 73 | |