[PATCH 1/3] arm-toolchain/arm-binary-toolchain: ensure toolchains don't provide any system libraries

[PATCH 1/3] arm-toolchain/arm-binary-toolchain: ensure toolchains don't provide any system libraries

[Ross Burton]

Use PRIVATE_LIBS to ensure that the Arm binary toolchains don't provide
their own libraries to the entire system.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../external-arm-toolchain/arm-binary-toolchain.inc            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc
index 1fa4cd3e..528b0061 100644
--- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc
+++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc
@@ -20,4 +20,7 @@ INHIBIT_SYSROOT_STRIP = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
+# Need to mark these as private until do_package's soname-finder only looks in $libdir
+PRIVATE_LIBS = "libgcc_s.so.1 libstdc++.so.6"
+
 BBCLASSEXTEND = "native nativesdk"
-- 
2.25.1

[PATCH 2/3] arm/optee: remove redundant ${S} in LIC_FILES_CHKSUM

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb | 2 +-
 meta-arm/recipes-security/optee/optee-test.inc         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
index 7ad408be..bafb2c47 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
+++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
@@ -13,7 +13,7 @@ TOOLCHAIN = "gcc"
 inherit deploy python3native
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=5a3925ece0806073ae9ebbb08ff6f11e"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5a3925ece0806073ae9ebbb08ff6f11e"
 
 DEPENDS = "python3-pyelftools-native optee-os-tadevkit python3-cryptography-native "
 
diff --git a/meta-arm/recipes-security/optee/optee-test.inc b/meta-arm/recipes-security/optee/optee-test.inc
index 3ba87880..64b41a8e 100644
--- a/meta-arm/recipes-security/optee/optee-test.inc
+++ b/meta-arm/recipes-security/optee/optee-test.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite"
 HOMEPAGE = "https://www.op-tee.org/"
 
 LICENSE = "BSD-2-Clause & GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
 
 inherit python3native ptest
 require optee.inc
-- 
2.25.1

[PATCH 3/3] arm-bsp/corstone1000-*-image: mark these as corstone1000-specific

[Ross Burton]

We don't want world builds failing as they try to build these for machines
other than Corstone 1000.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb           | 2 ++
 meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb b/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb
index d91d4578..ad5ec958 100644
--- a/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb
+++ b/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb
@@ -3,6 +3,8 @@ DESCRIPTION = "This is the main image which is the container of all the binaries
                generated for the Corstone1000 platform."
 LICENSE = "MIT"
 
+COMPATIBLE_MACHINE = "corstone1000"
+
 inherit image
 inherit wic_nopt
 
diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb b/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb
index a11de1e2..b778a008 100644
--- a/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb
+++ b/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb
@@ -3,6 +3,8 @@ DESCRIPTION = "This is the main Linux image which includes an initramfs kernel/r
 
 LICENSE = "MIT"
 
+COMPATIBLE_MACHINE = "corstone1000"
+
 IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
 
 inherit core-image
-- 
2.25.1

Re: [PATCH 1/3] arm-toolchain/arm-binary-toolchain: ensure toolchains don't provide any system libraries

[Jon Mason]

On Wed, 4 May 2022 15:12:52 +0100, Ross Burton wrote:
> Use PRIVATE_LIBS to ensure that the Arm binary toolchains don't provide
> their own libraries to the entire system.

Applied, thanks!

[1/3] arm-toolchain/arm-binary-toolchain: ensure toolchains don't provide any system libraries
      commit: c65eed7160341a97cd6908cb86def01f122ec4db
[2/3] arm/optee: remove redundant ${S} in LIC_FILES_CHKSUM
      commit: 80facbb124c9ea289a59a3b7214495cd62c758ad
[3/3] arm-bsp/corstone1000-*-image: mark these as corstone1000-specific
      commit: 28d6f6667b229922417e5494f49689d2940a7be4

Best regards,
-- 
Jon Mason <jon.mason@arm.com>