summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
m---------KiCAD-libs0
m---------fw/hid-dials/upstream/cmsis-core0
-rw-r--r--submodule-cache.py15
4 files changed, 3 insertions, 16 deletions
diff --git a/.gitmodules b/.gitmodules
index a17c4ac..298c4f3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,7 @@
[submodule "KiCAD-libs"]
path = KiCAD-libs
url = git@github.com:Jan--Henrik/KiCAD-libs.git
+ noref = true
[submodule "fw/hid-dials/upstream/st-usb-device"]
path = fw/hid-dials/upstream/st-usb-device
url = https://github.com/STMicroelectronics/stm32_mw_usb_device
@@ -12,4 +13,5 @@
url = https://github.com/STMicroelectronics/cmsis_device_f0
[submodule "fw/hid-dials/upstream/cmsis-core"]
path = fw/hid-dials/upstream/cmsis-core
- url = https://github.com/STMicroelectronics/cmsis_core
+ url = https://git.jaseg.de/straumli/pub/st-cmsis-core-lowfat.git
+ branch = master-subtree-include
diff --git a/KiCAD-libs b/KiCAD-libs
-Subproject f0fc4b1219243143b722bb6ae9a1cd757c805d5
+Subproject 63265020429ce78dfc09df887e27c70b6b048ed
diff --git a/fw/hid-dials/upstream/cmsis-core b/fw/hid-dials/upstream/cmsis-core
-Subproject 96d6da4e252b06dcfdc041e7df23e86161c3300
+Subproject 84a7bf753760ad7442d8762d2780560e6a734d9
diff --git a/submodule-cache.py b/submodule-cache.py
index 5a0b9b9..b1b2c18 100644
--- a/submodule-cache.py
+++ b/submodule-cache.py
@@ -58,16 +58,6 @@ def get_global_cachedir(create=False, verbose=False):
os.makedirs(le_path, exist_ok=True)
return le_path
-def splitdir_run(repo, spec):
- source_branch, target_branch, prefix = spec.split(':')
- with tempfile.TemporaryDirectory(prefix='sm-split-') as tmpdir:
- try:
- # --force to prevent errors for existing checkouts
- subprocess.run('git worktree add --force'.split() + [tmpdir, source_branch], check=True, cwd=repo)
- subprocess.run('git subtree split'.split() + ['-b', target_branch, '--prefix', prefix], check=True, cwd=tmpdir)
- finally:
- subprocess.run('git worktree remove'.split() + [tmpdir], check=True, cwd=repo)
-
if __name__ == '__main__':
import argparse
parser = argparse.ArgumentParser()
@@ -83,8 +73,6 @@ if __name__ == '__main__':
for cfg_id, (url, le_path) in list_submodules().items():
short_id = cfg_id.split('/')[-1]
refdir = path.join(cachedir, short_id)
- branch = get_submodule_prop(cfg_id, 'branch')
- splitdir = get_submodule_prop(cfg_id, 'splitdir')
if not path.isdir(refdir):
print(f'Submodule {short_id} is not cached. Cloning from {url}...')
subprocess.run('git clone --bare'.split() + quiet_opts + [url, refdir], check=True)
@@ -100,9 +88,6 @@ if __name__ == '__main__':
subprocess.run('git fetch'.split() + force_opts, cwd=refdir, check=True)
- if splitdir:
- splitdir_run(refdir, splitdir)
-
print(f'Checking out submodule {short_id}...')
subprocess.run('git submodule update --init --reference'.split() + [refdir, le_path])