scottk/meta-tegra
1
0
Fork 0
mirror of https://github.com/lingble/meta-tegra.git synced 2025-10-30 20:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

optee: update recipes for L4T R36.3.0

Browse Source 
- 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 <matt@madison.systems>
This commit is contained in:
Matt Madison
2024-05-03 13:15:48 -07:00
parent f68de0317d
commit 42c22a5791
6 changed files with 46 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
recipes-security/optee/optee-client/0001-Update-Makefile-for-OE-compatibility.patch
View File

@@ -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 <matt@madison.systems> From: Matt Madison <matt@madison.systems>
Date: Thu, 26 Jan 2023 04:22:34 -0800 Date: Thu, 26 Jan 2023 04:22:34 -0800
Subject: [PATCH] Update Makefile for OE compatibility Subject: [PATCH] Update Makefile for OE compatibility
@@ -7,14 +7,14 @@ Subject: [PATCH] Update Makefile for OE compatibility
Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Matt Madison <matt@madison.systems>
--- ---
optee/optee_client/Makefile | 36 ++++++++++++++++++------------------ optee/optee_client/Makefile | 39 ++++++++++++++++++++++---------------
1 file changed, 18 insertions(+), 18 deletions(-) 1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/optee/optee_client/Makefile b/optee/optee_client/Makefile 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 --- a/optee/optee_client/Makefile
+++ b/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 distclean: clean
copy_export: build copy_export: build
@@ -27,15 +27,6 @@ index de1e14f..09e7db9 100644
- cp libckteec/include/*.h $(DESTDIR)$(includedir) - cp libckteec/include/*.h $(DESTDIR)$(includedir)
- cp -d ${O}/libckteec/libckteec.so* $(DESTDIR)$(libdir) - cp -d ${O}/libckteec/libckteec.so* $(DESTDIR)$(libdir)
- cp -d ${O}/libckteec/libckteec.a $(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 -d $(DESTDIR)$(sbindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+ install -m 0644 config.mk $(DESTDIR)/$(includedir)/optee_client_config.mk + install -m 0644 config.mk $(DESTDIR)/$(includedir)/optee_client_config.mk
+ install -m 0644 ${O}/libteec/libteec.so.1.0.0 $(DESTDIR)$(libdir) + 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.1
+ ln -sf libckteec.so.0.1.0 $(DESTDIR)$(libdir)/libckteec.so.0 + ln -sf libckteec.so.0.1.0 $(DESTDIR)$(libdir)/libckteec.so.0
+ install -m 0644 ${O}/libckteec/libckteec.a $(DESTDIR)$(libdir) + 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 libseteec/include/*.h $(DESTDIR)$(includedir)
+ install -m 0644 ${O}/libseteec/libseteec.so.0.1.0 $(DESTDIR)$(libdir) + 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.1
+ ln -sf libseteec.so.0.1.0 $(DESTDIR)$(libdir)/libseteec.so.0 + ln -sf libseteec.so.0.1.0 $(DESTDIR)$(libdir)/libseteec.so.0
+ install -m 0644 ${O}/libseteec/libseteec.a $(DESTDIR)$(libdir) + install -m 0644 ${O}/libseteec/libseteec.a $(DESTDIR)$(libdir)
+
-- --
2.34.1 2.34.1

6
recipes-security/optee/optee-client_3.21.0-l4t-r36.3.0.bb → recipes-security/optee/optee-client_3.22.0-l4t-r36.3.0.bb
View File

@@ -16,16 +16,16 @@ SRC_URI += "\
file://tee-supplicant.sh.in \ file://tee-supplicant.sh.in \
" "
DEPENDS = "optee-os-tadevkit" DEPENDS = "optee-os-tadevkit util-linux-libuuid"
S = "${WORKDIR}/optee_client" S = "${WORKDIR}/optee_client"
B = "${WORKDIR}/build" B = "${WORKDIR}/build"
inherit systemd update-rc.d inherit pkgconfig systemd update-rc.d
OPTEE_FS_PARENT_PATH ?= "${localstatedir}/lib/tee" 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() { do_compile() {
oe_runmake -C ${S} build oe_runmake -C ${S} build

128
recipes-security/optee/optee-nvsamples/0001-Update-makefiles-for-OE-builds.patch
View File

@@ -20,10 +20,10 @@ Signed-off-by: Ilies CHERGUI <ichergui@nvidia.com>
luks-srv/host/Makefile | 14 +++++--------- luks-srv/host/Makefile | 14 +++++---------
8 files changed, 17 insertions(+), 46 deletions(-) 8 files changed, 17 insertions(+), 46 deletions(-)
diff --git a/Makefile b/Makefile Index: samples/Makefile
index da3f40b..7671e2d 100644 ===================================================================
--- a/Makefile --- samples.orig/Makefile
+++ b/Makefile +++ samples/Makefile
@@ -4,8 +4,6 @@ @@ -4,8 +4,6 @@
# Input variables # Input variables
# CROSS_COMPILE: The cross compiler. # CROSS_COMPILE: The cross compiler.
@@ -49,10 +49,10 @@ index da3f40b..7671e2d 100644
O=$(O) \ O=$(O) \
clean || exit 1; \ clean || exit 1; \
done done
diff --git a/cpubl-payload-dec/Makefile b/cpubl-payload-dec/Makefile Index: samples/cpubl-payload-dec/Makefile
index 9912522..d84c5bd 100644 ===================================================================
--- a/cpubl-payload-dec/Makefile --- samples.orig/cpubl-payload-dec/Makefile
+++ b/cpubl-payload-dec/Makefile +++ samples/cpubl-payload-dec/Makefile
@@ -4,8 +4,6 @@ @@ -4,8 +4,6 @@
# Input variables # Input variables
# CROSS_COMPILE: The cross compiler. # CROSS_COMPILE: The cross compiler.
@@ -62,87 +62,10 @@ index 9912522..d84c5bd 100644
# O: The base directory for build objects filetree. # O: The base directory for build objects filetree.
TARGET_DIR := $(notdir $(shell pwd)) TARGET_DIR := $(notdir $(shell pwd))
diff --git a/ftpm-helper/Makefile b/ftpm-helper/Makefile Index: samples/hwkey-agent/Makefile
index 857dff0..b4fd52f 100644 ===================================================================
--- a/ftpm-helper/Makefile --- samples.orig/hwkey-agent/Makefile
+++ b/ftpm-helper/Makefile +++ samples/hwkey-agent/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
@@ -4,8 +4,6 @@ @@ -4,8 +4,6 @@
# Input variables # Input variables
# CROSS_COMPILE: The cross compiler. # CROSS_COMPILE: The cross compiler.
@@ -168,10 +91,10 @@ index 7deda53..6557e0a 100644
O=$(O)/ca/$(TARGET_DIR) \ O=$(O)/ca/$(TARGET_DIR) \
clean clean
rm -rf $(O)/ca/$(TARGET_DIR) rm -rf $(O)/ca/$(TARGET_DIR)
diff --git a/hwkey-agent/host/Makefile b/hwkey-agent/host/Makefile Index: samples/hwkey-agent/host/Makefile
index b7c2113..0c02865 100644 ===================================================================
--- a/hwkey-agent/host/Makefile --- samples.orig/hwkey-agent/host/Makefile
+++ b/hwkey-agent/host/Makefile +++ samples/hwkey-agent/host/Makefile
@@ -3,35 +3,32 @@ @@ -3,35 +3,32 @@
# Input variables # Input variables
@@ -214,10 +137,10 @@ index b7c2113..0c02865 100644
clean: clean:
- rm -f $(OBJS) $(O)/$(BINARY) $(OPTEE_CLIENT_EXPORT)/sbin/$(BINARY) - rm -f $(OBJS) $(O)/$(BINARY) $(OPTEE_CLIENT_EXPORT)/sbin/$(BINARY)
+ rm -f $(OBJS) $(O)/$(BINARY) + rm -f $(OBJS) $(O)/$(BINARY)
diff --git a/luks-srv/Makefile b/luks-srv/Makefile Index: samples/luks-srv/Makefile
index dd71d34..875e893 100644 ===================================================================
--- a/luks-srv/Makefile --- samples.orig/luks-srv/Makefile
+++ b/luks-srv/Makefile +++ samples/luks-srv/Makefile
@@ -4,8 +4,6 @@ @@ -4,8 +4,6 @@
# Input variables # Input variables
# CROSS_COMPILE: The cross compiler. # CROSS_COMPILE: The cross compiler.
@@ -243,10 +166,10 @@ index dd71d34..875e893 100644
O=$(O)/ca/$(TARGET_DIR) \ O=$(O)/ca/$(TARGET_DIR) \
clean clean
rm -rf $(O)/early_ta/$(TARGET_DIR) rm -rf $(O)/early_ta/$(TARGET_DIR)
diff --git a/luks-srv/host/Makefile b/luks-srv/host/Makefile Index: samples/luks-srv/host/Makefile
index c9a2dcc..7b72181 100644 ===================================================================
--- a/luks-srv/host/Makefile --- samples.orig/luks-srv/host/Makefile
+++ b/luks-srv/host/Makefile +++ samples/luks-srv/host/Makefile
@@ -3,8 +3,6 @@ @@ -3,8 +3,6 @@
# Input variables # Input variables
@@ -293,6 +216,3 @@ index c9a2dcc..7b72181 100644
clean: clean:
- rm -f $(OBJS) $(O)/$(BINARY) $(OPTEE_CLIENT_EXPORT)/sbin/$(BINARY) - rm -f $(OBJS) $(O)/$(BINARY) $(OPTEE_CLIENT_EXPORT)/sbin/$(BINARY)
+ rm -f $(OBJS) $(O)/$(BINARY) + rm -f $(OBJS) $(O)/$(BINARY)
--
2.34.1

0
recipes-security/optee/optee-os-tadevkit_3.21.0-l4t-r36.3.0.bb → recipes-security/optee/optee-os-tadevkit_3.22.0-l4t-r36.3.0.bb
View File

0
recipes-security/optee/optee-os_3.21.0-l4t-r36.3.0.bb → recipes-security/optee/optee-os_3.22.0-l4t-r36.3.0.bb
View File

0
recipes-security/optee/optee-test_3.21.0-l4t-r36.3.0.bb → recipes-security/optee/optee-test_3.22.0-l4t-r36.3.0.bb
View File