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

Commit 7397b59c authored by Steve Muckle's avatar Steve Muckle Committed by Gerrit Code Review
Browse files

Merge changes I49e4a1a6,I668a396c 

* changes:
  fix builds on macOS when kernel modules are used
  package modules.alias onto device
parents 1385e481 fb2714e6

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -1110,8 +1110,8 @@ 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) cp $(4)/lib/modules/0.0/modules.dep $(2)/lib/modules

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

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

endef



# $(1): output file