Skip to content

Commit 461d833

Browse files
authored
Merge pull request #7763 from dhalbert/update-tinyusb-remove-usb_descriptor
submodules: update tinyusb; remove usb_descriptor; use partial clone for submodules
2 parents 7ee8540 + ae95274 commit 461d833

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
path = ports/atmel-samd/asf4
3434
url = https://github.com/adafruit/asf4.git
3535
branch = circuitpython
36-
[submodule "tools/usb_descriptor"]
37-
path = tools/usb_descriptor
38-
url = https://github.com/adafruit/usb_descriptor.git
3936
[submodule "lib/nrfutil"]
4037
path = lib/nrfutil
4138
url = https://github.com/adafruit/nRF52_nrfutil

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,9 @@ clean-stm:
324324
$(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean
325325

326326

327-
# This update will fail because the commits we need aren't the latest on the
328-
# branch. We can ignore that though because we fix it with the second command.
329-
# (Only works for git servers that allow sha fetches.)
327+
# Do blobless partial clones of submodules to save time and space.
328+
# A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.)
329+
# so it does not have the idiosyncrasies of a shallow clone.
330330
.PHONY: fetch-submodules
331331
fetch-submodules:
332-
git submodule update --init -N --depth 1 || true
333-
git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1'
332+
git submodule update --init --filter=blob:none

lib/tinyusb

Submodule tinyusb updated 758 files

tools/usb_descriptor

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)