mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-31 12:50:02 +00:00
Code Issues Projects Releases Wiki Activity

meta-arm/trusted-services: Use GCC toolchain for specific TS recipes only.

Browse Source 
This commit also enables clang CI pipelines for TS.

Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Anton Antonov
2022-10-04 16:56:46 +01:00
committed by Jon Mason
parent 38a3facd90
commit 00bd768ab7
6 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+2 -1
View File
@@ -157,7 +157,8 @@ qemuarm64-secureboot-ts:
extends: .build extends: .build
parallel: parallel:
matrix: matrix:
- TCLIBC: [glibc, musl] - TOOLCHAINS: [gcc, clang]
TCLIBC: [glibc, musl]
TESTING: testimage TESTING: testimage
qemuarm64: qemuarm64:
meta-arm/recipes-security/trusted-services/trusted-services.inc
-2
View File
@@ -50,5 +50,3 @@ EXTRA_OECMAKE += "${@oe.utils.conditional('TS_ENV', 'opteesp', \
EXTRA_OECMAKE += "-Dlibts_DIR=${STAGING_DIR_HOST}${TS_INSTALL}/lib/cmake/ \ EXTRA_OECMAKE += "-Dlibts_DIR=${STAGING_DIR_HOST}${TS_INSTALL}/lib/cmake/ \
-DNEWLIB_INSTALL_DIR=${STAGING_DIR_HOST}${TS_INSTALL}/newlib_install \ -DNEWLIB_INSTALL_DIR=${STAGING_DIR_HOST}${TS_INSTALL}/newlib_install \
" "
# Newlib does not compile with clang
TOOLCHAIN = "gcc"
meta-arm/recipes-security/trusted-services/ts-demo_git.bb
+4
View File
@@ -11,6 +11,10 @@ RDEPENDS:${PN} += "libts"
OECMAKE_SOURCEPATH="${S}/deployments/ts-demo/${TS_ENV}" OECMAKE_SOURCEPATH="${S}/deployments/ts-demo/${TS_ENV}"
# Mbedtls 3.1.0 does not compile with clang.
# This can be removed after TS updated required mbedtls version
TOOLCHAIN = "gcc"
FILES:${PN} = "${bindir}/ts-demo" FILES:${PN} = "${bindir}/ts-demo"
do_install:append () { do_install:append () {
meta-arm/recipes-security/trusted-services/ts-newlib_4.1.0.bb
+3
View File
@@ -13,6 +13,9 @@ SRC_URI += "git://sourceware.org/git/newlib-cygwin.git;name=newlib;protocol=http
SRCREV_newlib = "415fdd4279b85eeec9d54775ce13c5c412451e08" SRCREV_newlib = "415fdd4279b85eeec9d54775ce13c5c412451e08"
LIC_FILES_CHKSUM += "file://../newlib/COPYING.NEWLIB;md5=b8dda70da54e0efb49b1074f349d7749" LIC_FILES_CHKSUM += "file://../newlib/COPYING.NEWLIB;md5=b8dda70da54e0efb49b1074f349d7749"
# Newlib does not compile with clang
TOOLCHAIN = "gcc"
EXTRA_OECMAKE += '-DNEWLIB_SOURCE_DIR=${WORKDIR}/git/newlib \ EXTRA_OECMAKE += '-DNEWLIB_SOURCE_DIR=${WORKDIR}/git/newlib \
-DNEWLIB_EXTRA="CFLAGS=--sysroot=${STAGING_DIR_HOST}" \ -DNEWLIB_EXTRA="CFLAGS=--sysroot=${STAGING_DIR_HOST}" \
' '
meta-arm/recipes-security/trusted-services/ts-psa-iat-api-test_git.bb
+4
View File
@@ -17,3 +17,7 @@ SRCREV_psaqcbor = "42272e466a8472948bf8fca076d113b81b99f0e0"
EXTRA_OECMAKE += "-DPSA_TARGET_QCBOR=${WORKDIR}/git/psaqcbor \ EXTRA_OECMAKE += "-DPSA_TARGET_QCBOR=${WORKDIR}/git/psaqcbor \
" "
# Mbedtls 3.1.0 does not compile with clang.
# This can be removed after TS updated required mbedtls version
TOOLCHAIN = "gcc"
meta-arm/recipes-security/trusted-services/ts-sp-common.inc
+3
View File
@@ -27,3 +27,6 @@ EXTRA_OECMAKE += '-DCMAKE_ASM_FLAGS="${DEBUG_PREFIX_MAP}"'
# Ignore that SP stripped.elf does not have GNU_HASH # Ignore that SP stripped.elf does not have GNU_HASH
# Older versions of optee support SYSV hash only. # Older versions of optee support SYSV hash only.
INSANE_SKIP:${PN}-dev += "ldflags" INSANE_SKIP:${PN}-dev += "ldflags"
# Trusted Services SPs do not compile with clang
TOOLCHAIN = "gcc"