MIRRORS/meta-freescale
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-freescale.git synced 2025-10-22 23:02:20 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

optee-client-qoriq: Upgrade 3.13.0 -> 4.6.0

Browse Source 
Update from LF6.12.20-2.0.0

Signed-off-by: Zelan Zou <zelan.zou@nxp.com>
(cherry picked from commit 14ba349001)
This commit is contained in:
Zelan Zou 2025-09-01 14:18:50 +08:00 committed by Hiago De Franco
parent 9658bf55a3
commit 9dd0601573
4 changed files with 18 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
recipes-security/optee-qoriq/optee-client-qoriq_3.13.0.bb
View File

@ -1,5 +0,0 @@
require optee-client.nxp.inc
PV:append = "+git${SRCPV}"
COMPATIBLE_MACHINE = "(qoriq-arm64)"

4
recipes-security/optee-qoriq/optee-client-qoriq_4.6.0.bb Normal file
View File

@ -0,0 +1,4 @@
require optee-client.nxp.inc
OPTEE_CLIENT_BRANCH = "lf-6.12.20_2.0.0"
SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"

58
recipes-security/optee-qoriq/optee-client.nxp.inc
View File

@ -1,53 +1,23 @@
# Copyright 2020-2021 NXP # Copyright 2020-2021,2025 NXP
SUMMARY = "OPTEE Client libs" require recipes-security/optee-imx/optee-client-fslc.inc
HOMEPAGE = "http://www.optee.org/"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
inherit python3native systemd # The patch same as imx-optee, so point FILESEXTRAPATHS to optee-imx/optee-client,
# avoid duplicate copy files to optee-qoriq
FILESEXTRAPATHS:prepend := "${THISDIR}/../optee-imx/optee-client:"
SRC_URI = "git://github.com/nxp-qoriq/optee_client.git;protocol=https;nobranch=1" DEPENDS = "util-linux-libuuid"
SRCREV = "7c9c423d00e96bf51debd5fe10fd70dce83be5cc"
FILESEXTRAPATHS:prepend := "${THISDIR}/optee-client:" SRC_URI:remove = "git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https"
SRC_URI += "file://tee-supplicant.service" SRC_URI:prepend = "${OPTEE_CLIENT_SRC};branch=${OPTEE_CLIENT_BRANCH} "
OPTEE_CLIENT_SRC ?= "git://github.com/nxp-qoriq/optee_client.git;protocol=https"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
OPTEE_ARCH ?= "arm32" inherit pkgconfig
OPTEE_ARCH:armv7a = "arm32"
OPTEE_ARCH:aarch64 = "arm64"
EXTRA_OEMAKE = "ARCH=${OPTEE_ARCH} O=${B}" do_install:append () {
if ! ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
do_install () { rm -rf ${D}${libdir}/systemd
oe_runmake -C ${S} install fi
install -d ${D}${libdir}/
install -p -m0644 ${B}/export${libdir}/libteec.so.1.0.0 ${D}${libdir}/
ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1.0
ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1
ln -sf libteec.so.1 ${D}${libdir}/libteec.so
install -D -p -m0644 ${B}/export/usr/lib/libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0.1.0
ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0.1
ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0
ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so
install -D -p -m0755 ${B}/export/usr/sbin/tee-supplicant ${D}${bindir}/tee-supplicant
cp -a ${B}/export/usr/include ${D}${includedir}
install -d ${D}${systemd_system_unitdir}/
install -m0644 ${UNPACKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/
sed -i -e s:/etc:${sysconfdir}:g -e s:/usr/bin:${bindir}:g ${D}${systemd_system_unitdir}/tee-supplicant.service
} }
SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
FILES:${PN} += "${libdir}/* ${includedir}/*"
INSANE_SKIP:${PN} = "ldflags dev-elf"
INSANE_SKIP:${PN}-dev = "ldflags dev-elf"

11
recipes-security/optee-qoriq/optee-client/tee-supplicant.service
View File

@ -1,11 +0,0 @@
[Unit]
Description=TEE Supplicant
[Service]
User=root
EnvironmentFile=-/etc/default/tee-supplicant
ExecStart=/usr/bin/tee-supplicant $OPTARGS
[Install]
WantedBy=basic.target