summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2016-08-01 18:00:57 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2016-08-01 18:00:57 +0100
commit860d76b28e8730c4fcc335bf477540fd709c17de (patch)
tree352321a5549a77ebc6e6daa530d232db8b189af0
parent398c9091e06f38b537e197189bcda94528919384 (diff)
Pin mbedtls to version 2.2.1
Version 2.3.0 doesn't compile with ARM-TF due to unused but set variables: CC plat/arm/css/common/css_bl1_setup.c /working/platforms/mbedtls/library/x509_crt.c: In function 'mbedtls_x509_crt_parse': /working/platforms/mbedtls/library/x509_crt.c:972:39: error: unused variable 'total_failed' [-Werror=unused-variable] int success = 0, first_error = 0, total_failed = 0; ^ /working/platforms/mbedtls/library/x509_crt.c:972:22: error: unused variable 'first_error' [-Werror=unused-variable] int success = 0, first_error = 0, total_failed = 0; ^ /working/platforms/mbedtls/library/x509_crt.c:972:9: error: unused variable 'success' [-Werror=unused-variable] int success = 0, first_error = 0, total_failed = 0; ^ So pin our manifest to the last known-good version: 2.2.1. Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--latest.xml2
-rw-r--r--lsk.xml2
-rw-r--r--uefi.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/latest.xml b/latest.xml
index 9f5f71c..e2363e0 100644
--- a/latest.xml
+++ b/latest.xml
@@ -19,7 +19,7 @@
<project name="uefi/uefi-tools.git" path="tools/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="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="master" upstream="master"/>
- <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master" upstream="master"/>
+ <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" 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"/>
diff --git a/lsk.xml b/lsk.xml
index 188c09b..77206d7 100644
--- a/lsk.xml
+++ b/lsk.xml
@@ -19,7 +19,7 @@
<project name="uefi/uefi-tools.git" path="tools/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="landing-teams/working/arm/ramdisk" path="ramdisk" remote="linaro" revision="master" upstream="master"/>
- <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master" upstream="master"/>
+ <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" 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"/>
diff --git a/uefi.xml b/uefi.xml
index 3d14cdd..c428ddc 100644
--- a/uefi.xml
+++ b/uefi.xml
@@ -13,5 +13,5 @@
<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="uefi/uefi-tools.git" path="tools/uefi-tools" remote="linaro" revision="master" upstream="master"/>
- <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="master" upstream="master"/>
+ <project name="mbedtls.git" path="mbedtls" remote="mbedtls" revision="bfafadb45daf8d2114e3109e2f9021fc72ee36bb" upstream="master"/>
</manifest>