kernel: Import function to install kernel modules from Q
* The new refactored function doesn't work with shell expanded
variables, like our $$modules.
* This is the _easy_ fix.
A proper fix would imply generating the module list into a make variable
from the shell variable, but with kati that looks unfeasable (to me...)
Change-Id: I8198c62fa93ad94d4b9bf7175fe5eea452c243ea
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 983ffb7..fbfc50b 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -240,6 +240,23 @@
$(call internal-make-kernel-target,$(DTB_OUT),$(1))
endef
+# $(1): modules list
+# $(2): output dir
+# $(3): mount point
+# $(4): staging dir
+# Depmod requires a well-formed kernel version so 0.0 is used as a placeholder.
+define build-image-kernel-modules-lineage
+ rm -rf $(2)/lib/modules
+ mkdir -p $(2)/lib/modules
+ cp $(1) $(2)/lib/modules/
+ rm -rf $(4)
+ mkdir -p $(4)/lib/modules/0.0/$(3)lib/modules
+ cp $(1) $(4)/lib/modules/0.0/$(3)lib/modules
+ $(DEPMOD) -b $(4) 0.0
+ sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(4)/lib/modules/0.0/modules.dep > $(2)/lib/modules/modules.dep
+ cp $(4)/lib/modules/0.0/modules.alias $(2)/lib/modules
+endef
+
$(KERNEL_OUT):
mkdir -p $(KERNEL_OUT)
@@ -280,7 +297,7 @@
$(eval p := $(subst :,$(space),$(s))) \
; mv $$(find $$kernel_modules_dir -name $(word 1,$(p))) $$kernel_modules_dir/$(word 2,$(p))); \
modules=$$(find $$kernel_modules_dir -type f -name '*.ko'); \
- ($(call build-image-kernel-modules,$$modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR))); \
+ ($(call build-image-kernel-modules-lineage,$$modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR))); \
fi
.PHONY: kerneltags