StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add missing custom kernel module targets" am: d5b993bac7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1809997

Change-Id: Iddab1746a6116a0af17c6baa5c064fd7f0d63296
This commit is contained in:
Treehugger Robot
2021-08-27 19:50:01 +00:00
committed by Automerger Merge Worker
parent d64f3cd203 d5b993bac7
commit cefd2a4a97
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/tasks/tools/build_custom_image.mk
View File

@@ -57,13 +57,15 @@ $(foreach m,$(CUSTOM_IMAGE_MODULES),\
my_kernel_module_copy_files := my_kernel_module_copy_files :=
my_custom_image_modules_var := BOARD_$(strip $(call to-upper,$(my_custom_image_name)))_KERNEL_MODULES my_custom_image_modules_var := BOARD_$(strip $(call to-upper,$(my_custom_image_name)))_KERNEL_MODULES
ifdef $(my_custom_image_modules_var) ifdef $(my_custom_image_modules_var)
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)) $(foreach kmod,\
my_copy_pairs += $(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)),\
$(eval pair := $(subst :,$(space),$(kmod)))\
$(eval my_kernel_module_copy_files += $(word 1,$(pair)):$(subst $(my_staging_dir)/,,$(word 2,$(pair)))))
endif endif
# Collect CUSTOM_IMAGE_COPY_FILES. # Collect CUSTOM_IMAGE_COPY_FILES.
my_image_copy_files := my_image_copy_files :=
$(foreach f,$(CUSTOM_IMAGE_COPY_FILES),\ $(foreach f,$(CUSTOM_IMAGE_COPY_FILES) $(my_kernel_module_copy_files),\
$(eval pair := $(subst :,$(space),$(f)))\ $(eval pair := $(subst :,$(space),$(f)))\
$(eval src := $(word 1,$(pair)))\ $(eval src := $(word 1,$(pair)))\
$(eval my_image_copy_files += $(src))\ $(eval my_image_copy_files += $(src))\