Sort manifests as per repo output

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

6 files changed, 18 insertions, 24 deletions

diff --git a/latest.xml b/latest.xml
index 3ad4a7b..5abb68b 100644
--- a/latest.xml
+++ b/latest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-
   <remote fetch="https://git.linaro.org/" name="linaro" />
   <remote fetch="https://github.com/" name="github" />
   <remote fetch="git://git.busybox.net/" name="busybox" />
@@ -8,6 +7,10 @@
   <remote fetch="https://github.com/OP-TEE/" name="optee"/>
 
   <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="master" upstream="master"/>
+  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
+  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="junor1" upstream="junor1"/>
+  <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
+  <project name="busybox" path="busybox" remote="busybox" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="master" upstream="master"/>
@@ -15,14 +18,9 @@
   <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/uefi-tools.git" path="uefi/uefi-tools" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="latest-armlt" upstream="latest-armlt"/>
-  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="junor1" upstream="junor1"/>
-  <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
   <project name="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="master" upstream="master"/>
-  <project name="busybox" path="busybox" remote="busybox" revision="master" upstream="master"/>
   <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master" upstream="master"/>
   <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="master" upstream="master"/>
   <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="master" upstream="master"/>
   <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="master" upstream="master"/>
-  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
-
 </manifest>
diff --git a/lsk.xml b/lsk.xml
index a30dffa..61910a5 100644
--- a/lsk.xml
+++ b/lsk.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-
   <remote fetch="https://git.linaro.org/" name="linaro" />
   <remote fetch="https://github.com/" name="github" />
   <remote fetch="git://git.busybox.net/" name="busybox" />
@@ -8,6 +7,10 @@
   <remote fetch="https://github.com/OP-TEE/" name="optee"/>
 
   <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="master" upstream="master"/>
+  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
+  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="junor1" upstream="junor1"/>
+  <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
+  <project name="busybox" remote="busybox" path="busybox" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="master" upstream="master"/>
@@ -15,14 +18,9 @@
   <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/uefi-tools.git" path="uefi/uefi-tools" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/kernel-release" path="linux" remote="linaro" revision="lsk-3.18-armlt" upstream="lsk-3.18-armlt"/>
-  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="junor1" upstream="junor1"/>
-  <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
   <project name="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="master" upstream="master"/>
-  <project name="busybox" remote="busybox" path="busybox" revision="master" upstream="master"/>
   <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master" upstream="master"/>
   <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="master" upstream="master"/>
   <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="master" upstream="master"/>
   <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="master" upstream="master"/>
-  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
-
 </manifest>
diff --git a/pinned-latest.xml b/pinned-latest.xml
index 62a27b4..711f1f8 100644
--- a/pinned-latest.xml
+++ b/pinned-latest.xml
@@ -7,6 +7,7 @@
   <remote fetch="https://github.com/OP-TEE/" name="optee"/>
   
   <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="84091c48167c3335c826b31c96c67a6e8ae7eeba" upstream="master"/>
+  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
   <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="cad383a2c4ffeb9192605fda54c07fd1aa09a1b0" upstream="junor1"/>
   <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="a6277ffb9ce657a06eb6ce29a738110539d43e21" upstream="vexpress"/>
   <project name="busybox" remote="busybox" revision="3a5cc989025eefe03fda0552b253a4a8f015a761" upstream="master"/>
@@ -22,5 +23,4 @@
   <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="db9c64d45818d146200297eaaedbd421a8b59e3a" upstream="master"/>
   <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="f6dadf4d2b07540ac529226764789699d1205b72" upstream="master"/>
   <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="0dd3f3a432854a4254e38c79ee63ff03addaa539" upstream="master"/>
-  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
 </manifest>
diff --git a/pinned-lsk.xml b/pinned-lsk.xml
index 2994360..4b0927a 100644
--- a/pinned-lsk.xml
+++ b/pinned-lsk.xml
@@ -7,6 +7,7 @@
   <remote fetch="https://github.com/OP-TEE/" name="optee"/>
   
   <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="84091c48167c3335c826b31c96c67a6e8ae7eeba" upstream="master"/>
