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

Commit 0d527839 authored by Steve Muckle's avatar Steve Muckle Committed by android-build-merger
Browse files

Merge "install modules.softdep from depmod output" am: 10115f54 am: b81725df am: 2b3fc786 

am: 8c2d5f18

Change-Id: If29d4785dfcb4b918d1d69a48271eeff91a12877
parents 259ce0be 8c2d5f18

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ define build-image-kernel-modules 
  $(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
@@ -669,7 +670,7 @@ endef 
# $(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)