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

Merge "Fix kernel module build of custom image"

Browse Source
This commit is contained in:
Treehugger Robot
2021-08-18 21:22:05 +00:00
committed by Gerrit Code Review
parent f00fbb4ae4 1024d6a17f
commit bb0d6a42d8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,12 +57,13 @@ $(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),$(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 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) $(my_kernel_module_copy_files),\ $(foreach f,$(CUSTOM_IMAGE_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))\