juno: use mainly github as remote
Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
diff --git a/juno.xml b/juno.xml
index e4f2f77..ab9491d 100644
--- a/juno.xml
+++ b/juno.xml
@@ -1,42 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
- <remote name="arm" fetch="https://github.com/ARM-software" />
- <remote name="busybox" fetch="git://busybox.net" />
- <remote name="linaro-swg" fetch="https://github.com/linaro-swg" />
- <remote name="optee" fetch="https://github.com/OP-TEE" />
- <remote name="linaro" fetch="https://git.linaro.org" />
- <remote name="u-boot" fetch="git://git.denx.de" />
+ <remote name="github" fetch="https://github.com" />
+ <remote name="linaro" fetch="https://git.linaro.org" />
- <default remote="optee" revision="master" />
+ <default remote="github" revision="master" />
- <!-- OP-TEE gits -->
- <project path="optee_os" name="optee_os.git" />
- <project path="optee_client" name="optee_client.git" />
- <project path="optee_test" name="optee_test.git" />
+ <!-- OP-TEE gits -->
+ <project path="optee_client" name="OP-TEE/optee_client.git" />
+ <project path="optee_os" name="OP-TEE/optee_os.git" />
+ <project path="optee_test" name="OP-TEE/optee_test.git" />
+ <project path="build" name="OP-TEE/build.git">
+ <linkfile src="juno.mk" dest="build/Makefile" />
+ </project>
- <!-- busybox -->
- <project remote="busybox" path="busybox" name="busybox.git" revision="refs/tags/1_24_0" clone-depth="1" />
+ <!-- linaro-swg gits -->
+ <project path="gen_rootfs" name="linaro-swg/gen_rootfs.git" revision="d5429c154fb81fdae75886d505c385b2f0bb7153" />
+ <project path="linux" name="linaro-swg/linux.git" revision="6e954e2f2cbd412f7bc874bb9145f69713194e52"/>
+ <project path="optee_examples" name="linaro-swg/optee_examples.git" />
- <!-- ARM-TF -->
- <project remote="arm" path="arm-trusted-firmware" name="arm-trusted-firmware.git" revision="refs/tags/v1.5-rc2" clone-depth="1" />
-
- <!-- U-Boot -->
- <project remote="u-boot" path="u-boot" name="u-boot.git" revision="refs/tags/v2018.03" clone-depth="1" />
-
- <!-- Recovery files -->
- <project remote="linaro" path="vexpress-firmware" name="arm/vexpress-firmware.git" revision="refs/tags/armlt-20151204-002" clone-depth="1" />
-
- <!-- Linux kernel -->
- <project remote="linaro-swg" path="linux" name="linux.git" revision="6e954e2f2cbd412f7bc874bb9145f69713194e52"/>
-
- <!-- Sample applications -->
- <project remote="linaro-swg" path="optee_examples" name="optee_examples.git" />
-
- <!-- Filesystem -->
- <project remote="linaro-swg" path="gen_rootfs" name="gen_rootfs.git" revision="d5429c154fb81fdae75886d505c385b2f0bb7153" />
-
- <!-- Build -->
- <project path="build" name="build.git">
- <linkfile src="juno.mk" dest="build/Makefile" />
- </project>
+ <!-- Misc gits -->
+ <project path="arm-trusted-firmware" name="ARM-software/arm-trusted-firmware.git" revision="refs/tags/v1.5-rc2" clone-depth="1" />
+ <project path="busybox" name="mirror/busybox.git" revision="refs/tags/1_24_0" clone-depth="1" />
+ <project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2018.03" clone-depth="1" />
+ <project path="vexpress-firmware" name="arm/vexpress-firmware.git" revision="refs/tags/armlt-20151204-002" clone-depth="1" remote="linaro"/>
</manifest>