Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5b993ba authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add missing custom kernel module targets"

parents d6dc4a1d 3ec61b47

core/tasks/tools/build_custom_image.mk

+5 −3
Original line number Diff line number Diff line
@@ -57,13 +57,15 @@ $(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),$(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)

$(foreach kmod,\

  $(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



# Collect CUSTOM_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 src := $(word 1,$(pair)))\

  $(eval my_image_copy_files += $(src))\