1
0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-04-20 23:41:08 +00:00
Commit Graph

95 Commits

Author SHA1 Message Date
Jon Mason
2c9cf62622 layers: convert to langdale compatibility
Now that langdale is available, convert all kirkstone references to it.

Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-09-29 18:05:36 -04:00
Denys Dmytriyenko
261263a670 arm-toolchain/gcc,external-arm-toolchain: resolve conflict with gcc headers
Historically external-arm-toolchain recipe packaged all gcc headers from
${libdir}/gcc/${TARGET_SYS}/${BINV}/include - some would be picked up by
packages like gcc-sanitizers, libssp-dev. libquadmath-dev or libgomp-dev.
The rest would fall into catch-all libgcc-dev package.

Unfortunately, that could result in a conflict with a target gcc, which
also packages some of those files, like unwind.h or stddef.h, among others.

The conflict could be seen with this config:

EXTRA_IMAGE_FEATURES += "dev-pkgs tools-sdk"
TCMODE = "external-arm"
EXTERNAL_TOOLCHAIN = "/OE/toolchains/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu"

And the error message is:

Error: Transaction test error:
  file /usr/lib/gcc/aarch64-poky-linux/11.2.1/include/stddef.h conflicts between attempted installs of libgcc-s-dev-11.2.1-r0.1.cortexa57 and gcc-arm+11.2-r2022.02.1.cortexa57
  file /usr/lib/gcc/aarch64-poky-linux/11.2.1/include/unwind.h conflicts between attempted installs of libgcc-s-dev-11.2.1-r0.1.cortexa57 and gcc-arm+11.2-r2022.02.1.cortexa57

Modify external-arm-toolchain recipe according to how libgcc in OE-Core
handles those header files by removing and not packaging them:

https://git.openembedded.org/openembedded-core/tree/meta/recipes-devtools/gcc/libgcc-common.inc#n40

Also need to adjust gcc recipe to pick up unwind.h from EXTERNAL_TOOLCHAIN
location now, since libgcc-dev no longer carries it, and install it into
STAGING_LIBDIR_NATIVE, where OE-Core gcc-target.inc expects it from
gcc-cross:

https://git.openembedded.org/openembedded-core/tree/meta/recipes-devtools/gcc/gcc-target.inc#n164

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-09-10 12:48:13 -04:00
Ross Burton
7013204337 arm-toolchain/androidclang: move to libexecdir
Binaries shouldn't be in datadir, and now the RPATHs are being cleared
we can put them in libexecdir.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-06-16 08:00:07 -04:00
Ross Burton
c4041b667d arm-toolchain/androidclang: strip meaningless RPATHS
As per [1], target builds of androidclang produce useless-rpath errors.

/usr/share/clang-r416183b/python3/lib/python3.9/lib-dynload/_posixsubprocess.cpython-39-x86_64-linux-gnu.so
contains probably-redundant RPATH /../lib [useless-rpaths]

Those RPATHs are of no use, so we can remove them entirely.

[1] https://errors.yoctoproject.org/Errors/Details/640604/

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-06-16 08:00:07 -04:00
Ross Burton
24c4cfa2aa arm-toolchain/armcompiler: remove recipe
As far as we know nobody is actually using the Arm Compiler recipe: 6.17
does a network operation on every call to check the license and this
fails with the network isolation that do_compile has in kirkstone, and
6.18 is behind a loginwall so we cannot download it in a recipe.

Unless we have actual users asking for a recipe, remove it from the layer
to avoid confusion.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-06-08 06:00:13 -04:00
Ross Burton
7007a9c0ea arm-toolchain/gcc-arm-none-eabi: upgrade to 11.2-2022.02
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-06-08 06:00:09 -04:00
Ross Burton
5c9017f7fd arm-toolchain/gcc-aarch64-none-elf: upgrade to 11.2
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-06-08 06:00:09 -04:00
Ross Burton
232dc039d0 arm-toolchain/layer.conf: remove BB_DANGLINGAPPENDS_WARNONLY
This appears to be historical from when the toolchain was in meta-linaro.

It isn't needed anymore, there's one bbappend in meta-arm-toolchain for
grub which is part of oe-core, so will never be dangling.

