arm-bsp/trusted-services: rename bbappends with git version
PATCH 1/2 arm-bsp/trusted-services: rename bbappends with git version
"git" is the version and need not be part of the bbappend name. Since this isn't being done in any other part of meta-arm-bsp (and not uniformly in the same directory), rename the bbappends to have the % wild card.
---
.../trusted-services/{libts_git.bbappend => libts_%.bbappend} | 0
...to-api-test_git.bbappend => ts-psa-crypto-api-test_%.bbappend} | 0
...a-iat-api-test_git.bbappend => ts-psa-iat-api-test_%.bbappend} | 0
...a-its-api-test_git.bbappend => ts-psa-its-api-test_%.bbappend} | 0
...psa-ps-api-test_git.bbappend => ts-psa-ps-api-test_%.bbappend} | 0
5 files changed, 0 insertions(+), 0 deletions(-)
rename meta-arm-bsp/recipes-security/trusted-services/{libts_git.bbappend => libts_%.bbappend} (100%)
rename meta-arm-bsp/recipes-security/trusted-services/{ts-psa-crypto-api-test_git.bbappend => ts-psa-crypto-api-test_%.bbappend} (100%)
rename meta-arm-bsp/recipes-security/trusted-services/{ts-psa-iat-api-test_git.bbappend => ts-psa-iat-api-test_%.bbappend} (100%)
rename meta-arm-bsp/recipes-security/trusted-services/{ts-psa-its-api-test_git.bbappend => ts-psa-its-api-test_%.bbappend} (100%)
rename meta-arm-bsp/recipes-security/trusted-services/{ts-psa-ps-api-test_git.bbappend => ts-psa-ps-api-test_%.bbappend} (100%)meta-arm-bsp/recipes-security/trusted-services/libts_%.bbappend renamed from meta-arm-bsp/recipes-security/trusted-services/libts_git.bbappend +0 -0
meta-arm-bsp/recipes-security/trusted-services/ts-psa-crypto-api-test_%.bbappend renamed from meta-arm-bsp/recipes-security/trusted-services/ts-psa-crypto-api-test_git.bbappend +0 -0
meta-arm-bsp/recipes-security/trusted-services/ts-psa-iat-api-test_%.bbappend renamed from meta-arm-bsp/recipes-security/trusted-services/ts-psa-iat-api-test_git.bbappend +0 -0
meta-arm-bsp/recipes-security/trusted-services/ts-psa-its-api-test_%.bbappend renamed from meta-arm-bsp/recipes-security/trusted-services/ts-psa-its-api-test_git.bbappend +0 -0
meta-arm-bsp/recipes-security/trusted-services/ts-psa-ps-api-test_%.bbappend renamed from meta-arm-bsp/recipes-security/trusted-services/ts-psa-ps-api-test_git.bbappend +0 -0
Signature · 1 line
2.17.1
PATCH 2/2 arm/trusted-services: limit the ts compatible machines
World builds are trying to build trusted services, which has a dependency on meta-python. To avoid having to add a layer dependency for meta-arm on meta-python, limit the compatible machines to the ones using it (which already have a meta-python dependency).
---
.../packagegroups/packagegroup-ts-tests.bbappend | 1 +
.../recipes-security/trusted-services/libts_%.bbappend | 2 +-
.../{ts-corstone1000.inc => ts-arm-platforms.inc} | 4 +++-
.../recipes-security/trusted-services/ts-demo_%.bbappend | 4 ++++
.../recipes-security/trusted-services/ts-newlib_%.bbappend | 5 +++--
.../recipes-security/trusted-services/ts-psa-api-test.inc | 2 +-
.../trusted-services/ts-service-test_%.bbappend | 4 ++++
.../trusted-services/ts-sp-se-proxy_%.bbappend | 2 +-
.../trusted-services/ts-sp-smm-gateway_%.bbappend | 2 +-
.../trusted-services/ts-uefi-test_%.bbappend | 4 ++++
.../recipes-security/packagegroups/packagegroup-ts-tests.bb | 2 ++
.../recipes-security/trusted-services/trusted-services.inc | 2 ++
12 files changed, 27 insertions(+), 7 deletions(-)
create mode 100644 meta-arm-bsp/recipes-security/packagegroups/packagegroup-ts-tests.bbappend
rename meta-arm-bsp/recipes-security/trusted-services/{ts-corstone1000.inc => ts-arm-platforms.inc} (94%)
create mode 100644 meta-arm-bsp/recipes-security/trusted-services/ts-demo_%.bbappend
create mode 100644 meta-arm-bsp/recipes-security/trusted-services/ts-service-test_%.bbappend
create mode 100644 meta-arm-bsp/recipes-security/trusted-services/ts-uefi-test_%.bbappendmeta-arm-bsp/recipes-security/packagegroups/packagegroup-ts-tests.bbappend new file +1 -0
@@ -0,0 +1 @@ +COMPATIBLE_MACHINE:corstone1000 = "corstone1000"
meta-arm-bsp/recipes-security/trusted-services/libts_%.bbappend +1 -1
@@ -1,5 +1,5 @@ MACHINE_TS_REQUIRE ?= "" -MACHINE_TS_REQUIRE:corstone1000 = "ts-corstone1000.inc" +MACHINE_TS_REQUIRE:corstone1000 = "ts-arm-platforms.inc" require ${MACHINE_TS_REQUIRE}
meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc renamed from meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc +3 -1
@@ -1,4 +1,6 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/corstone1000:" +FILESEXTRAPATHS:prepend:corstone1000 := "${THISDIR}/corstone1000:" + +COMPATIBLE_MACHINE:corstone1000 = "corstone1000" SRC_URI:append:corstone1000 = " \ file://0001-Add-openamp-to-SE-proxy-deployment.patch;patchdir=../trusted-services \
meta-arm-bsp/recipes-security/trusted-services/ts-demo_%.bbappend new file +4 -0
@@ -0,0 +1,4 @@ +MACHINE_TS_REQUIRE ?= "" +MACHINE_TS_REQUIRE:corstone1000 = "ts-arm-platforms.inc" + +require ${MACHINE_TS_REQUIRE}
meta-arm-bsp/recipes-security/trusted-services/ts-newlib_%.bbappend +3 -2
@@ -1,6 +1,7 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/corstone1000/${PN}:" +FILESEXTRAPATHS:prepend:corstone1000 := "${THISDIR}/corstone1000/${PN}:" + +COMPATIBLE_MACHINE:corstone1000 = "corstone1000" SRC_URI:append:corstone1000 = " \ file://0001-newlib-memcpy-remove-optimized-version.patch;patchdir=../newlib \ " -
meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc +1 -1
@@ -1,6 +1,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/corstone1000/psa-apitest:" -include ts-corstone1000.inc +include ts-arm-platforms.inc SRC_URI:append:corstone1000 = " \ file://0001-corstone1000-port-crypto-config.patch;patchdir=../psatest \
meta-arm-bsp/recipes-security/trusted-services/ts-service-test_%.bbappend new file +4 -0
@@ -0,0 +1,4 @@ +MACHINE_TS_REQUIRE ?= "" +MACHINE_TS_REQUIRE:corstone1000 = "ts-arm-platforms.inc" + +require ${MACHINE_TS_REQUIRE}
meta-arm-bsp/recipes-security/trusted-services/ts-sp-se-proxy_%.bbappend +1 -1
@@ -1,5 +1,5 @@ MACHINE_TS_REQUIRE ?= "" -MACHINE_TS_REQUIRE:corstone1000 = "ts-corstone1000.inc" +MACHINE_TS_REQUIRE:corstone1000 = "ts-arm-platforms.inc" require ${MACHINE_TS_REQUIRE}
meta-arm-bsp/recipes-security/trusted-services/ts-sp-smm-gateway_%.bbappend +1 -1
@@ -1,5 +1,5 @@ MACHINE_TS_REQUIRE ?= "" -MACHINE_TS_REQUIRE:corstone1000 = "ts-corstone1000.inc" +MACHINE_TS_REQUIRE:corstone1000 = "ts-arm-platforms.inc" require ${MACHINE_TS_REQUIRE}
meta-arm-bsp/recipes-security/trusted-services/ts-uefi-test_%.bbappend new file +4 -0
@@ -0,0 +1,4 @@ +MACHINE_TS_REQUIRE ?= "" +MACHINE_TS_REQUIRE:corstone1000 = "ts-arm-platforms.inc" + +require ${MACHINE_TS_REQUIRE}
meta-arm/recipes-security/packagegroups/packagegroup-ts-tests.bb +2 -0
@@ -5,6 +5,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup COMPATIBLE_HOST = "aarch64.*-linux" +COMPATIBLE_MACHINE ?= "invalid" +COMPATIBLE_MACHINE:qemuarm64-secureboot = "qemuarm64-secureboot" PACKAGES = "${PN} ${PN}-psa"
meta-arm/recipes-security/trusted-services/trusted-services.inc +2 -0
@@ -6,6 +6,8 @@ LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib" inherit python3native cmake COMPATIBLE_HOST = "aarch64.*-linux" +COMPATIBLE_MACHINE ?= "invalid" +COMPATIBLE_MACHINE:qemuarm64-secureboot = "qemuarm64-secureboot" require trusted-services-src.inc
Signature · 1 line
2.17.1
Jon Mason
AppliedQuoted 4 lines · Jon Mason
"git" is the version and need not be part of the bbappend name. Since this isn't being done in any other part of meta-arm-bsp (and not uniformly in the same directory), rename the bbappends to have the % wild card.
Applied, thanks!
[1/2] arm-bsp/trusted-services: rename bbappends with git version
commit: a68a2a206eeb1427b4217b8831439cbe56341a14
[2/2] arm/trusted-services: limit the ts compatible machines
commit: 7b4c17632d07044c1a580a90f20a2dbca3310fe6Best regards,
Signature · 1 line
Jon Mason <[email protected]>
Jon Mason
AppliedQuoted 4 lines · Jon Mason
"git" is the version and need not be part of the bbappend name. Since this isn't being done in any other part of meta-arm-bsp (and not uniformly in the same directory), rename the bbappends to have the % wild card.
Applied, thanks!
[1/2] arm-bsp/trusted-services: rename bbappends with git version
commit: a68a2a206eeb1427b4217b8831439cbe56341a14
[2/2] arm/trusted-services: limit the ts compatible machines
commit: 7b4c17632d07044c1a580a90f20a2dbca3310fe6Best regards,
Signature · 1 line
Jon Mason <[email protected]>