From 42c22a579172efd79f59a9c7dc20ac436311a58a Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Fri, 3 May 2024 13:15:48 -0700 Subject: [PATCH] optee: update recipes for L4T R36.3.0 - base OP-TEE version now 3.22 - refresh makefile patch - optee-client now needs pkg-config and depends on libuuid Signed-off-by: Matt Madison --- ...Update-Makefile-for-OE-compatibility.patch | 33 +++-- ....bb => optee-client_3.22.0-l4t-r36.3.0.bb} | 6 +- .../0001-Update-makefiles-for-OE-builds.patch | 128 ++++-------------- ...> optee-os-tadevkit_3.22.0-l4t-r36.3.0.bb} | 0 ....3.0.bb => optee-os_3.22.0-l4t-r36.3.0.bb} | 0 ....0.bb => optee-test_3.22.0-l4t-r36.3.0.bb} | 0 6 files changed, 46 insertions(+), 121 deletions(-) rename recipes-security/optee/{optee-client_3.21.0-l4t-r36.3.0.bb => optee-client_3.22.0-l4t-r36.3.0.bb} (89%) rename recipes-security/optee/{optee-os-tadevkit_3.21.0-l4t-r36.3.0.bb => optee-os-tadevkit_3.22.0-l4t-r36.3.0.bb} (100%) rename recipes-security/optee/{optee-os_3.21.0-l4t-r36.3.0.bb => optee-os_3.22.0-l4t-r36.3.0.bb} (100%) rename recipes-security/optee/{optee-test_3.21.0-l4t-r36.3.0.bb => optee-test_3.22.0-l4t-r36.3.0.bb} (100%) diff --git a/recipes-security/optee/optee-client/0001-Update-Makefile-for-OE-compatibility.patch b/recipes-security/optee/optee-client/0001-Update-Makefile-for-OE-compatibility.patch index 42466cb2..3692102f 100644 --- a/recipes-security/optee/optee-client/0001-Update-Makefile-for-OE-compatibility.patch +++ b/recipes-security/optee/optee-client/0001-Update-Makefile-for-OE-compatibility.patch @@ -1,4 +1,4 @@ -From be3e189349b4f8b48b90f06d7f1fe90a01e06daa Mon Sep 17 00:00:00 2001 +From 571d509cb221cf5cba32150c620b66c1bd536352 Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Thu, 26 Jan 2023 04:22:34 -0800 Subject: [PATCH] Update Makefile for OE compatibility @@ -7,14 +7,14 @@ Subject: [PATCH] Update Makefile for OE compatibility Signed-off-by: Matt Madison --- - optee/optee_client/Makefile | 36 ++++++++++++++++++------------------ - 1 file changed, 18 insertions(+), 18 deletions(-) + optee/optee_client/Makefile | 39 ++++++++++++++++++++++--------------- + 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/optee/optee_client/Makefile b/optee/optee_client/Makefile -index de1e14f..09e7db9 100644 +index 45762ba..1255447 100644 --- a/optee/optee_client/Makefile +++ b/optee/optee_client/Makefile -@@ -153,21 +153,21 @@ checkpatch-all-files: checkpatch-pre-req +@@ -155,21 +155,28 @@ checkpatch-all-files: checkpatch-pre-req distclean: clean copy_export: build @@ -27,15 +27,6 @@ index de1e14f..09e7db9 100644 - cp libckteec/include/*.h $(DESTDIR)$(includedir) - cp -d ${O}/libckteec/libckteec.so* $(DESTDIR)$(libdir) - cp -d ${O}/libckteec/libckteec.a $(DESTDIR)$(libdir) --ifeq ($(WITH_TEEACL),1) --# Disable libteeacl: --# cp libteeacl/include/*.h $(DESTDIR)$(includedir) --# cp -d ${O}/libteeacl/libteeacl.so* $(DESTDIR)$(libdir) --# cp -d ${O}/libteeacl/libteeacl.a $(DESTDIR)$(libdir) --endif -- cp libseteec/include/*.h $(DESTDIR)$(includedir) -- cp -d ${O}/libseteec/libseteec.so* $(DESTDIR)$(libdir) -- cp -d ${O}/libseteec/libseteec.a $(DESTDIR)$(libdir) + install -d $(DESTDIR)$(sbindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) + install -m 0644 config.mk $(DESTDIR)/$(includedir)/optee_client_config.mk + install -m 0644 ${O}/libteec/libteec.so.1.0.0 $(DESTDIR)$(libdir) @@ -49,11 +40,25 @@ index de1e14f..09e7db9 100644 + ln -sf libckteec.so.0.1.0 $(DESTDIR)$(libdir)/libckteec.so.0.1 + ln -sf libckteec.so.0.1.0 $(DESTDIR)$(libdir)/libckteec.so.0 + install -m 0644 ${O}/libckteec/libckteec.a $(DESTDIR)$(libdir) + ifeq ($(WITH_TEEACL),1) +- cp libteeacl/include/*.h $(DESTDIR)$(includedir) +- cp -d ${O}/libteeacl/libteeacl.so* $(DESTDIR)$(libdir) +- cp -d ${O}/libteeacl/libteeacl.a $(DESTDIR)$(libdir) ++ install -m 0644 libteeacl/include/*.h $(DESTDIR)$(includedir) ++ install -m 0644 ${O}/libteeacl/libteeacl.so.0.1.0 $(DESTDIR)$(libdir) ++ ln -s libteeacl.so.0.1.0 $(DESTDIR)$(libdir)/libteeacl.so.0 ++ ln -s libteeacl.so.0.1.0 $(DESTDIR)$(libdir)/libteeacl.so + endif +- cp libseteec/include/*.h $(DESTDIR)$(includedir) +- cp -d ${O}/libseteec/libseteec.so* $(DESTDIR)$(libdir) +- cp -d ${O}/libseteec/libseteec.a $(DESTDIR)$(libdir) +- cp prebuilt/include/*.h $(DESTDIR)$(includedir) + install -m 0644 libseteec/include/*.h $(DESTDIR)$(includedir) + install -m 0644 ${O}/libseteec/libseteec.so.0.1.0 $(DESTDIR)$(libdir) + ln -sf libseteec.so.0.1.0 $(DESTDIR)$(libdir)/libseteec.so.0.1 + ln -sf libseteec.so.0.1.0 $(DESTDIR)$(libdir)/libseteec.so.0 + install -m 0644 ${O}/libseteec/libseteec.a $(DESTDIR)$(libdir) ++ -- 2.34.1 diff --git a/recipes-security/optee/optee-client_3.21.0-l4t-r36.3.0.bb b/recipes-security/optee/optee-client_3.22.0-l4t-r36.3.0.bb similarity index 89% rename from recipes-security/optee/optee-client_3.21.0-l4t-r36.3.0.bb rename to recipes-security/optee/optee-client_3.22.0-l4t-r36.3.0.bb index 9ec3816b..f5344779 100644 --- a/recipes-security/optee/optee-client_3.21.0-l4t-r36.3.0.bb +++ b/recipes-security/optee/optee-client_3.22.0-l4t-r36.3.0.bb @@ -16,16 +16,16 @@ SRC_URI += "\ file://tee-supplicant.sh.in \ " -DEPENDS = "optee-os-tadevkit" +DEPENDS = "optee-os-tadevkit util-linux-libuuid" S = "${WORKDIR}/optee_client" B = "${WORKDIR}/build" -inherit systemd update-rc.d +inherit pkgconfig systemd update-rc.d OPTEE_FS_PARENT_PATH ?= "${localstatedir}/lib/tee" -EXTRA_OEMAKE += "CFG_TEE_FS_PARENT_PATH=${OPTEE_FS_PARENT_PATH}" +EXTRA_OEMAKE += "CFG_TEE_FS_PARENT_PATH=${OPTEE_FS_PARENT_PATH} PKG_CONFIG=pkg-config" do_compile() { oe_runmake -C ${S} build diff --git a/recipes-security/optee/optee-nvsamples/0001-Update-makefiles-for-OE-builds.patch b/recipes-security/optee/optee-nvsamples/0001-Update-makefiles-for-OE-builds.patch index b70a1f67..ac492633 100644 --- a/recipes-security/optee/optee-nvsamples/0001-Update-makefiles-for-OE-builds.patch +++ b/recipes-security/optee/optee-nvsamples/0001-Update-makefiles-for-OE-builds.patch @@ -20,10 +20,10 @@ Signed-off-by: Ilies CHERGUI luks-srv/host/Makefile | 14 +++++--------- 8 files changed, 17 insertions(+), 46 deletions(-) -diff --git a/Makefile b/Makefile -index da3f40b..7671e2d 100644 ---- a/Makefile -+++ b/Makefile +Index: samples/Makefile +=================================================================== +--- samples.orig/Makefile ++++ samples/Makefile @@ -4,8 +4,6 @@ # Input variables # CROSS_COMPILE: The cross compiler. @@ -49,10 +49,10 @@ index da3f40b..7671e2d 100644 O=$(O) \ clean || exit 1; \ done -diff --git a/cpubl-payload-dec/Makefile b/cpubl-payload-dec/Makefile -index 9912522..d84c5bd 100644 ---- a/cpubl-payload-dec/Makefile -+++ b/cpubl-payload-dec/Makefile +Index: samples/cpubl-payload-dec/Makefile +=================================================================== +--- samples.orig/cpubl-payload-dec/Makefile ++++ samples/cpubl-payload-dec/Makefile @@ -4,8 +4,6 @@ # Input variables # CROSS_COMPILE: The cross compiler. @@ -62,87 +62,10 @@ index 9912522..d84c5bd 100644 # O: The base directory for build objects filetree. TARGET_DIR := $(notdir $(shell pwd)) -diff --git a/ftpm-helper/Makefile b/ftpm-helper/Makefile -index 857dff0..b4fd52f 100644 ---- a/ftpm-helper/Makefile -+++ b/ftpm-helper/Makefile -@@ -4,8 +4,6 @@ - # Input variables - # CROSS_COMPILE: The cross compiler. - # TA_DEV_KIT_DIR: The base directory of the TA-devkit. --# OPTEE_CLIENT_EXPORT: The base directory points to optee client's --# header files and libraries - # O: The base directory for build objects filetree. - - TARGET_DIR := $(notdir $(shell pwd)) -@@ -18,7 +16,6 @@ all: - O=$(O)/early_ta/$(TARGET_DIR) - $(MAKE) -C host \ - CROSS_COMPILE=$(CROSS_COMPILE) \ -- OPTEE_CLIENT_EXPORT=$(OPTEE_CLIENT_EXPORT) \ - O=$(O)/ca/$(TARGET_DIR) \ - --no-builtin-variables - -@@ -29,7 +26,6 @@ clean: - O=$(O)/early_ta/$(TARGET_DIR) \ - clean - $(MAKE) -C host \ -- OPTEE_CLIENT_EXPORT=$(OPTEE_CLIENT_EXPORT) \ - O=$(O)/ca/$(TARGET_DIR) \ - clean - rm -rf $(O)/ca/$(TARGET_DIR) -diff --git a/ftpm-helper/host/Makefile b/ftpm-helper/host/Makefile -index 8f26a1f..9a3c845 100644 ---- a/ftpm-helper/host/Makefile -+++ b/ftpm-helper/host/Makefile -@@ -3,37 +3,33 @@ - - # Input variables - # CROSS_COMPILE: The cross compiler. --# OPTEE_CLIENT_EXPORT: The base directory points to optee client's --# header files and libraries - # O: The base directory for build objects filetree. - - CC ?= $(CROSS_COMPILE)gcc - STRIP ?= $(CROSS_COMPILE)strip - - CFLAGS += -Wall -I../ta/include -I./include --CFLAGS += -I$(OPTEE_CLIENT_EXPORT)/include - CFLAGS += -fstack-protector-strong --LDADD += -lteec -L$(OPTEE_CLIENT_EXPORT)/lib -+LDADD += -lteec - - SRCS = ftpm_helper_ca.c - OBJS = $(patsubst %.c,$(O)/%.o,$(SRCS)) - BINARY = nvftpm-helper-app - - .PHONY: all install --all: $(BINARY) install -+all: $(BINARY) - - $(BINARY): $(OBJS) -- $(CC) -o $(O)/$@ $< $(LDADD) -- $(STRIP) $(O)/$@ -+ $(CC) $(LDFLAGS) -o $(O)/$@ $< $(LDADD) - - $(O)/%.o: %.c - mkdir -p $(O) - $(CC) $(CFLAGS) -c $< -o $@ - - install: $(BINARY) -- mkdir -p $(OPTEE_CLIENT_EXPORT)/sbin -- cp $(O)/$(BINARY) $(OPTEE_CLIENT_EXPORT)/sbin -+ install -d $(DESTDIR)$(sbindir) -+ install -m 0755 $(O)/$(BINARY) $(DESTDIR)$(sbindir)/ - - .PHONY: clean - clean: -- rm -f $(OBJS) $(O)/$(BINARY) $(OPTEE_CLIENT_EXPORT)/sbin/$(BINARY) -+ rm -f $(OBJS) $(O)/$(BINARY) -diff --git a/hwkey-agent/Makefile b/hwkey-agent/Makefile -index 7deda53..6557e0a 100644 ---- a/hwkey-agent/Makefile -+++ b/hwkey-agent/Makefile +Index: samples/hwkey-agent/Makefile +=================================================================== +--- samples.orig/hwkey-agent/Makefile ++++ samples/hwkey-agent/Makefile @@ -4,8 +4,6 @@ # Input variables # CROSS_COMPILE: The cross compiler. @@ -168,10 +91,10 @@ index 7deda53..6557e0a 100644 O=$(O)/ca/$(TARGET_DIR) \ clean rm -rf $(O)/ca/$(TARGET_DIR) -diff --git a/hwkey-agent/host/Makefile b/hwkey-agent/host/Makefile -index b7c2113..0c02865 100644 ---- a/hwkey-agent/host/Makefile -+++ b/hwkey-agent/host/Makefile +Index: samples/hwkey-agent/host/Makefile +=================================================================== +--- samples.orig/hwkey-agent/host/Makefile ++++ samples/hwkey-agent/host/Makefile @@ -3,35 +3,32 @@ # Input variables @@ -214,10 +137,10 @@ index b7c2113..0c02865 100644 clean: - rm -f $(OBJS) $(O)/$(BINARY) $(OPTEE_CLIENT_EXPORT)/sbin/$(BINARY) + rm -f $(OBJS) $(O)/$(BINARY) -diff --git a/luks-srv/Makefile b/luks-srv/Makefile -index dd71d34..875e893 100644 ---- a/luks-srv/Makefile -+++ b/luks-srv/Makefile +Index: samples/luks-srv/Makefile +=================================================================== +--- samples.orig/luks-srv/Makefile ++++ samples/luks-srv/Makefile @@ -4,8 +4,6 @@ # Input variables # CROSS_COMPILE: The cross compiler. @@ -243,10 +166,10 @@ index dd71d34..875e893 100644 O=$(O)/ca/$(TARGET_DIR) \ clean rm -rf $(O)/early_ta/$(TARGET_DIR) -diff --git a/luks-srv/host/Makefile b/luks-srv/host/Makefile -index c9a2dcc..7b72181 100644 ---- a/luks-srv/host/Makefile -+++ b/luks-srv/host/Makefile +Index: samples/luks-srv/host/Makefile +=================================================================== +--- samples.orig/luks-srv/host/Makefile ++++ samples/luks-srv/host/Makefile @@ -3,8 +3,6 @@ # Input variables @@ -293,6 +216,3 @@ index c9a2dcc..7b72181 100644 clean: - rm -f $(OBJS) $(O)/$(BINARY) $(OPTEE_CLIENT_EXPORT)/sbin/$(BINARY) + rm -f $(OBJS) $(O)/$(BINARY) --- -2.34.1 - diff --git a/recipes-security/optee/optee-os-tadevkit_3.21.0-l4t-r36.3.0.bb b/recipes-security/optee/optee-os-tadevkit_3.22.0-l4t-r36.3.0.bb similarity index 100% rename from recipes-security/optee/optee-os-tadevkit_3.21.0-l4t-r36.3.0.bb rename to recipes-security/optee/optee-os-tadevkit_3.22.0-l4t-r36.3.0.bb diff --git a/recipes-security/optee/optee-os_3.21.0-l4t-r36.3.0.bb b/recipes-security/optee/optee-os_3.22.0-l4t-r36.3.0.bb similarity index 100% rename from recipes-security/optee/optee-os_3.21.0-l4t-r36.3.0.bb rename to recipes-security/optee/optee-os_3.22.0-l4t-r36.3.0.bb diff --git a/recipes-security/optee/optee-test_3.21.0-l4t-r36.3.0.bb b/recipes-security/optee/optee-test_3.22.0-l4t-r36.3.0.bb similarity index 100% rename from recipes-security/optee/optee-test_3.21.0-l4t-r36.3.0.bb rename to recipes-security/optee/optee-test_3.22.0-l4t-r36.3.0.bb