optee: migration 4.2.0 to 4.4.0 #1588
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
optee-test does not build, needs license changes. |
|
License is the same, but upstream changed the license URL, which causes a different chksum. |
|
There are also a few other changes that will be required, like syncing the general recipe updates done at https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee (which also includes this LIC_FILES change), and switching to the tee-supplicant file from optee-client upstream (and fixing the missing user). |
optee-os+fio: [email protected]:OP-TEE/optee_os.git tag: 4.4.0 optee-os+fio-imx: [email protected]:nxp-imx/imx-optee-os.git tag: lf-6.6.52-2.2.0 Tests: MACHINE=qemuarm64-secureboot xtest regression and pkcs11 39990 subtests of which 0 failed 137 test cases of which 0 failed 0 test cases were skipped Signed-off-by: Jorge Ramirez-Ortiz <[email protected]> Tested-by: Jorge Ramirez-Ortiz <[email protected]>
|
After the update. xtests for qemuarm64-secureboot: |
|
@rsalveti can the supplicant update to upstream wait after scarthgap - ie, can we merge as is? |
|
to accelerate things as per our follow up I updated to synch with meta-arm. I cant understand why inheriting from
|
meta-arm tip at: commit 7c2df809e0e27f271cc28b4a2631929985f0c8f7 Author: Jon Mason <[email protected]> Date: 7 days ago MACHINE: qemuarm64-secureboot xtest: 39995 subtests of which 0 failed 137 test cases of which 0 failed 0 test cases were skipped Signed-off-by: Jorge Ramirez-Ortiz <[email protected]> Tested-by: Jorge Ramirez-Ortiz <[email protected]>
| @@ -5,13 +5,15 @@ HOMEPAGE = "https://www.op-tee.org/" | |||
| LICENSE = "BSD-2-Clause" | |||
| LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b" | |||
|
|
|||
| inherit systemd cmake pkgconfig | |||
| inherit systemd cmake pkgconfig useradd_base | |||
There was a problem hiding this comment.
I have found some little differences from the one in meta-arm
--- a/meta-lmp-base/recipes-security/optee/optee-client-fio.inc
+++ b/meta-lmp-base/recipes-security/optee/optee-client-fio.inc
@@ -5,9 +5,7 @@ HOMEPAGE = "https://www.op-tee.org/"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://license/;md5=69663ab153298557a59c67a60a743e5b"
-inherit systemd cmake pkgconfig useradd_base
-
-DEPENDS = "util-linux-libuuid"
+inherit systemd update-rc.d cmake useradd
SRC_URI = " \
git://github.com/OP-TEE/optee_client.git;protocol=https;branch=master \
@@ -22,8 +20,7 @@ S = "${WORKDIR}/git"
EXTRA_OECMAKE = " \
-DBUILD_SHARED_LIBS=ON \
- -DRPMB_EMU=OFF \
- -DCFG_TEE_FS_PARENT_PATH='${localstatedir}/tee' \
+ -DCFG_TEE_FS_PARENT_PATH='${localstatedir}/lib/tee' \
"
EXTRA_OECMAKE:append:toolchain-clang = " -DCFG_WERROR=0"There was a problem hiding this comment.
I dont think we want to change the CFG_TEE_FS_PARENT_PATH. And we need uuid for sysroot AFAIR.
I tried a clean local build with useradd and still wont work for me. maybe I need to clear the cache...
There was a problem hiding this comment.
to fix the version issue another patch is needed
--- a/meta-lmp-base/files/lmp-group-table
+++ b/meta-lmp-base/files/lmp-group-table
@@ -50,6 +50,7 @@ shutdown:x:70:
nobody:*:99:
users:x:100:
pulse:x:171:
+teeclnt:x:967:
ptest:x:968:
sgx:x:969:
lpadmin:x:970:
There was a problem hiding this comment.
amazing! I was wondering how it could work without that group - I dont see it created and yet the service was being started. ok thanks, I'll fix.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
optee-os+fio:
[email protected]:OP-TEE/optee_os.git
tag: 4.4.0
optee-os+fio-imx:
[email protected]:nxp-imx/imx-optee-os.git
tag: lf-6.6.52-2.2.0
Tests: MACHINE=qemuarm64-secureboot
xtest regression and pkcs11
39990 subtests of which 0 failed
137 test cases of which 0 failed
0 test cases were skipped