diff options
| author | David Brown <david.brown@linaro.org> | 2016-06-16 07:25:04 -0600 |
|---|---|---|
| committer | Koen Kooi <koen.kooi@linaro.org> | 2016-06-23 07:35:37 +0200 |
| commit | a326f4f7f310ed6336579ee5b87d30073bfa125d (patch) | |
| tree | 42fae8e7d6512984a63380a642a3b92518357361 /meta-optee/recipes-security | |
| parent | ea600f22e5f38772e40d4b9f87c45a713f7993c7 (diff) | |
optee-client, optee-os: Update upstream versions
And remove the patch that is now merged upstream.
Change-Id: Ib56629f370f477cef47175befa272d3a623de3e1
Signed-off-by: David Brown <david.brown@linaro.org>
Diffstat (limited to 'meta-optee/recipes-security')
3 files changed, 2 insertions, 42 deletions
diff --git a/meta-optee/recipes-security/optee/optee-client.bb b/meta-optee/recipes-security/optee/optee-client.bb index ac921b91..023ab523 100644 --- a/meta-optee/recipes-security/optee/optee-client.bb +++ b/meta-optee/recipes-security/optee/optee-client.bb @@ -11,7 +11,7 @@ inherit pythonnative SRC_URI = "git://github.com/OP-TEE/optee_client.git" S = "${WORKDIR}/git" -SRCREV = "fcd1014947e784ca8d618035bcb999f9151096b0" +SRCREV = "17d1addc465a667f375837cdbe4fa7ebac08539b" do_compile() { install -d ${D}${prefix} diff --git a/meta-optee/recipes-security/optee/optee-os/b9447a136558a48a40928493dd6f18aae2701e8b.patch b/meta-optee/recipes-security/optee/optee-os/b9447a136558a48a40928493dd6f18aae2701e8b.patch deleted file mode 100644 index b85308fc..00000000 --- a/meta-optee/recipes-security/optee/optee-os/b9447a136558a48a40928493dd6f18aae2701e8b.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b9447a136558a48a40928493dd6f18aae2701e8b Mon Sep 17 00:00:00 2001 -From: Jerome Forissier <jerome.forissier@linaro.org> -Date: Mon, 13 Jun 2016 08:54:56 +0200 -Subject: [PATCH] tui: Add __maybe_unused - -Parameter 'msg' is not used when CFG_TEE_TA_LOG_LEVEL=0, so add -__maybe_unused. - -Fixes https://github.com/OP-TEE/optee_os/issues/848. - -Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> -Reviewed-by: Joakim Bech <joakim.bech@linaro.org> -Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU, HiKey 32/64) -Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> ---- - lib/libutee/tui/image_png.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/libutee/tui/image_png.c b/lib/libutee/tui/image_png.c -index 7399c98..950cfed 100644 ---- a/lib/libutee/tui/image_png.c -+++ b/lib/libutee/tui/image_png.c -@@ -25,6 +25,7 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - -+#include <compiler.h> - #include <stdlib.h> - #include <png.h> - #include <tee_api.h> -@@ -39,7 +40,7 @@ struct image_work { - const uint8_t *end_data; - }; - --static void error_cb(png_structp png_ptr, png_const_charp msg) -+static void error_cb(png_structp png_ptr, png_const_charp msg __maybe_unused) - { - struct image_work *w; - diff --git a/meta-optee/recipes-security/optee/optee-os_git.bb b/meta-optee/recipes-security/optee/optee-os_git.bb index bbdd21d4..daf7428e 100644 --- a/meta-optee/recipes-security/optee/optee-os_git.bb +++ b/meta-optee/recipes-security/optee/optee-os_git.bb @@ -10,10 +10,9 @@ DEPENDS = "python-wand-native python-pycrypto-native" inherit deploy pythonnative -SRCREV = "3f19eae1f645530820ade9e421df95cf16e38f85" +SRCREV = "8f46b8d05b22d1511a7d93dd9adafddf9251ab6a" SRC_URI = "git://github.com/OP-TEE/optee_os.git \ file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \ - file://b9447a136558a48a40928493dd6f18aae2701e8b.patch \ " |