From 0c961a51248fc02c6a0bb3691a707495805025a5 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Mon, 31 Aug 2020 08:30:50 +0000 Subject: optee-imx: upgrade to version 3.7.0 Update all recipes to pull sources from imx_5.4.24_2.1.0 branch in NXP upstream and update SRCREV to match release tags. Update PREFERRED_VERSION of optee for mx8 to point to 3.7.0.imx. Following notes are additions to the version update of recipes: -------------------------- optee-os: - Refresh gcc10 patch to resolve the fuzz during apply - Drop python patch as it is already applied upstream - Add new machines to the list optee-client: - Update CFLAGS patch to match 3.7.0 version - Split ${B} from ${S}, this makes build more clear optee-test: - Remove do_compile task and substitute with OEMAKE Signed-off-by: Andrey Zhizhikin --- .../0001-flags-do-not-override-CFLAGS-from-host.patch | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'recipes-security/optee-imx/optee-client') diff --git a/recipes-security/optee-imx/optee-client/0001-flags-do-not-override-CFLAGS-from-host.patch b/recipes-security/optee-imx/optee-client/0001-flags-do-not-override-CFLAGS-from-host.patch index 86c360f2..9c6b1069 100644 --- a/recipes-security/optee-imx/optee-client/0001-flags-do-not-override-CFLAGS-from-host.patch +++ b/recipes-security/optee-imx/optee-client/0001-flags-do-not-override-CFLAGS-from-host.patch @@ -1,4 +1,4 @@ -From 6a600c5637c5446ab3d11eb4304a1dd473ec503e Mon Sep 17 00:00:00 2001 +From 591461d6efe51989b4a7f4e875cdf37505eba360 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Thu, 4 Jun 2020 19:24:05 +0000 Subject: [PATCH] flags: do not override CFLAGS from host @@ -19,11 +19,11 @@ Signed-off-by: Andrey Zhizhikin Reviewed-by: Jerome Forissier Reviewed-by: Joakim Bech --- - flags.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + flags.mk | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flags.mk b/flags.mk -index 71f3d18..faabef9 100644 +index c2f0e1c..65192bc 100644 --- a/flags.mk +++ b/flags.mk @@ -6,7 +6,7 @@ CROSS_COMPILE ?= arm-linux-gnueabihf- @@ -35,10 +35,13 @@ index 71f3d18..faabef9 100644 -Werror-implicit-function-declaration -Wextra \ -Wfloat-equal -Wformat-nonliteral -Wformat-security \ -Wformat=2 -Winit-self -Wmissing-declarations \ -@@ -15,11 +15,11 @@ CFLAGS := -Wall -Wbad-function-cast -Wcast-align \ - -Wpointer-arith -Wshadow -Wstrict-prototypes \ +@@ -16,13 +16,13 @@ CFLAGS := -Wall -Wbad-function-cast -Wcast-align \ -Wswitch-default -Wunsafe-loop-optimizations \ - -Wwrite-strings -Werror + -Wwrite-strings -D_FILE_OFFSET_BITS=64 + ifeq ($(CFG_WERROR),y) +-CFLAGS += -Werror ++override CFLAGS += -Werror + endif -CFLAGS += -c -fPIC +override CFLAGS += -c -fPIC -- cgit v1.2.3-54-g00ecf