+  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
   <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="cad383a2c4ffeb9192605fda54c07fd1aa09a1b0" upstream="junor1"/>
   <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="a6277ffb9ce657a06eb6ce29a738110539d43e21" upstream="vexpress"/>
   <project name="busybox" remote="busybox" revision="3a5cc989025eefe03fda0552b253a4a8f015a761" upstream="master"/>
@@ -22,5 +23,4 @@
   <project name="optee_client.git" path="optee/optee_client" remote="optee" revision="db9c64d45818d146200297eaaedbd421a8b59e3a" upstream="master"/>
   <project name="optee_linuxdriver.git" path="optee/optee_linuxdriver" remote="optee" revision="f6dadf4d2b07540ac529226764789699d1205b72" upstream="master"/>
   <project name="optee_os.git" path="optee/optee_os" remote="optee" revision="0dd3f3a432854a4254e38c79ee63ff03addaa539" upstream="master"/>
-  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
 </manifest>
diff --git a/pinned-uefi.xml b/pinned-uefi.xml
index 813e0e7..3bd380e 100644
--- a/pinned-uefi.xml
+++ b/pinned-uefi.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-
   <remote fetch="https://github.com/" name="github"/>
   <remote fetch="https://git.linaro.org/" name="linaro"/>
   <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
 
   <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="84091c48167c3335c826b31c96c67a6e8ae7eeba" upstream="master"/>
+  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
+  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="cad383a2c4ffeb9192605fda54c07fd1aa09a1b0" upstream="junor1"/>
+  <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="a6277ffb9ce657a06eb6ce29a738110539d43e21" upstream="vexpress"/>
+  <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/OpenPlatformPkg" remote="linaro" revision="3498981443dd52f838bdfb3f522200eddb6db262" upstream="master"/>
   <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="411c40757108a65f72e8787008fb2d2cfe6f56bf" upstream="master"/>
+  <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="2558a2ec2103fed64e965281b3fdaad1e0466dc0" upstream="master"/>
   <project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="89157abb9dd030c7d1cb7bc20df843b236358a33" upstream="master"/>
-  <project name="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="b57c098ca0561ff39aa70b3fe2c795b7a0108717" upstream="master"/>
-  <project name="landing-teams/working/arm/u-boot" path="u-boot" remote="linaro" revision="382613fefac65596b4af93b8027e5e8be9cc20f1" upstream="master"/>
   <project name="landing-teams/working/arm/uefi-tools.git" path="uefi/uefi-tools" remote="linaro" revision="b9a106861c735f1acfed31359e1af16f4741317d" upstream="master"/>
-  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
   <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" upstream="master"/>
-  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="cad383a2c4ffeb9192605fda54c07fd1aa09a1b0" upstream="junor1"/>
-  <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="a6277ffb9ce657a06eb6ce29a738110539d43e21" upstream="vexpress"/>
 </manifest>
diff --git a/uefi.xml b/uefi.xml
index f129b51..91b9f0d 100644
--- a/uefi.xml
+++ b/uefi.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-
   <remote fetch="https://github.com/" name="github"/>
   <remote fetch="https://git.linaro.org/" name="linaro"/>
   <remote fetch="https://github.com/ARMmbed/" name="mbedtls"/>
 
   <project name="ARM-software/arm-trusted-firmware" path="arm-tf" remote="github" revision="master" upstream="master"/>
+  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
+  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="junor1" upstream="junor1"/>
+  <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
   <project name="landing-teams/working/arm/build-scripts" path="build-scripts" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/model-scripts" path="model-scripts" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/edk2" path="uefi/edk2" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/OpenPlatformPkg" path="uefi/OpenPlatformPkg" remote="linaro" revision="master" upstream="master"/>
   <project name="landing-teams/working/arm/uefi-tools.git" path="uefi/uefi-tools" remote="linaro" revision="master" upstream="master"/>
-  <project name="acpica/acpica" path="uefi/acpica" remote="github" revision="298c828456b1abe01870218a097b89fee71f4b60" upstream="master"/>
-  <project name="arm/vexpress-firmware" path="recovery" remote="linaro" revision="junor1" upstream="junor1"/>
-  <project name="arm/vexpress-firmware" path="vexpress-firmware" remote="linaro" revision="vexpress" upstream="vexpress"/>
   <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master" upstream="master"/>
 </manifest>