From 4d762b6dee6c332d8a830cacce3de91489ab1d1c Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Thu, 25 Jun 2020 17:41:37 -0400
Subject: [PATCH] Add submodules (#1262)

As we start to add other build systems, we should have a way to sync the
project without depending on make. Use git submodules for this.

This also avoids an issue with branch based subrepository management
where it's not possible to recreate historical states of the project,
which necessarily includes the state of dependencies. Tracking and
recreating prior versions is the main purpose of source control.
---
 .gitignore                        |  7 -------
 .gitmodules                       | 21 +++++++++++++++++++++
 examples/common/QRCode/repo       |  1 +
 examples/common/m5stack-tft/repo  |  1 +
 third_party/mbedtls/repo          |  1 +
 third_party/nlassert/repo         |  1 +
 third_party/nlfaultinjection/repo |  1 +
 third_party/nlio/repo             |  1 +
 third_party/nlunit-test/repo      |  1 +
 9 files changed, 28 insertions(+), 7 deletions(-)
 create mode 160000 examples/common/QRCode/repo
 create mode 160000 examples/common/m5stack-tft/repo
 create mode 160000 third_party/mbedtls/repo
 create mode 160000 third_party/nlassert/repo
 create mode 160000 third_party/nlfaultinjection/repo
 create mode 160000 third_party/nlio/repo
 create mode 160000 third_party/nlunit-test/repo

diff --git a/.gitignore b/.gitignore
index d572189d64957a..07baa7429886fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,13 +22,6 @@ src/include/BuildConfig.h.in~
 
 # Repos stuff
 .repos-warning-stamp
-third_party/nlassert/
-third_party/nlfaultinjection/
-third_party/nlio/
-third_party/nlunit-test/
-third_party/mbedtls/
-examples/common/m5stack-tft/
-examples/common/QRCode/repo/
 
 # Example specific rules
 examples/**/sdkconfig
diff --git a/.gitmodules b/.gitmodules
index e69de29bb2d1d6..1fc30391540dea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,21 @@
+[submodule "third_party/nlunit-test/repo"]
+	path = third_party/nlunit-test/repo
+	url = https://github.com/nestlabs/nlunit-test.git
+[submodule "third_party/nlio/repo"]
+	path = third_party/nlio/repo
+	url = https://github.com/nestlabs/nlio.git
+[submodule "third_party/nlfaultinjection/repo"]
+	path = third_party/nlfaultinjection/repo
+	url = https://github.com/nestlabs/nlfaultinjection.git
+[submodule "third_party/nlassert/repo"]
+	path = third_party/nlassert/repo
+	url = https://github.com/nestlabs/nlassert.git
+[submodule "third_party/mbedtls/repo"]
+	path = third_party/mbedtls/repo
+	url = https://github.com/ARMmbed/mbedtls.git
+[submodule "examples/common/QRCode/repo"]
+	path = examples/common/QRCode/repo
+	url = https://github.com/nayuki/QR-Code-generator.git
+[submodule "examples/common/m5stack-tft/repo"]
+	path = examples/common/m5stack-tft/repo
+	url = https://github.com/jeremyjh/ESP32_TFT_library.git
diff --git a/examples/common/QRCode/repo b/examples/common/QRCode/repo
new file mode 160000
index 00000000000000..08ac806145aa6a
--- /dev/null
+++ b/examples/common/QRCode/repo
@@ -0,0 +1 @@
+Subproject commit 08ac806145aa6ab5d3e9df61d023092bb6cfe761
diff --git a/examples/common/m5stack-tft/repo b/examples/common/m5stack-tft/repo
new file mode 160000
index 00000000000000..3a841faacb218d
--- /dev/null
+++ b/examples/common/m5stack-tft/repo
@@ -0,0 +1 @@
+Subproject commit 3a841faacb218dbdba2f54edb251d3a64d9833fb
diff --git a/third_party/mbedtls/repo b/third_party/mbedtls/repo
new file mode 160000
index 00000000000000..ca933c7e0c9e84
--- /dev/null
+++ b/third_party/mbedtls/repo
@@ -0,0 +1 @@
+Subproject commit ca933c7e0c9e84738b168b6b0feb89af4183a60a
diff --git a/third_party/nlassert/repo b/third_party/nlassert/repo
new file mode 160000
index 00000000000000..bd2f082102d445
--- /dev/null
+++ b/third_party/nlassert/repo
@@ -0,0 +1 @@
+Subproject commit bd2f082102d4456ca750189ee853fa8c7443af59
diff --git a/third_party/nlfaultinjection/repo b/third_party/nlfaultinjection/repo
new file mode 160000
index 00000000000000..79f92f309de58c
--- /dev/null
+++ b/third_party/nlfaultinjection/repo
@@ -0,0 +1 @@
+Subproject commit 79f92f309de58c4591f53a9b492600550b473c84
diff --git a/third_party/nlio/repo b/third_party/nlio/repo
new file mode 160000
index 00000000000000..dbb78fb4f188bb
--- /dev/null
+++ b/third_party/nlio/repo
@@ -0,0 +1 @@
+Subproject commit dbb78fb4f188bb09ba51626341e1dffa636aa0da
diff --git a/third_party/nlunit-test/repo b/third_party/nlunit-test/repo
new file mode 160000
index 00000000000000..ef5a2b9a8b71ad
--- /dev/null
+++ b/third_party/nlunit-test/repo
@@ -0,0 +1 @@
+Subproject commit ef5a2b9a8b71ad592fcf3681968fd63c844e3d81