From 43866407df479278eefa1f7c891dd53c9400a8ea Mon Sep 17 00:00:00 2001 From: matejcik Date: Thu, 9 May 2019 14:05:49 +0200 Subject: [PATCH] move vendored submodules to root vendor/ dir before pulling, run `git submodule deinit --all` --- .gitmodules | 17 +++++------------ core/vendor/QR-Code-generator | 2 +- core/vendor/micropython | 2 +- core/vendor/nanopb | 2 +- core/vendor/secp256k1-zkp | 2 +- legacy/vendor/QR-Code-generator | 2 +- legacy/vendor/libopencm3 | 2 +- legacy/vendor/nanopb | 2 +- vendor/QR-Code-generator | 1 + vendor/libopencm3 | 1 + vendor/micropython | 1 + vendor/nanopb | 1 + vendor/secp256k1-zkp | 1 + 13 files changed, 17 insertions(+), 19 deletions(-) mode change 160000 => 120000 core/vendor/QR-Code-generator mode change 160000 => 120000 core/vendor/micropython mode change 160000 => 120000 core/vendor/nanopb mode change 160000 => 120000 core/vendor/secp256k1-zkp mode change 160000 => 120000 legacy/vendor/QR-Code-generator mode change 160000 => 120000 legacy/vendor/libopencm3 mode change 160000 => 120000 legacy/vendor/nanopb create mode 160000 vendor/QR-Code-generator create mode 160000 vendor/libopencm3 create mode 160000 vendor/micropython create mode 160000 vendor/nanopb create mode 160000 vendor/secp256k1-zkp diff --git a/.gitmodules b/.gitmodules index d4e39156f..8d048173b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,14 +1,11 @@ [submodule "vendor/micropython"] - path = core/vendor/micropython + path = vendor/micropython url = https://github.com/trezor/micropython.git -[submodule "vendor/nanopb"] - path = core/vendor/nanopb - url = https://github.com/nanopb/nanopb.git [submodule "vendor/QR-Code-generator"] - path = core/vendor/QR-Code-generator + path = vendor/QR-Code-generator url = https://github.com/nayuki/QR-Code-generator.git [submodule "vendor/secp256k1-zkp"] - path = core/vendor/secp256k1-zkp + path = vendor/secp256k1-zkp url = https://github.com/ElementsProject/secp256k1-zkp.git branch = secp256k1-zkp [submodule "common/defs/ethereum/tokens"] @@ -18,13 +15,9 @@ path = crypto/tests/wycheproof url = https://github.com/google/wycheproof [submodule "legacy/libopencm3"] - path = legacy/vendor/libopencm3 + path = vendor/libopencm3 url = https://github.com/libopencm3/libopencm3.git [submodule "legacy/vendor/nanopb"] - path = legacy/vendor/nanopb + path = vendor/nanopb url = https://github.com/nanopb/nanopb.git ignore = untracked -[submodule "legacy/vendor/QR-Code-generator"] - path = legacy/vendor/QR-Code-generator - url = https://github.com/nayuki/QR-Code-generator.git - ignore = untracked diff --git a/core/vendor/QR-Code-generator b/core/vendor/QR-Code-generator deleted file mode 160000 index 40d24f38a..000000000 --- a/core/vendor/QR-Code-generator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 40d24f38aa0a8180b271b6c88be8633f842ed9d4 diff --git a/core/vendor/QR-Code-generator b/core/vendor/QR-Code-generator new file mode 120000 index 000000000..fc8f485f4 --- /dev/null +++ b/core/vendor/QR-Code-generator @@ -0,0 +1 @@ +../../vendor/QR-Code-generator \ No newline at end of file diff --git a/core/vendor/micropython b/core/vendor/micropython deleted file mode 160000 index c5d8107e2..000000000 --- a/core/vendor/micropython +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c5d8107e2af090ff4547851297a484652fde4242 diff --git a/core/vendor/micropython b/core/vendor/micropython new file mode 120000 index 000000000..95b37d916 --- /dev/null +++ b/core/vendor/micropython @@ -0,0 +1 @@ +../../vendor/micropython \ No newline at end of file diff --git a/core/vendor/nanopb b/core/vendor/nanopb deleted file mode 160000 index 2c4c3948a..000000000 --- a/core/vendor/nanopb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2c4c3948a9f9e2eb573706a354b89a55cb85639f diff --git a/core/vendor/nanopb b/core/vendor/nanopb new file mode 120000 index 000000000..9d5d160c5 --- /dev/null +++ b/core/vendor/nanopb @@ -0,0 +1 @@ +../../vendor/nanopb \ No newline at end of file diff --git a/core/vendor/secp256k1-zkp b/core/vendor/secp256k1-zkp deleted file mode 160000 index 1c830b4c9..000000000 --- a/core/vendor/secp256k1-zkp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c830b4c9ac30aa32e246ea3ab8ef9ef99acf664 diff --git a/core/vendor/secp256k1-zkp b/core/vendor/secp256k1-zkp new file mode 120000 index 000000000..dab3441fb --- /dev/null +++ b/core/vendor/secp256k1-zkp @@ -0,0 +1 @@ +../../vendor/secp256k1-zkp \ No newline at end of file diff --git a/legacy/vendor/QR-Code-generator b/legacy/vendor/QR-Code-generator deleted file mode 160000 index 40d24f38a..000000000 --- a/legacy/vendor/QR-Code-generator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 40d24f38aa0a8180b271b6c88be8633f842ed9d4 diff --git a/legacy/vendor/QR-Code-generator b/legacy/vendor/QR-Code-generator new file mode 120000 index 000000000..fc8f485f4 --- /dev/null +++ b/legacy/vendor/QR-Code-generator @@ -0,0 +1 @@ +../../vendor/QR-Code-generator \ No newline at end of file diff --git a/legacy/vendor/libopencm3 b/legacy/vendor/libopencm3 deleted file mode 160000 index 0fd4f74ee..000000000 --- a/legacy/vendor/libopencm3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0fd4f74ee301af5de4e9b036f391bf17c5a52f02 diff --git a/legacy/vendor/libopencm3 b/legacy/vendor/libopencm3 new file mode 120000 index 000000000..c13510b53 --- /dev/null +++ b/legacy/vendor/libopencm3 @@ -0,0 +1 @@ +../../vendor/libopencm3 \ No newline at end of file diff --git a/legacy/vendor/nanopb b/legacy/vendor/nanopb deleted file mode 160000 index 3c69a905b..000000000 --- a/legacy/vendor/nanopb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3c69a905b16df149e1bda12f25e0522073a24678 diff --git a/legacy/vendor/nanopb b/legacy/vendor/nanopb new file mode 120000 index 000000000..9d5d160c5 --- /dev/null +++ b/legacy/vendor/nanopb @@ -0,0 +1 @@ +../../vendor/nanopb \ No newline at end of file diff --git a/vendor/QR-Code-generator b/vendor/QR-Code-generator new file mode 160000 index 000000000..40d24f38a --- /dev/null +++ b/vendor/QR-Code-generator @@ -0,0 +1 @@ +Subproject commit 40d24f38aa0a8180b271b6c88be8633f842ed9d4 diff --git a/vendor/libopencm3 b/vendor/libopencm3 new file mode 160000 index 000000000..0fd4f74ee --- /dev/null +++ b/vendor/libopencm3 @@ -0,0 +1 @@ +Subproject commit 0fd4f74ee301af5de4e9b036f391bf17c5a52f02 diff --git a/vendor/micropython b/vendor/micropython new file mode 160000 index 000000000..c5d8107e2 --- /dev/null +++ b/vendor/micropython @@ -0,0 +1 @@ +Subproject commit c5d8107e2af090ff4547851297a484652fde4242 diff --git a/vendor/nanopb b/vendor/nanopb new file mode 160000 index 000000000..3c69a905b --- /dev/null +++ b/vendor/nanopb @@ -0,0 +1 @@ +Subproject commit 3c69a905b16df149e1bda12f25e0522073a24678 diff --git a/vendor/secp256k1-zkp b/vendor/secp256k1-zkp new file mode 160000 index 000000000..1c830b4c9 --- /dev/null +++ b/vendor/secp256k1-zkp @@ -0,0 +1 @@ +Subproject commit 1c830b4c9ac30aa32e246ea3ab8ef9ef99acf664