This variable has a global effect, so leaving it in here has a negative
impact on users.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-05-23 13:17:59 -04:00
Ross Burton
a52f85a2af Revert "arm-toolchain/external-arm-toolchain: set the version in the recipe"
This reverts commit ac83feb7cd.

Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-05-18 08:00:09 -04:00
Ross Burton
16fe716dc6 Revert "arm-toolchain/external-arm-toolchain: add back 10.3"
This reverts commit 5fec85b41d.

Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-05-18 08:00:09 -04:00
Ross Burton
5fec85b41d arm-toolchain/external-arm-toolchain: add back 10.3
Add back the 10.3 release of external-arm-toolchain.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-05-17 09:39:12 -04:00
Ross Burton
ac83feb7cd arm-toolchain/external-arm-toolchain: set the version in the recipe
We need to support multiple versions of external-arm-toolchain, partly as
different versions have different layouts on disk, and partly because
11.2 doesn't work on pre-Broadwell hardware.

Rename this recipe so the version is in the filename, and dynamically
set PKGV instead of PV so PREFERRED_VERSION is easier to use.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-05-17 09:39:12 -04:00
Ross Burton
c65eed7160 arm-toolchain/arm-binary-toolchain: ensure toolchains don't provide any system libraries
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>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-05-06 09:29:50 -04:00
Sumit Garg
50b34c5cc9 external-arm-toolchain: Add support for Arm GCC 11.2 binary release
Arm GCC 11.2 binary release has completely changed the way how libc was
packaged in earlier binary releases. So adjust do_install() accordingly
to support Arm GCC 11.2 as well as earlier binary releases.

Along with this update CI as well to point at Arm GCC 11.2 binary
releases.

Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Reviewed-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-04-29 13:14:01 -04:00
Sumit Garg
68adfe2256 external-arm-toolchain-versions: Use ldd to get libc version
Arm GCC 11.2 binary release has moved away from keeping libc library
versioning info as libc-{EAT_VER_LIBC}.so. So rather switch to
retrieving libc version by parsing output from "$ ldd --version".

Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Reviewed-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-04-29 13:13:15 -04:00
Ross Burton
698e053663 arm-toolchain/gcc-aarch64-none-elf: remove redundant LIC_FILES_CHKSUM
Setting LIC_FILES_CHKSUM with some anonymous Python to dynamically fetch
the right checksum is pointless when the right values are assigned with
overrides in the first place.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-04-22 11:31:25 -04:00
Ross Burton
faec9a7ad3 arm-toolchain/tcmode-external-arm: skip gcc-cross-*
SKIP_RECIPE applies to the full recipe names, which are gcc-cross-[arch].

Signed-off-by: Ross Burton <ross.burton@arm.com>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-04-06 21:54:02 -04:00
Ross Burton
a92e076973 arm-toolchain/external-arm-toolchain: install to libexecdir not datadir
$datadir is for architecture-independent files, and a compiler is not
that.

Install to $libexecdir, and clean up the installation commands whilst
there.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-04-06 21:51:59 -04:00
Jon Mason
ccec56deff arm-toolchain: update Arm GCC to 11.2
Update the Arm GCC source to the latest version.  Also, update the GCC
patches to apply cleanly, removing those that are no longer relevant.
Add the CVEs from Sumit Garg's series.

Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-03-23 09:34:09 -04:00
Khem Raj
3fbb255aa7 androidclang: Skip useless-rpaths check
This is a prebuilt stuff, better to ignore its guts.

Fixes
androidclang: /usr/share/clang-r416183b/python3/lib/python3.9/lib-dynload/_posixsubprocess.cpython-39-x86_64-linux-gnu.so contains probably-redundant RPATH /../lib [useless-rpaths]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-03-01 09:30:27 -05:00
Ross Burton
74bd32b2e6 arm-toolchain/external-arm-toolchain: fix missing license updates
Commit 53a40b1 updates the license names to use the SPDX terms, but as
intermediate variables are used in this recipe a few instances were
missed.

Signed-off-by: Ross Burton <ross.burton@arm.com>
2022-02-23 13:39:22 +00:00
Martin Jansa
53a40b1518 meta: update license names
* openembedded-core/scripts/contrib/convert-spdx-licenses.py .
  ...
  All files processed with version 0.01

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
2022-02-22 14:05:46 +00:00
Khem Raj
1ad0aa794d layers: Bump to use kirkstone
its not going to be backward ABI compatible with honister due to variable renaming.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2022-02-22 12:34:31 +00:00
Ross Burton
479aaa7bfb Update for LICENSE_FLAGS_WHITELIST rename to _ACCEPTED.
LICENSE_FLAGS_WHITELIST has been renamed to LICENSE_FLAGS_ACCEPTED in
oe-core master.

