djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7763 from dhalbert/update-tinyusb-remove-usb_descriptor 

submodules: update tinyusb; remove usb_descriptor; use partial clone for submodules
This commit is contained in:
MicroDev 2023-03-22 00:11:02 +05:30 committed by GitHub
parent 7ee85408a1 ae95274b66
commit 461d833c1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -33,9 +33,6 @@
path = ports/atmel-samd/asf4 path = ports/atmel-samd/asf4
url = https://github.com/adafruit/asf4.git url = https://github.com/adafruit/asf4.git
branch = circuitpython branch = circuitpython
[submodule "tools/usb_descriptor"]
path = tools/usb_descriptor
url = https://github.com/adafruit/usb_descriptor.git
[submodule "lib/nrfutil"] [submodule "lib/nrfutil"]
path = lib/nrfutil path = lib/nrfutil
url = https://github.com/adafruit/nRF52_nrfutil url = https://github.com/adafruit/nRF52_nrfutil

9
Makefile
View File

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

2
lib/tinyusb

@ -1 +1 @@
Subproject commit ea8ecea59aa60a1028cce16b0f15bb33918b11af Subproject commit ec9c666107c0be0f8dc7c2a15e3bdea8c44a50b4

1
tools/usb_descriptor

@ -1 +0,0 @@
Subproject commit 2eaa6114b209fe7f0a795eda8d6a7b3b93d76d2e