Merge pull request #73 from sifive/fix-git-with-branch

Improve CUSTOM_COMMIT and speed up git clone
sifive · Jan 8, 2021 · 99439a2 · 99439a2
2 parents 704b89a + 6518ffe
commit 99439a2
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 18 deletions.
diff --git a/modules/freedom-binutils-metal.mk b/modules/freedom-binutils-metal.mk
@@ -21,8 +21,7 @@ $(SRCPATH_FREEDOM_BINUTILS_METAL).$(FREEDOM_BINUTILS_METAL_COMMIT):
 	mkdir -p $(dir $@)
 	rm -rf $(SRCPATH_FREEDOM_BINUTILS_METAL)
 	rm -rf $(SRCPATH_FREEDOM_BINUTILS_METAL).*
-	git clone $(FREEDOM_BINUTILS_METAL_GITURL) $(SRCPATH_FREEDOM_BINUTILS_METAL)
-	cd $(SRCPATH_FREEDOM_BINUTILS_METAL) && git checkout --detach $(FREEDOM_BINUTILS_METAL_COMMIT)
+	git clone $(FREEDOM_BINUTILS_METAL_GITURL) $(SRCPATH_FREEDOM_BINUTILS_METAL) --single-branch -b $(FREEDOM_BINUTILS_METAL_COMMIT)
 	cd $(SRCPATH_FREEDOM_BINUTILS_METAL) && git submodule update --init --recursive
 	date > $@
 

diff --git a/modules/freedom-gcc-metal.mk b/modules/freedom-gcc-metal.mk
@@ -21,8 +21,7 @@ $(SRCPATH_FREEDOM_GCC_METAL).$(FREEDOM_GCC_METAL_COMMIT):
 	mkdir -p $(dir $@)
 	rm -rf $(SRCPATH_FREEDOM_GCC_METAL)
 	rm -rf $(SRCPATH_FREEDOM_GCC_METAL).*
-	git clone $(FREEDOM_GCC_METAL_GITURL) $(SRCPATH_FREEDOM_GCC_METAL)
-	cd $(SRCPATH_FREEDOM_GCC_METAL) && git checkout --detach $(FREEDOM_GCC_METAL_COMMIT)
+	git clone $(FREEDOM_GCC_METAL_GITURL) $(SRCPATH_FREEDOM_GCC_METAL) --single-branch -b $(FREEDOM_GCC_METAL_COMMIT)
 	cd $(SRCPATH_FREEDOM_GCC_METAL) && git submodule update --init --recursive
 	date > $@
 

diff --git a/modules/freedom-gdb-metal.mk b/modules/freedom-gdb-metal.mk
@@ -21,8 +21,7 @@ $(SRCPATH_FREEDOM_GDB_METAL).$(FREEDOM_GDB_METAL_COMMIT):
 	mkdir -p $(dir $@)
 	rm -rf $(SRCPATH_FREEDOM_GDB_METAL)
 	rm -rf $(SRCPATH_FREEDOM_GDB_METAL).*
-	git clone $(FREEDOM_GDB_METAL_GITURL) $(SRCPATH_FREEDOM_GDB_METAL)
-	cd $(SRCPATH_FREEDOM_GDB_METAL) && git checkout --detach $(FREEDOM_GDB_METAL_COMMIT)
+	git clone $(FREEDOM_GDB_METAL_GITURL) $(SRCPATH_FREEDOM_GDB_METAL) --single-branch -b $(FREEDOM_GDB_METAL_COMMIT)
 	cd $(SRCPATH_FREEDOM_GDB_METAL) && git submodule update --init --recursive
 	date > $@
 

diff --git a/modules/freedom-openocd.mk b/modules/freedom-openocd.mk
@@ -16,8 +16,7 @@ $(SRCPATH_FREEDOM_OPENOCD).$(FREEDOM_OPENOCD_COMMIT):
 	mkdir -p $(dir $@)
 	rm -rf $(SRCPATH_FREEDOM_OPENOCD)
 	rm -rf $(SRCPATH_FREEDOM_OPENOCD).*
-	git clone $(FREEDOM_OPENOCD_GITURL) $(SRCPATH_FREEDOM_OPENOCD)
-	cd $(SRCPATH_FREEDOM_OPENOCD) && git checkout --detach $(FREEDOM_OPENOCD_COMMIT)
+	git clone $(FREEDOM_OPENOCD_GITURL) $(SRCPATH_FREEDOM_OPENOCD) --single-branch -b $(FREEDOM_OPENOCD_COMMIT)
 	cd $(SRCPATH_FREEDOM_OPENOCD) && git submodule update --init --recursive
 	date > $@
 

diff --git a/modules/freedom-qemu.mk b/modules/freedom-qemu.mk
@@ -16,8 +16,7 @@ $(SRCPATH_FREEDOM_QEMU).$(FREEDOM_QEMU_COMMIT):
 	mkdir -p $(dir $@)
 	rm -rf $(SRCPATH_FREEDOM_QEMU)
 	rm -rf $(SRCPATH_FREEDOM_QEMU).*
