From 5e75c1736d5eb85be42caf3e96d9f71dd1d174d8 Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Sat, 29 Sep 2018 16:59:55 +0800 Subject: optee-client-qoriq: update to ab3c79c *update to lsdk 1809 tag include the following changes: ab3c79c - Merge pull request #1 in DASH/optee_client from ~NXA19713/optee_client:master to optee_client_3.2 d56bb17 - Do not export CMakeLists.txt when running install ffd0a1d - libteec: Fix incorrect SOVERSION number 09b8071 - tee-supplicant: cast sizeof(x) to socklen_t b46a1e0 - tee-supplicant: fix gcc warning c3ae0db - cmake: Initial CMake support e23a20d - tee-supplicant: fix use of mem after it's freed 42c81ab - libteec/tee-supplicant: respect LDFLAGS set from distribution toolchain afb7317 - libteec/Makefile: generate static library (libteec.a) *refresh patches Signed-off-by: Chunrong Guo Signed-off-by: Otavio Salvador --- recipes-security/optee/optee-client-qoriq.bb | 4 +- .../0001-Respect-LDFLAGS-set-from-OE-build.patch | 67 ---------------------- .../0001-flags-CFLAGS-add-Wno-cpp.patch | 28 +++++++++ 3 files changed, 30 insertions(+), 69 deletions(-) delete mode 100644 recipes-security/optee/optee-client-qoriq/0001-Respect-LDFLAGS-set-from-OE-build.patch create mode 100644 recipes-security/optee/optee-client-qoriq/0001-flags-CFLAGS-add-Wno-cpp.patch (limited to 'recipes-security') diff --git a/recipes-security/optee/optee-client-qoriq.bb b/recipes-security/optee/optee-client-qoriq.bb index a5042703..6aaf714c 100644 --- a/recipes-security/optee/optee-client-qoriq.bb +++ b/recipes-security/optee/optee-client-qoriq.bb @@ -7,12 +7,12 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b" inherit pythonnative systemd SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/optee_client;nobranch=1 \ - file://0001-Respect-LDFLAGS-set-from-OE-build.patch \ file://0001-GCC-8-format-truncation-error.patch \ + file://0001-flags-CFLAGS-add-Wno-cpp.patch \ " S = "${WORKDIR}/git" -SRCREV = "73b4e490a8ed0b4a7714818e80998b9d8a7da958" +SRCREV = "ab3c79ccd3ea9323e236d30037977c0a19944dbd" EXTRA_OEMAKE = "ARCH=arm64" diff --git a/recipes-security/optee/optee-client-qoriq/0001-Respect-LDFLAGS-set-from-OE-build.patch b/recipes-security/optee/optee-client-qoriq/0001-Respect-LDFLAGS-set-from-OE-build.patch deleted file mode 100644 index 8dd6c7a9..00000000 --- a/recipes-security/optee/optee-client-qoriq/0001-Respect-LDFLAGS-set-from-OE-build.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 73cb675c16bd63ee0e760a4067ffda4b050d19fa Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 15 Jun 2017 17:20:35 -0700 -Subject: [PATCH] Respect LDFLAGS set from OE build - -* Unify LFLAGS/LDFLAGS variable names (only tee-supplicant was using LDFLAGS). -* Fixes: - ERROR: optee-client-2.4.0+gitAUTOINC+1df4046bd7-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: 'optee-client/2.4.0+gitAUTOINC+1df4046bd7-r0/packages-split/optee-client/usr/bin/tee-supplicant' - No GNU_HASH in the elf binary: 'optee-client/2.4.0+gitAUTOINC+1df4046bd7-r0/packages-split/optee-client/usr/lib/libteec.so.1.0' [ldflags] - ERROR: optee-client-2.4.0+gitAUTOINC+1df4046bd7-r0 do_package_qa: QA run found fatal errors. Please consider fixing them. - ERROR: optee-client-2.4.0+gitAUTOINC+1df4046bd7-r0 do_package_qa: Function failed: do_package_qa - ERROR: Logfile of failure stored in: optee-client/2.4.0+gitAUTOINC+1df4046bd7-r0/temp/log.do_package_qa.31246 - -Upstream-Status: Pending -Signed-off-by: Martin Jansa - ---- - libteec/Makefile | 2 +- - tee-supplicant/Makefile | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libteec/Makefile b/libteec/Makefile -index 568a2cd..a406237 100644 ---- a/libteec/Makefile -+++ b/libteec/Makefile -@@ -36,7 +36,7 @@ ifeq ($(CFG_TEE_BENCHMARK),y) - TEEC_CFLAGS += -DCFG_TEE_BENCHMARK - endif - --TEEC_LFLAGS := -lpthread -+TEEC_LFLAGS := $(LDFLAGS) -lpthread - TEEC_LIBRARY := $(OUT_DIR)/$(LIB_MAJ_MIN) - - libteec: $(TEEC_LIBRARY) -diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile -index 737d39a..4b423fb 100644 ---- a/tee-supplicant/Makefile -+++ b/tee-supplicant/Makefile -@@ -55,21 +55,21 @@ ifeq ($(CFG_TA_TEST_PATH),y) - TEES_CFLAGS += -DCFG_TA_TEST_PATH=1 - endif - TEES_FILE := $(OUT_DIR)/$(PACKAGE_NAME) --TEES_LDFLAGS := -L$(OUT_DIR)/../libteec -lteec -+TEES_LFLAGS := $(LDFLAGS) -L$(OUT_DIR)/../libteec -lteec - - ifeq ($(CFG_TA_GPROF_SUPPORT),y) - TEES_CFLAGS += -DCFG_TA_GPROF_SUPPORT - endif - --TEES_LDFLAGS += -lpthread -+TEES_LFLAGS += -lpthread - # Needed to get clock_gettime() for for glibc versions before 2.17 --TEES_LDFLAGS += -lrt -+TEES_LFLAGS += -lrt - - tee-supplicant: $(TEES_FILE) - - $(TEES_FILE): $(TEES_OBJS) - @echo " LINK $@" -- $(VPREFIX)$(CC) -o $@ $+ $(TEES_LDFLAGS) -+ $(VPREFIX)$(CC) -o $@ $+ $(TEES_LFLAGS) - @echo "" - - $(TEES_OBJ_DIR)/%.o: $(TEES_SRC_DIR)/%.c --- -2.15.0.rc2 - diff --git a/recipes-security/optee/optee-client-qoriq/0001-flags-CFLAGS-add-Wno-cpp.patch b/recipes-security/optee/optee-client-qoriq/0001-flags-CFLAGS-add-Wno-cpp.patch new file mode 100644 index 00000000..09e4490d --- /dev/null +++ b/recipes-security/optee/optee-client-qoriq/0001-flags-CFLAGS-add-Wno-cpp.patch @@ -0,0 +1,28 @@ +From f2ebda1d85b10fd008c21974a0f7aa4e805d0e5c Mon Sep 17 00:00:00 2001 +From: Chunrong Guo +Date: Tue, 11 Sep 2018 11:40:55 +0800 +Subject: [PATCH] flags: CFLAGS add -Wno-cpp + +*fix build with FORTIFY_SOURCES + +Signed-off-by: BJ DevOps Team +--- + flags.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/flags.mk b/flags.mk +index 71f3d18..43c18f0 100644 +--- a/flags.mk ++++ b/flags.mk +@@ -14,7 +14,7 @@ CFLAGS := -Wall -Wbad-function-cast -Wcast-align \ + -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs \ + -Wpointer-arith -Wshadow -Wstrict-prototypes \ + -Wswitch-default -Wunsafe-loop-optimizations \ +- -Wwrite-strings -Werror ++ -Wwrite-strings -Werror -Wno-cpp + CFLAGS += -c -fPIC + + DEBUG ?= 0 +-- +2.7.4 + -- cgit v1.2.3-54-g00ecf