Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manifest cleanup #273

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Manifest cleanup #273

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf51ec7
manifests: format the manifests using xmlstartlet
fboudra Mar 18, 2024
4c547c7
common.xml: add sync-j and clone-depth to defaults
fboudra Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
<manifest>
<remote name="github" fetch="https://github.com"/>

<default remote="github" revision="master"/>
<default remote="github" revision="master" sync-j="4" clone-depth="1"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What effect does this have on, for instance, the optee_os git? Will it also have a clone-depth of 1?
We'd like to clone the entire git history for all the optee* gits.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When a different -j flag is passed to repo, will that take precedence?


<!-- 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"/>

<!-- linaro-swg gits -->
<project path="linux" name="linaro-swg/linux.git" revision="optee" clone-depth="1"/>
<project path="linux" name="linaro-swg/linux.git" revision="optee"/>
<project path="optee_examples" name="linaro-swg/optee_examples.git"/>

<!-- buildroot git -->
<project path="buildroot" name="buildroot/buildroot.git" revision="refs/tags/2023.11.1" clone-depth="1"/>
<project path="buildroot" name="buildroot/buildroot.git" revision="refs/tags/2023.11.1"/>
</manifest>
4 changes: 2 additions & 2 deletions default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<linkfile src="qemu.mk" dest="build/Makefile"/>
</project>

<project path="qemu" name="qemu/qemu.git" revision="refs/tags/v7.0.0" clone-depth="1"/>
<project path="qemu" name="qemu/qemu.git" revision="refs/tags/v7.0.0"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
<project path="u-boot" name="u-boot.git" revision="refs/tags/v2020.04" remote="u-boot" clone-depth="1"/>
<project path="u-boot" name="u-boot.git" revision="refs/tags/v2020.04" remote="u-boot" />
</manifest>
6 changes: 3 additions & 3 deletions fvp-ts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
<!-- linaro-swg gits -->
<!-- Replace Linux with mainline version -->
<remove-project path="linux" name="linaro-swg/linux.git"/>
<project path="linux" name="pub/scm/linux/kernel/git/stable/linux.git" revision="refs/tags/v6.1.34" clone-depth="1" remote="kernel-org"/>
<project path="linux" name="pub/scm/linux/kernel/git/stable/linux.git" revision="refs/tags/v6.1.34" remote="kernel-org"/>

<!-- Misc gits -->
<!-- The fTPM is not used in this config -->
<remove-project path="ms-tpm-20-ref" name="microsoft/ms-tpm-20-ref"/>
<!-- Add Trusted Services Linux drivers -->
<project path="linux-arm-ffa-user" name="linux-arm/linux-trusted-services.git" revision="refs/tags/debugfs-v5.0.1" clone-depth="1" remote="arm-gitlab"/>
<project path="linux-arm-ffa-tee" name="linux-arm/linux-trusted-services.git" revision="refs/tags/tee-v2.0.0" clone-depth="1" remote="arm-gitlab"/>
<project path="linux-arm-ffa-user" name="linux-arm/linux-trusted-services.git" revision="refs/tags/debugfs-v5.0.1" remote="arm-gitlab"/>
<project path="linux-arm-ffa-tee" name="linux-arm/linux-trusted-services.git" revision="refs/tags/tee-v2.0.0" remote="arm-gitlab"/>
<!-- Add Trusted Services project -->
<project path="trusted-services" name="TS/trusted-services.git" revision="refs/tags/v1.0.0" remote="tfo"/>
</manifest>
4 changes: 2 additions & 2 deletions fvp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

