diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2016-02-11 00:09:30 +0100 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2016-02-11 20:55:55 +0100 |
| commit | 9f428137b75031d5cd6a88dc9c5c2a8237acde28 (patch) | |
| tree | 78b61f14adf99415baeae0376bdd680d32c5cd73 | |
| parent | 1509c908aa14f591ef21cf9c38f97094b4a14c4d (diff) | |
| download | coreboot-9f428137b75031d5cd6a88dc9c5c2a8237acde28.tar.xz | |
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 <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/13675
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
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 |