Signed-off-by: Ross Burton <ross.burton@arm.com>
2022-02-22 12:34:31 +00:00
Khem Raj
5119b4ad63 meta-arm-toolchain: Use renamed SKIP_RECIPE var flags
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2022-02-22 12:33:04 +00:00
Khem Raj
37674007ba meta-arm-toolchain: Use renamed BB_BASEHASH_IGNORE_VARS variable
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2022-02-22 12:33:04 +00:00
Ross Burton
558af689d5 arm-toolchain/gcc-arm-none-eabi: remove old 2020-q2 recipe
This was only used by Corstone 700, so is redundant now.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-01-24 12:00:08 -05:00
Usama Arif
c4fb4f53cb arm-toolchain: Fetch prebuilt Android Clang, version r416183b
This Clang version is present in Android master
(as of October 8, 2021)

Signed-off-by: Usama Arif <usama.arif@arm.com>
Signed-off-by: Anders Dellien <anders.dellien@arm.com>
Change-Id: I957742ee943ef68119fd7c7e2bd8ee62b717b31c
2022-01-18 13:00:12 -05:00
Ross Burton
22b453f785 arm-toolchain: remove armcompiler-specific licenses
The Armcompiler-* licenses are specific to a single release of the
Arm Compiler, so remove them from the layer and use NO_GENERIC_LICENSE
to extract them from the source directly.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-01-06 08:59:22 -05:00
Ross Burton
07c7d2f948 arm-toolchain/armcompiler: upgrade to 6.17
Upgrade to the latest release, now based on Clang 14.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2022-01-06 08:59:22 -05:00
Ross Burton
6bc7edfe83 arm-toolchain: upgrade gcc-arm-none-eabi (GNU-RM) to 10.3-2021.10
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-11-12 11:12:01 -05:00
Ross Burton
2098ffd84a Remove use of deprecated lnr command
lnr is deprecated and will be removed soon, so replace it with `ln -rs`

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-11-12 11:10:20 -05:00
Jon Mason
13445dc9b5 arm-toolchain: use better variable name
GCC_VERSION is too similar to existing variable GCCVERSION.  Replace it
with ARM_GCC_VERSION.

Suggested-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-10-06 11:50:50 -04:00
Jon Mason
6bdc3553c4 arm-toolchain: use variables
Use variables to make it easier to upgrade when the time comes.

Change-Id: I9f2575279fe79bc0d895d47fdaffd2d5edd4aa59
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-09-27 09:38:53 -04:00
Ross Burton
6d5c14a64a arm-toolchain/gcc-aarch64-none-elf: upgrade to 10.3-2021.07
Change-Id: Ie58f448511ef4f1d23cfd4a9d1dc275f7a216a50
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-09-20 11:28:07 -04:00
Sumit Garg
13972eed3c arm-toolchain: Uprev 10.2 -> 10.3
Update Arm GCC toolchain recipe and patches accordingly.

Signed-off-by: Sumit Garg <sumit.garg@linaro.org>

Changes in v2:
- Drop support for 10.2 release.
- Update CI to use 10.3 release instead.

Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-08-25 19:16:04 -04:00
Denys Dmytriyenko
45642fca29 arm-toolchain: grub: fix do_configure() breakage with external-arm toolchain
grub and grub-efi break in do_configure() when using external-arm toolchain:

| checking for aarch64-poky-linux-objcopy... no
| checking for objcopy... objcopy
| checking for aarch64-poky-linux-strip... no
| checking for strip... strip
| checking for aarch64-poky-linux-nm... no
| checking for nm... nm
| checking for aarch64-poky-linux-ranlib... no
| checking for ranlib... ranlib
...
| checking whether objcopy works for absolute addresses... configure: error: objcopy cannot create binary files

That is due to external-arm toolchain's target triplet aarch64-none-linux-gnu
being different from OE triplet like aarch64-poky-linux and configure script
trying to use it to find binutils binaries like objcopy, falling back to host
ones.