<project path="edk2" name="tianocore/edk2.git" revision="dd4cae4d82c7477273f3da455084844db5cca0c0"/>
<project path="edk2-platforms" name="tianocore/edk2-platforms.git" revision="02daa58c21f89628b4d8c76f95f3a554289149bc"/>
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" clone-depth="1" remote="savannah"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.9" clone-depth="1" remote="tfo"/>
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" remote="savannah"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.9" remote="tfo"/>
<project path="mbedtls" name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-3.4.0"/>
<!-- fTPM implementation -->
<project path="ms-tpm-20-ref" name="microsoft/ms-tpm-20-ref" revision="98b60a44aba79b15fcce1c0d1e46cf5918400f6a"/>
Expand Down
6 changes: 3 additions & 3 deletions hikey.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<!-- Misc gits -->
<project path="atf-fastboot" name="96boards-hikey/atf-fastboot.git" revision="d75cfac3877be68bb5e36be3fc57ba597a2d3710"/>
<project path="burn-boot" name="96boards-hikey/burn-boot.git" revision="7dcbfb1f1496756294b3068e6e2370a9399dcea2"/>
<project path="busybox" name="mirror/busybox.git" revision="refs/tags/1_24_0" clone-depth="1"/>
<project path="busybox" name="mirror/busybox.git" revision="refs/tags/1_24_0"/>
<project path="edk2" name="96boards-hikey/edk2.git" revision="77326b5a153513c826d5a50363eace6ef6b59413"/>
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" clone-depth="1" remote="savannah"/>
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" remote="savannah"/>
<project path="l-loader" name="96boards-hikey/l-loader.git" revision="6560d22743d5ec904ff043d87f7f794336076085"/>
<project path="OpenPlatformPkg" name="96boards-hikey/OpenPlatformPkg.git" revision="245344ea5421ba126e1eb76484d00b590a4a78f7"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" clone-depth="1" remote="tfo"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
</manifest>
4 changes: 2 additions & 2 deletions hikey960.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

<!-- Misc gits -->
<project path="edk2" name="96boards-hikey/edk2.git" revision="77326b5a153513c826d5a50363eace6ef6b59413"/>
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" clone-depth="1" remote="savannah"/>
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" remote="savannah"/>
<project path="l-loader" name="96boards-hikey/l-loader.git" revision="6560d22743d5ec904ff043d87f7f794336076085"/>
<project path="OpenPlatformPkg" name="96boards-hikey/OpenPlatformPkg.git" revision="245344ea5421ba126e1eb76484d00b590a4a78f7"/>
<project path="tools-images-hikey960" name="96boards-hikey/tools-images-hikey960.git" revision="a10d2bf1dca7a1be50fc60e58ed93253c95de076"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" clone-depth="1" remote="tfo"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
</manifest>
6 changes: 3 additions & 3 deletions imx.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</project>

<!-- Misc gits -->
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" clone-depth="1" remote="tfo"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2020.10-rc2" clone-depth="1"/>
<project path="imx-mkimage" name="nxp-imx/imx-mkimage.git" revision="refs/tags/rel_imx_5.4.24_2.1.0" clone-depth="1"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2020.10-rc2"/>
<project path="imx-mkimage" name="nxp-imx/imx-mkimage.git" revision="refs/tags/rel_imx_5.4.24_2.1.0"/>
</manifest>
4 changes: 2 additions & 2 deletions juno.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<linkfile src="juno.mk" dest="build/Makefile"/>
</project>

<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" clone-depth="1" remote="tfo"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2018.03" clone-depth="1"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2018.03"/>
</manifest>
8 changes: 4 additions & 4 deletions poplar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</project>

<!-- 96boards-poplar gits -->
<project path="l-loader" name="96boards-poplar/l-loader.git" revision="master" clone-depth="1"/>
<project path="poplar-tools" name="96boards-poplar/poplar-tools.git" revision="master" clone-depth="1"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="697758e7c81131da6db0e3b10515019fe3aca8c9" clone-depth="1" remote="denx"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" clone-depth="1" remote="tfo"/>
<project path="l-loader" name="96boards-poplar/l-loader.git" revision="master"/>
<project path="poplar-tools" name="96boards-poplar/poplar-tools.git" revision="master"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="697758e7c81131da6db0e3b10515019fe3aca8c9" remote="denx"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
</manifest>
14 changes: 7 additions & 7 deletions qemu_v8.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
</project>

