commit 73461abd0c02f46e688fb41f74648b0c1d4be809
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 28 01:11:38 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 28 01:11:39 2017 +0000
tree 65885174eacf9b4e35ed53b619f487202ddc6283
parent 058e2f7b195884fca2b85ee925fc30f142948d4f
parent b74e0b9b0d3e970bee938010131e365f5d3b3ae9

Merge "Fix modules.dep breakage with multiple module dependencies"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 5cd2fe4..7de340f 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1043,7 +1043,7 @@
     $(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