From 9f428137b75031d5cd6a88dc9c5c2a8237acde28 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 11 Feb 2016 00:09:30 +0100 Subject: git modules: rename git submodules to avoid hierarchies Having a git module named "3rdparty" and another one in "3rdparty/chrome-ec" led to git failures when the latter was initialized before the former (because of git being stupid, but then it says so on the box, right?) Rename modules so there's no such hierarchy (3rdparty -> 3rdparty/blobs). While at it, also rename the culprit to match the path name (3rdparty/chrome-ec to 3rdparty/chromeec). git will resolve this on the next git submodule update invocation (eg. the next coreboot build). Change-Id: Ief79074d73abeefff36a47b2e58ac6b1c047e3a7 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/13675 Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index b8f28cd500..ad6b899c4e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "3rdparty"] +[submodule "3rdparty/blobs"] path = 3rdparty/blobs url = ../blobs.git update = none @@ -12,6 +12,6 @@ [submodule "arm-trusted-firmware"] path = 3rdparty/arm-trusted-firmware url = ../arm-trusted-firmware.git -[submodule "3rdparty/chrome-ec"] +[submodule "3rdparty/chromeec"] path = 3rdparty/chromeec url = ../chrome-ec.git -- cgit v1.2.3