arm/fvp: use image-artifact-names as an image class
PATCH 1/3 arm/fvp: use image-artifact-names as an image class
Per upstream commit, image-artifact-names must be used as an image class
Signed-off-by Jon Mason <[email protected]>
--- meta-arm/classes/fvpboot.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm/classes/fvpboot.bbclass +1 -1
@@ -26,7 +26,7 @@ FVP_EXTRA_ARGS ?= "" EXTRA_IMAGEDEPENDS += "${FVP_PROVIDER}" -inherit image-artifact-names +IMAGE_CLASSES += "image-artifact-names" IMAGE_POSTPROCESS_COMMAND += "do_write_fvpboot_conf;" python do_write_fvpboot_conf() {
Signature · 1 line
2.17.1
PATCH 2/3 atp/atp: drop package inherits
Signed-off-by Jon Mason <[email protected]>
--- meta-atp/recipes-kernel/atp/atp-test_3.1.bb | 1 - meta-atp/recipes-kernel/atp/atp-uapi_3.1.bb | 1 - 2 files changed, 2 deletions(-)
meta-atp/recipes-kernel/atp/atp-test_3.1.bb +0 -1
@@ -1,5 +1,4 @@ require recipes-devtools/atp/atp-source_3.1.inc -inherit package SUMMARY = "End-to-end tests evaluating ATP kernel modules service correctness" SECTION = "kernel/userland"
meta-atp/recipes-kernel/atp/atp-uapi_3.1.bb +0 -1
@@ -1,5 +1,4 @@ require recipes-devtools/atp/atp-source_3.1.inc -inherit package SUMMARY = "User API for accessing services from ATP kernel modules" SECTION = "kernel/userland"
Signature · 1 line
2.17.1
PATCH 3/3 arm/optee: Update to 3.18
In reply to Jon MasonUpdate all of the 3.17 recipes to 3.18 and remove the already upstreamed patch. optee-os was already at 3.18. So, we only need to remove the 3.17 recipe.
Signed-off-by Jon Mason <[email protected]>
---
.../recipes-security/optee/optee-examples.inc | 2 +-
...ix-non-portable-sh-check-for-plugins.patch | 46 -------------------
.../optee/optee-examples_3.17.0.bb | 3 --
.../optee/optee-examples_3.18.0.bb | 3 ++
..._3.17.0.bb => optee-os-tadevkit_3.18.0.bb} | 2 +-
.../recipes-security/optee/optee-os_3.17.0.bb | 5 --
...ee-test_3.17.0.bb => optee-test_3.18.0.bb} | 2 +-
7 files changed, 6 insertions(+), 57 deletions(-)
delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch
delete mode 100644 meta-arm/recipes-security/optee/optee-examples_3.17.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-examples_3.18.0.bb
rename meta-arm/recipes-security/optee/{optee-os-tadevkit_3.17.0.bb => optee-os-tadevkit_3.18.0.bb} (95%)
delete mode 100644 meta-arm/recipes-security/optee/optee-os_3.17.0.bb
rename meta-arm/recipes-security/optee/{optee-test_3.17.0.bb => optee-test_3.18.0.bb} (83%)meta-arm/recipes-security/optee/optee-examples.inc +1 -1
@@ -12,7 +12,7 @@ inherit python3native require optee.inc SRC_URI = "git://github.com/linaro-swg/optee_examples.git;branch=master;protocol=https \ - file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch" + " EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ HOST_CROSS_COMPILE=${HOST_PREFIX} \
meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch deleted +0 -46
46 lines not on this page · raw message
meta-arm/recipes-security/optee/optee-examples_3.17.0.bb deleted +0 -3
@@ -1,3 +0,0 @@ -require optee-examples.inc - -SRCREV = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
meta-arm/recipes-security/optee/optee-examples_3.18.0.bb new file +3 -0
@@ -0,0 +1,3 @@ +require optee-examples.inc + +SRCREV = "f301ee9df2129c0db683e726c91dc2cefe4cdb65"
meta-arm/recipes-security/optee/optee-os-tadevkit_3.18.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.17.0.bb +1 -1
@@ -1,5 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:" -require optee-os_3.17.0.bb +require optee-os_3.18.0.bb SUMMARY = "OP-TEE Trusted OS TA devkit" DESCRIPTION = "OP-TEE TA devkit for build TAs"
meta-arm/recipes-security/optee/optee-os_3.17.0.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require optee-os.inc - -SRCREV = "f9e550142dd4b33ee1112f5dd64ffa94ba79cefa" - -DEPENDS += "dtc-native"
meta-arm/recipes-security/optee/optee-test_3.18.0.bb renamed from meta-arm/recipes-security/optee/optee-test_3.17.0.bb +1 -1
@@ -3,7 +3,7 @@ require optee-test.inc SRC_URI:append = " \ file://musl-workaround.patch \ " -SRCREV = "44a31d02379bd8e50762caa5e1592ad81e3339af" +SRCREV = "da5282a011b40621a2cf7a296c11a35c833ed91b" EXTRA_OEMAKE:append:libc-musl = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}" DEPENDS:append:libc-musl = " openssl"
Signature · 1 line
2.17.1
Jon Mason
AppliedQuoted 2 lines · Jon Mason
Per upstream commit, image-artifact-names must be used as an image class
Applied, thanks!
[1/3] arm/fvp: use image-artifact-names as an image class
commit: 98c515f42ee6a6f145d95a3bd7032bbff0f62bd3
[2/3] atp/atp: drop package inherits
commit: 8058beeec1ae5c63051bbc1828815151a09e24d9
[3/3] arm/optee: Update to 3.18
commit: ba502ba11e60b310becb45e9abef9e1655354625Best regards,
Signature · 1 line
Jon Mason <[email protected]>