-	git clone $(FREEDOM_QEMU_GITURL) $(SRCPATH_FREEDOM_QEMU)
-	cd $(SRCPATH_FREEDOM_QEMU) && git checkout --detach $(FREEDOM_QEMU_COMMIT)
+	git clone $(FREEDOM_QEMU_GITURL) $(SRCPATH_FREEDOM_QEMU) --single-branch -b $(FREEDOM_QEMU_COMMIT)
 	cd $(SRCPATH_FREEDOM_QEMU) && git submodule update --init --recursive
 	date > $@
 

diff --git a/modules/freedom-sdk-utilities.mk b/modules/freedom-sdk-utilities.mk
@@ -16,8 +16,7 @@ $(SRCPATH_FREEDOM_SDK_UTILITIES).$(FREEDOM_SDK_UTILITIES_COMMIT):
 	mkdir -p $(dir $@)
 	rm -rf $(SRCPATH_FREEDOM_SDK_UTILITIES)
 	rm -rf $(SRCPATH_FREEDOM_SDK_UTILITIES).*
-	git clone $(FREEDOM_SDK_UTILITIES_GITURL) $(SRCPATH_FREEDOM_SDK_UTILITIES)
-	cd $(SRCPATH_FREEDOM_SDK_UTILITIES) && git checkout --detach $(FREEDOM_SDK_UTILITIES_COMMIT)
+	git clone $(FREEDOM_SDK_UTILITIES_GITURL) $(SRCPATH_FREEDOM_SDK_UTILITIES) --single-branch -b $(FREEDOM_SDK_UTILITIES_COMMIT)
 	cd $(SRCPATH_FREEDOM_SDK_UTILITIES) && git submodule update --init --recursive
 	date > $@
 

diff --git a/modules/freedom-toolchain-metal.mk b/modules/freedom-toolchain-metal.mk
@@ -21,8 +21,7 @@ $(SRCPATH_FREEDOM_TOOLCHAIN_METAL).$(FREEDOM_TOOLCHAIN_METAL_COMMIT):
 	mkdir -p $(dir $@)
 	rm -rf $(SRCPATH_FREEDOM_TOOLCHAIN_METAL)
 	rm -rf $(SRCPATH_FREEDOM_TOOLCHAIN_METAL).*
-	git clone $(FREEDOM_TOOLCHAIN_METAL_GITURL) $(SRCPATH_FREEDOM_TOOLCHAIN_METAL)
-	cd $(SRCPATH_FREEDOM_TOOLCHAIN_METAL) && git checkout --detach $(FREEDOM_TOOLCHAIN_METAL_COMMIT)
+	git clone $(FREEDOM_TOOLCHAIN_METAL_GITURL) $(SRCPATH_FREEDOM_TOOLCHAIN_METAL) -b $(FREEDOM_TOOLCHAIN_METAL_COMMIT)
 	cd $(SRCPATH_FREEDOM_TOOLCHAIN_METAL) && git submodule update --init --recursive
 	date > $@
 

diff --git a/modules/freedom-trace-decoder.mk b/modules/freedom-trace-decoder.mk
@@ -16,8 +16,7 @@ $(SRCPATH_FREEDOM_TRACE_DECODER).$(FREEDOM_TRACE_DECODER_COMMIT):
 	mkdir -p $(dir $@)
 	rm -rf $(SRCPATH_FREEDOM_TRACE_DECODER)
 	rm -rf $(SRCPATH_FREEDOM_TRACE_DECODER).*
-	git clone $(FREEDOM_TRACE_DECODER_GITURL) $(SRCPATH_FREEDOM_TRACE_DECODER)
-	cd $(SRCPATH_FREEDOM_TRACE_DECODER) && git checkout --detach $(FREEDOM_TRACE_DECODER_COMMIT)
+	git clone $(FREEDOM_TRACE_DECODER_GITURL) $(SRCPATH_FREEDOM_TRACE_DECODER) --single-branch -b $(FREEDOM_TRACE_DECODER_COMMIT)
 	cd $(SRCPATH_FREEDOM_TRACE_DECODER) && git submodule update --init --recursive
 	date > $@
 

diff --git a/modules/freedom-xc3sprog.mk b/modules/freedom-xc3sprog.mk
@@ -16,8 +16,7 @@ $(SRCPATH_FREEDOM_XC3SPROG).$(FREEDOM_XC3SPROG_COMMIT):
 	mkdir -p $(dir $@)
 	rm -rf $(SRCPATH_FREEDOM_XC3SPROG)
 	rm -rf $(SRCPATH_FREEDOM_XC3SPROG).*
-	git clone $(FREEDOM_XC3SPROG_GITURL) $(SRCPATH_FREEDOM_XC3SPROG)
-	cd $(SRCPATH_FREEDOM_XC3SPROG) && git checkout --detach $(FREEDOM_XC3SPROG_COMMIT)
+	git clone $(FREEDOM_XC3SPROG_GITURL) $(SRCPATH_FREEDOM_XC3SPROG) --single-branch -b $(FREEDOM_XC3SPROG_COMMIT)
 	cd $(SRCPATH_FREEDOM_XC3SPROG) && git submodule update --init --recursive
 	date > $@