<!-- Misc gits -->
<project path="mbedtls" name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-2.26.0" clone-depth="1"/>
<project path="mbedtls" name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-2.26.0"/>
<project path="optee_rust" name="apache/incubator-teaclave-trustzone-sdk.git" revision="bc6ae8911b6ae093e8369a53a42b8c99307f7dc5"/>
<project path="qemu" name="qemu/qemu.git" revision="refs/tags/v8.1.2" clone-depth="1"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.10" clone-depth="1" remote="tfo"/>
<project path="hafnium" name="hafnium/hafnium.git" revision="refs/tags/v2.10" clone-depth="1" remote="tfo"/>
<project path="u-boot" name="u-boot.git" revision="refs/tags/v2023.07.02" remote="u-boot" clone-depth="1"/>
<project path="xen" name="git-http/xen.git" revision="refs/tags/RELEASE-4.18.0" clone-depth="1" remote="xenbits"/>
<project path="SCP-firmware" name="ARM-software/SCP-firmware.git" revision="refs/tags/v2.13.0" clone-depth="1"/>
<project path="qemu" name="qemu/qemu.git" revision="refs/tags/v8.1.2"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.10" remote="tfo"/>
<project path="hafnium" name="hafnium/hafnium.git" revision="refs/tags/v2.10" remote="tfo"/>
<project path="u-boot" name="u-boot.git" revision="refs/tags/v2023.07.02" remote="u-boot"/>
<project path="xen" name="git-http/xen.git" revision="refs/tags/RELEASE-4.18.0" remote="xenbits"/>
<project path="SCP-firmware" name="ARM-software/SCP-firmware.git" revision="refs/tags/v2.13.0"/>
</manifest>
4 changes: 2 additions & 2 deletions rockpi4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
</project>

<project path="rkdeveloptool" name="rockchip-linux/rkdeveloptool"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.7" clone-depth="1" remote="tfo"/>
<project path="u-boot" name="u-boot.git" revision="refs/tags/v2022.10" remote="u-boot" clone-depth="1"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.7" remote="tfo"/>
<project path="u-boot" name="u-boot.git" revision="refs/tags/v2022.10" remote="u-boot"/>
</manifest>
8 changes: 4 additions & 4 deletions rpi3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
</project>

<remove-project name="linaro-swg/linux.git"/>
<project path="linux" name="linaro-swg/linux.git" revision="rpi3-optee-6.7" clone-depth="1"/>
<project path="linux" name="linaro-swg/linux.git" revision="rpi3-optee-6.7"/>

<!-- Misc gits -->
<project path="firmware" name="raspberrypi/firmware.git" revision="refs/tags/1.20190401" clone-depth="1"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" clone-depth="1" remote="tfo"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2021.10" clone-depth="1"/>
<project path="firmware" name="raspberrypi/firmware.git" revision="refs/tags/1.20190401"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2021.10"/>
</manifest>
12 changes: 6 additions & 6 deletions stm32mp1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
</project>

<!-- Misc gits -->
<project path="edk2" name="tianocore/edk2.git" revision="refs/tags/edk2-stable202211" sync-s="true" clone-depth="1"/>
<project path="edk2-platforms" name="tianocore/edk2-platforms.git" revision="70b67dc9ab89689f26ad5e68a5efeac509a12115" sync-s="true" clone-depth="1"/>
<project path="mbedtls" name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-2.28.1" clone-depth="1"/>
<project path="scp-firmware" name="ARM-software/SCP-firmware.git" revision="refs/tags/v2.13.0" clone-depth="1"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.9" remote="tfo" clone-depth="1"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2024.01-rc1" remote="u-boot" clone-depth="1"/>
<project path="edk2" name="tianocore/edk2.git" revision="refs/tags/edk2-stable202211" sync-s="true"/>
<project path="edk2-platforms" name="tianocore/edk2-platforms.git" revision="70b67dc9ab89689f26ad5e68a5efeac509a12115" sync-s="true"/>
<project path="mbedtls" name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-2.28.1"/>
<project path="scp-firmware" name="ARM-software/SCP-firmware.git" revision="refs/tags/v2.13.0"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.9" remote="tfo"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2024.01-rc1" remote="u-boot"/>
</manifest>
2 changes: 1 addition & 1 deletion synquacer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
<project path="edk2" name="tianocore/edk2.git" revision="21d9dc21f81828538af02ca9c2d86a36551b0771"/>
<project path="edk2-non-osi" name="tianocore/edk2-non-osi.git" revision="596043ffb61d5f74a9eb334eaa4df683fa975c92"/>
<project path="edk2-platforms" name="tianocore/edk2-platforms.git" revision="22d5f499135a0b43bfb723a983f93c3148d68494"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" clone-depth="1" remote="tfo"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
</manifest>