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

Commit b74e0b9b authored by Steve Muckle's avatar Steve Muckle
Browse files

Fix modules.dep breakage with multiple module dependencies 

If a module has multiple dependencies, the current regexp for making
the dependencies absolute paths only modifies the first dependency.

Test: build sailfish with module configuration including multiple
      dependencies
Change-Id: I8f2b40c8c5ec228aa8f831086bcdd561c8714910
parent 0c3e31c6

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ define build-image-kernel-modules 
    $(hide) mkdir -p $(4)/lib/modules/0.0/$(3)lib/modules

    $(hide) cp $(1) $(4)/lib/modules/0.0/$(3)lib/modules

    $(hide) $(DEPMOD) -b $(4) 0.0

    $(hide) sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/: \(.*modules.*\)/: \/\1/g' -i $(4)/lib/modules/0.0/modules.dep

    $(hide) sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' -i $(4)/lib/modules/0.0/modules.dep

    $(hide) cp $(4)/lib/modules/0.0/modules.dep $(2)/lib/modules

endef