From 1024d6a17fa2badd43c6ed07abfeddd3d08d60f5 Mon Sep 17 00:00:00 2001 From: Mark-PK Tsai Date: Mon, 9 Aug 2021 13:39:20 +0800 Subject: [PATCH] Fix kernel module build of custom image Correct the build-image-kernel-modules arguments then the board can use BOARD_{CUSTOM_IMAGE}_KERNEL_MODULES to install kernel modules. Bug: 195888474 Change-Id: I65124acc470e7f6f701bf3c9f5481bb2d688d555 Signed-off-by: Mark-PK Tsai --- core/tasks/tools/build_custom_image.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/tasks/tools/build_custom_image.mk b/core/tasks/tools/build_custom_image.mk index 4721591cf3..8b766aefd8 100644 --- a/core/tasks/tools/build_custom_image.mk +++ b/core/tasks/tools/build_custom_image.mk @@ -57,12 +57,13 @@ $(foreach m,$(CUSTOM_IMAGE_MODULES),\ my_kernel_module_copy_files := my_custom_image_modules_var := BOARD_$(strip $(call to-upper,$(my_custom_image_name)))_KERNEL_MODULES ifdef $(my_custom_image_modules_var) - my_kernel_module_copy_files += $(call build-image-kernel-modules,$(my_custom_image_modules_var),$(my_staging_dir),$(my_custom_image_name)/,$(call intermediates-dir-for,PACKAGING,depmod_$(my_custom_image_name))) + my_kernel_module_copy_files += $(call build-image-kernel-modules,$($(my_custom_image_modules_var)),$(my_staging_dir),$(CUSTOM_IMAGE_MOUNT_POINT),$(call intermediates-dir-for,PACKAGING,depmod_$(my_custom_image_name)),$($(my_custom_image_modules_var)),modules.load,,$(call intermediates-dir-for,PACKAGING,depmod_$(my_custom_image_name)_stripped)) + my_copy_pairs += $(my_kernel_module_copy_files) endif # Collect CUSTOM_IMAGE_COPY_FILES. my_image_copy_files := -$(foreach f,$(CUSTOM_IMAGE_COPY_FILES) $(my_kernel_module_copy_files),\ +$(foreach f,$(CUSTOM_IMAGE_COPY_FILES),\ $(eval pair := $(subst :,$(space),$(f)))\ $(eval src := $(word 1,$(pair)))\ $(eval my_image_copy_files += $(src))\