commit 10115f54b90ed8ce13ac4a3d898679db122aa204
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 12 22:20:22 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 12 22:20:22 2019 +0000
tree d3744f6a3bb429a53085ba0f4296347c69f4629a
parent 858fa0842751bbac86d38e833d75e9a673d41662
parent 0f7bb1b84b8ed069ae81eabf2284d9d9bd3a778e

Merge "install modules.softdep from depmod output"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 78f510f..257bf95 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -659,6 +659,7 @@
   $(eval $(call build-image-kernel-modules-depmod,$(1),$(3),$(4),$(5),$(6))) \
   $(4)/$(DEPMOD_STAGING_SUBDIR)/modules.dep:$(2)/lib/modules/modules.dep \
   $(4)/$(DEPMOD_STAGING_SUBDIR)/modules.alias:$(2)/lib/modules/modules.alias \
+  $(4)/$(DEPMOD_STAGING_SUBDIR)/modules.softdep:$(2)/lib/modules/modules.softdep \
   $(4)/$(DEPMOD_STAGING_SUBDIR)/$(6):$(2)/lib/modules/$(6)
 endef
 
@@ -668,7 +669,7 @@
 # $(4): module load list
 # $(5): module load list filename
 define build-image-kernel-modules-depmod
-$(3)/$(DEPMOD_STAGING_SUBDIR)/modules.dep: .KATI_IMPLICIT_OUTPUTS := $(3)/$(DEPMOD_STAGING_SUBDIR)/modules.alias $(3)/$(DEPMOD_STAGING_SUBDIR)/$(5)
+$(3)/$(DEPMOD_STAGING_SUBDIR)/modules.dep: .KATI_IMPLICIT_OUTPUTS := $(3)/$(DEPMOD_STAGING_SUBDIR)/modules.alias $(3)/$(DEPMOD_STAGING_SUBDIR)/modules.softdep $(3)/$(DEPMOD_STAGING_SUBDIR)/$(5)
 $(3)/$(DEPMOD_STAGING_SUBDIR)/modules.dep: $(DEPMOD)
 $(3)/$(DEPMOD_STAGING_SUBDIR)/modules.dep: PRIVATE_MODULES := $(1)
 $(3)/$(DEPMOD_STAGING_SUBDIR)/modules.dep: PRIVATE_MOUNT_POINT := $(2)