Help configure script to find correct objcopy and other binaries by passing
the correct target triplet with --target parameter set to EAT_TARGET_SYS,
overriding the default OE one.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-08-14 20:52:38 -04:00
Jon Mason
8dfdacd75c meta-arm: Convert to new override syntax
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-08-04 12:29:51 -04:00
Ross Burton
8ec7d455a6 arm-toolchain/armcompiler: add EULA comment
Change-Id: I9a46986f0ce23d60acc60a35a8b43d55cf6a512e
Signed-off-by: Ross Burton <ross.burton@arm.com>
2021-07-14 12:05:38 +01:00
Ross Burton
339420ae77 arm-toolchain/armcompiler: fix checksums and installation on arm64
The tarball has been regenerated with new license texts, so the
checksums are different.

Also, patch out the host architecture test in the installer: we might
want to package the armcompiler for a x86 target on a arm64 machine.

Change-Id: Iedf0113c53b6567e3e4e716e2a0db98776d1da6d
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-07-07 09:22:51 -04:00
Ben Horgan
40e3391fa5 arm-toolchain/gcc-aarch64-none-elf: Fix license checksums
Signed-off-by: Ben Horgan <ben.horgan@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-07-07 09:20:06 -04:00
Timothy Mertz
af10576f9f external-arm-sdk-toolchain: Fix parsing error with INCOMPATIBLE_LICENSE
This change fixes parsing error that occurs when INCOMPATIBLE_LICENSE =
"GPLv3" by defining EAT_BFD_LICENSE, EAT_GDB_LICENSE and EAT_RLE_LICENSE
in license.inc and requiring it in external-arm-sdk-toolchain.bb

Definitions in external-arm-toolchain-versions.inc are made redundant so
they are removed.

Signed-off-by: Timothy Mertz <timothy.mertz@garmin.com>
Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
Reviewed-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-06-30 10:58:15 -04:00
Ross Burton
07d28bbaea arm-toolchain/armcompiler: remove pointless PROVIDES
There is only one provider for the armcompiler, so remove the virtual
provider.

Change-Id: I3492c49f5cf6eb6f3d3156adb3d87e315ed8183d
Signed-off-by: Ross Burton <ross.burton@arm.com>
2021-05-11 15:30:21 +01:00
Ross Burton
427912d75a arm-toolchain/armcompiler: add upstream release checking
Change-Id: I2eb94f99a0c828a4d5f2f68756e83ebc1f6499c2
Signed-off-by: Ross Burton <ross.burton@arm.com>
2021-05-11 15:30:21 +01:00
Ross Burton
8af7923c94 arm-toolchain/external-arm-toolchain: inhibit build dependencies
These recipes don't build anything, so there's no need to depend on a
toolchain.

Change-Id: I49b641fb54839c30255a11a7c9d5798c8e4afd2a
Signed-off-by: Ross Burton <ross.burton@arm.com>
2021-05-11 15:30:21 +01:00
Jon Mason
f619eb87f5 arm-toolchain/external-arm-toolchains: Update to the latest
Change-Id: Ifb5933b08acf13663c7a6231582ee21032b92327
Signed-off-by: Jon Mason <jon.mason@arm.com>
Acked-by: Sumit Garg <sumit.garg@linaro.org>
2021-05-07 00:08:56 -04:00
Ross Burton
f723b6b593 layer.conf: don't claim compatibility with Gatesgarth
We don't test this, and don't expect it to work, so don't claim it does.

Change-Id: I045930e690edba5a5b0b8cb810130c8c6733623f
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-04-21 22:23:55 -04:00
Ross Burton
4f1f77d660 layers: add hardknott to compatible release branches
Upstream oe-core is preparing to be the Hardknott release, so add
hardknott to our compatible release list.

Once hardknott is public we should remove gatesgarth.

Change-Id: Ia5c59e703910db96a3967a1ecad074ac80d03ee9
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-03-16 19:00:10 -04:00
Sumit Garg
2c44ddd93a arm-toolchain: Drop support for GCC 9.2 toolchain
As OE core has moved to GCC 10.2 toolchain, so remove support for
legacy Arm 9.2 toolchain.

Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Jon Mason <jon.mason@arm.com>
2021-02-18 09:35:28 -05:00
Jon Mason
957fefc816 arm-toolchain: Update Denys' email address
Signed-off-by: Jon Mason <jon.mason@arm.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
2021-02-18 09:35:28 -05:00