This is a pure boilerplate commit that just moves folders around + a layer.conf is added for meta-morello-toolchain.

One ends up with the following tree structure: -meta-morello -meta-morello-toolchain

There are no functional changes.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- conf/bblayers.conf.sample | 15 -- conf/local.conf.sample | 176 ------------------ .../classes}/llvm-morello-native.bbclass | 0 meta-morello-toolchain/conf/layer.conf | 14 ++ .../gcc/gcc-cross-canadian_morello-10.1.bb | 0 .../gcc/gcc-cross_morello-10.1.bb | 0 .../gcc/gcc-crosssdk_morello-10.1.bb | 0 .../gcc/gcc-morello-10.1.inc | 0 .../0001-Fix-install-path-of-linux64.h.patch | 0 ...0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 0 .../0002-gcc-poison-system-directories.patch | 0 .../patches/0004-64-bit-multilib-hack.patch | 0 ...ains-something-unsupported-by-the-bu.patch | 0 ...ts.h-in-B-instead-of-S-and-t-oe-in-B.patch | 0 .../patches/0009-cpp-honor-sysroot.patch | 0 ...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 0 ...gcc-Fix-argument-list-too-long-error.patch | 0 .../patches/0014-libtool.patch | 0 ...s-fix-v4bx-to-linker-to-support-EABI.patch | 0 ...-config-files-from-B-instead-of-usin.patch | 0 ...ir-from-.la-which-usually-points-to-.patch | 0 .../patches/0018-export-CPP.patch | 0 ...e-target-gcc-headers-can-be-included.patch | 0 ...t-directory-during-relink-if-inst_pr.patch | 0 ...-fix-libcc1-s-install-path-and-rpath.patch | 0 ...le-sysroot-support-for-nativesdk-gcc.patch | 0 ...sroot-gcc-version-specific-dirs-with.patch | 0 ...027-nios2-Define-MUSL_DYNAMIC_LINKER.patch | 0 ...d-to-link-commandline-for-musl-targe.patch | 0 ...using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch | 0 .../0030-sync-gcc-stddef.h-with-musl.patch | 0 ...Re-introduce-spe-commandline-options.patch | 0 ...as-for-__cpu_indicator_init-instead-.patch | 0 ...s-Do-not-use-__LINE__-for-maintainin.patch | 0 ...omic-Do-not-enforce-march-on-aarch64.patch | 0 ...prefix-maps-before-checksumming-DIEs.patch | 0 .../gcc/gcc-runtime_morello-10.1.bb | 0 .../gcc/gcc-sanitizers_morello-10.1.bb | 0 .../gcc/gcc-source_morello-10.1.bb | 0 .../recipes-devtools}/gcc/gcc_morello-10.1.bb | 0 .../gcc/libgcc-initial_morello-10.1.bb | 0 .../gcc/libgcc_morello-10.1.bb | 0 .../gcc/libgfortan_morello-10.1.bb | 0 .../llvm/llvm-13.0.1-native.bb | 0 .../llvm/llvm-morello-native_13.0.bb | 0 .../recipes-devtools}/llvm/llvm-morello.inc | 0 .../llvm/llvm-morello_13.0.bb | 0 .../classes}/pure-cap-application.bbclass | 0 {conf => meta-morello/conf}/layer.conf | 1 + .../conf}/machine/include/morello-common.inc | 0 .../conf}/machine/morello-fvp.conf | 0 .../conf}/machine/morello-soc.conf | 0 .../board-firmware/board-firmware-image.bb | 0 .../board-firmware/board-firmware_1.4.bb | 0 .../board-firmware/board-morello-fvp.inc | 0 .../board-firmware/board-morello-soc.inc | 0 .../recipes-bsp}/grub/grub-efi_2.%.bbappend | 0 .../recipes-bsp}/grub/grub_2.%.bbappend | 0 .../grub/morello-fvp/files/grub-config.cfg | 0 .../grub/morello-soc/files/grub-config.cfg | 0 .../rom-binaries/rom-binaries_1.5.bb | 0 .../scp-firmware/scp-firmware-morello-fvp.inc | 0 .../scp-firmware/scp-firmware-morello-soc.inc | 0 .../scp-firmware/scp-firmware_2.10.%.bbappend | 0 .../tfa-firmware-morello-fvp.inc | 0 .../tfa-firmware-morello-soc.inc | 0 .../trusted-firmware-a_2.%.bbappend | 0 .../uefi/edk2-firmware-morello-fvp.inc | 0 .../uefi/edk2-firmware-morello-soc.inc | 0 .../uefi/edk2-firmware_%.bbappend | 0 ...Basetools-remove-brotli-build-errors.patch | 0 .../recipes-core}/busybox/busybox-morello.inc | 0 .../busybox/busybox-morello_1.5.bb | 0 ...-append-toolchain-with-relative-path.patch | 0 .../musl/files/compiler_rt.cmake | 0 .../musl/musl-morello-a64-so.inc | 0 .../recipes-core}/musl/musl-morello-a64.inc | 0 .../musl/musl-morello-c64-so.inc | 0 .../recipes-core}/musl/musl-morello-c64.inc | 0 .../musl/musl-morello-common.inc | 0 .../musl/musl-morello-libs-native.bb | 0 .../recipes-core}/musl/musl-morello-native.bb | 0 .../musl/musl-morello-target.inc | 0 .../recipes-core}/musl/musl_%.bbappend | 0 .../recipes-core}/musl/override-glibc.inc | 0 .../recipes-core}/musl/override-musl.inc | 0 .../fiptool/fiptool-native_2.7.bb | 0 .../recipes-devtools}/fvp/fvp-morello.bb | 0 .../recipes-devtools}/gdb/gdb_%.bbappend | 0 .../gen-init-cpio/gen-init-cpio-native.bb | 0 .../recipes-kernel}/linux/linux-morello.inc | 0 .../linux/linux-morello_1.5.bb | 0 .../applications/files/Makefile | 0 .../applications/files/pure-cap-app.c | 0 .../applications/pure-cap-app.bb | 0 .../images/morello-fvp/files/init.sh | 0 .../morello-fvp/files/initramfs.list.template | 0 .../images/morello-initramfs.bb | 0 .../images/morello-linux-image-fvp.inc | 0 .../images/morello-linux-image-soc.inc | 0 .../images/morello-linux-image.bb | 0 .../images/morello-soc/files/init.sh | 0 .../morello-soc/files/initramfs.list.template | 0 103 files changed, 15 insertions(+), 191 deletions(-) delete mode 100644 conf/bblayers.conf.sample delete mode 100644 conf/local.conf.sample rename {classes => meta-morello-toolchain/classes}/llvm-morello-native.bbclass (100%) create mode 100644 meta-morello-toolchain/conf/layer.conf rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-cross-canadian_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-cross_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-crosssdk_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1.inc (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0001-Fix-install-path-of-linux64.h.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0002-gcc-poison-system-directories.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0004-64-bit-multilib-hack.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0009-cpp-honor-sysroot.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0012-gcc-Fix-argument-list-too-long-error.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0014-libtool.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0018-export-CPP.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0019-Ensure-target-gcc-headers-can-be-included.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0024-handle-sysroot-support-for-nativesdk-gcc.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0030-sync-gcc-stddef.h-with-musl.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0033-Re-introduce-spe-commandline-options.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0037-libatomic-Do-not-enforce-march-on-aarch64.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-runtime_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-sanitizers_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-source_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/libgcc-initial_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/libgcc_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/libgfortan_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/llvm/llvm-13.0.1-native.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/llvm/llvm-morello-native_13.0.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/llvm/llvm-morello.inc (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/llvm/llvm-morello_13.0.bb (100%) rename {classes => meta-morello/classes}/pure-cap-application.bbclass (100%) rename {conf => meta-morello/conf}/layer.conf (92%) rename {conf => meta-morello/conf}/machine/include/morello-common.inc (100%) rename {conf => meta-morello/conf}/machine/morello-fvp.conf (100%) rename {conf => meta-morello/conf}/machine/morello-soc.conf (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/board-firmware/board-firmware-image.bb (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/board-firmware/board-firmware_1.4.bb (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/board-firmware/board-morello-fvp.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/board-firmware/board-morello-soc.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/grub/grub-efi_2.%.bbappend (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/grub/grub_2.%.bbappend (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/grub/morello-fvp/files/grub-config.cfg (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/grub/morello-soc/files/grub-config.cfg (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/rom-binaries/rom-binaries_1.5.bb (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/scp-firmware/scp-firmware-morello-fvp.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/scp-firmware/scp-firmware-morello-soc.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/scp-firmware/scp-firmware_2.10.%.bbappend (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/trusted-firmware-a/tfa-firmware-morello-fvp.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/trusted-firmware-a/tfa-firmware-morello-soc.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/trusted-firmware-a/trusted-firmware-a_2.%.bbappend (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/uefi/edk2-firmware-morello-fvp.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/uefi/edk2-firmware-morello-soc.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/uefi/edk2-firmware_%.bbappend (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/uefi/files/0001-Basetools-remove-brotli-build-errors.patch (100%) rename {recipes-core => meta-morello/recipes-core}/busybox/busybox-morello.inc (100%) rename {recipes-core => meta-morello/recipes-core}/busybox/busybox-morello_1.5.bb (100%) rename {recipes-core => meta-morello/recipes-core}/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch (100%) rename {recipes-core => meta-morello/recipes-core}/musl/files/compiler_rt.cmake (100%) rename {recipes-core => meta-morello/recipes-core}/musl/musl-morello-a64-so.inc (100%) rename {recipes-core => meta-morello/recipes-core}/musl/musl-morello-a64.inc (100%) rename {recipes-core => meta-morello/recipes-core}/musl/musl-morello-c64-so.inc (100%) rename {recipes-core => meta-morello/recipes-core}/musl/musl-morello-c64.inc (100%) rename {recipes-core => meta-morello/recipes-core}/musl/musl-morello-common.inc (100%) rename {recipes-core => meta-morello/recipes-core}/musl/musl-morello-libs-native.bb (100%) rename {recipes-core => meta-morello/recipes-core}/musl/musl-morello-native.bb (100%) rename {recipes-core => meta-morello/recipes-core}/musl/musl-morello-target.inc (100%) rename {recipes-core => meta-morello/recipes-core}/musl/musl_%.bbappend (100%) rename {recipes-core => meta-morello/recipes-core}/musl/override-glibc.inc (100%) rename {recipes-core => meta-morello/recipes-core}/musl/override-musl.inc (100%) rename {recipes-devtools => meta-morello/recipes-devtools}/fiptool/fiptool-native_2.7.bb (100%) rename {recipes-devtools => meta-morello/recipes-devtools}/fvp/fvp-morello.bb (100%) rename {recipes-devtools => meta-morello/recipes-devtools}/gdb/gdb_%.bbappend (100%) rename {recipes-devtools => meta-morello/recipes-devtools}/gen-init-cpio/gen-init-cpio-native.bb (100%) rename {recipes-kernel => meta-morello/recipes-kernel}/linux/linux-morello.inc (100%) rename {recipes-kernel => meta-morello/recipes-kernel}/linux/linux-morello_1.5.bb (100%) rename {recipes-morello-apps => meta-morello/recipes-morello-apps}/applications/files/Makefile (100%) rename {recipes-morello-apps => meta-morello/recipes-morello-apps}/applications/files/pure-cap-app.c (100%) rename {recipes-morello-apps => meta-morello/recipes-morello-apps}/applications/pure-cap-app.bb (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-fvp/files/init.sh (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-fvp/files/initramfs.list.template (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-initramfs.bb (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-linux-image-fvp.inc (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-linux-image-soc.inc (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-linux-image.bb (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-soc/files/init.sh (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-soc/files/initramfs.list.template (100%)

diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample deleted file mode 100644 index ef2bbb8..0000000 --- a/conf/bblayers.conf.sample +++ /dev/null @@ -1,15 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "7" - -BBPATH = "${TOPDIR}" - -BBFILES ?= "" - -BBLAYERS = " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-arm/meta-arm \ - ##OEROOT##/meta-arm/meta-arm-toolchain \ - ##OEROOT##/meta-morello \ - " diff --git a/conf/local.conf.sample b/conf/local.conf.sample deleted file mode 100644 index 1752f41..0000000 --- a/conf/local.conf.sample +++ /dev/null @@ -1,176 +0,0 @@ -MACHINE ?= "morello-fvp" - -BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" -PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" - -PACKAGE_CLASSES ?= "package_rpm" - -# DISTRO ?= "poky-bleeding" - -# -# SDK target architecture -# -# This variable specifies the architecture to build SDK items for and means -# you can build the SDK packages for architectures other than the machine you are -# running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686, x86_64, aarch64 -#SDKMACHINE ?= "i686" - -# -# Extra image configuration defaults -# -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated -# images. Some of these options are added to certain image types automatically. The -# variable can contain the following options: -# "dbg-pkgs" - add -dbg packages for all installed packages -# (adds symbol information for debugging/profiling) -# "src-pkgs" - add -src packages for all installed packages -# (adds source code for debugging) -# "dev-pkgs" - add -dev packages for all installed packages -# (useful if you want to develop against libs in the image) -# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages -# (useful if you want to run the package test suites) -# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) -# "tools-debug" - add debugging tools (gdb, strace) -# "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) -# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) -# "debug-tweaks" - make an image suitable for development -# e.g. ssh root access has a blank password -# There are other application targets that can be used here too, see -# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. -# We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES ?= "debug-tweaks" - -# -# Additional image features -# -# The following is a list of additional classes to use when building images which -# enable extra features. Some available options which can be included in this variable -# are: -# - 'buildstats' collect build statistics -USER_CLASSES ?= "buildstats" - -# -# Runtime testing of images -# -# The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. It can also -# run tests against any SDK that are built. To enable this uncomment these lines. -# See classes/test{image,sdk}.bbclass for further details. -#IMAGE_CLASSES += "testimage testsdk" -#TESTIMAGE_AUTO:qemuall = "1" - -# -# Interactive shell configuration -# -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is -# multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is iterate over the available -# terminal types to find one that works. -# -# Examples of the occasions this may happen are when resolving patches which cannot -# be applied, to use the devshell or the kernel menuconfig -# -# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none -# Note: currently, Konsole support only works for KDE 3.x due to the way -# newer Konsole versions behave -#OE_TERMINAL = "auto" -# By default disable interactive patch resolution (tasks will just fail instead): -PATCHRESOLVE = "noop" - -# -# Disk Space Monitoring during the build -# -# Monitor the disk space during the build. If there is less that 1GB of space or less -# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard halt -# of the build. The reason for this is that running completely out of space can corrupt -# files and damages the build in ways which may not be easily recoverable. -# It's necessary to monitor /tmp, if there is no space left the build will fail -# with very exotic errors. -BB_DISKMON_DIRS ??= "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - STOPTASKS,/tmp,100M,100K \ - HALT,${TMPDIR},100M,1K \ - HALT,${DL_DIR},100M,1K \ - HALT,${SSTATE_DIR},100M,1K \ - HALT,/tmp,10M,1K" - -# -# Shared-state files from other locations -# -# As mentioned above, shared state files are prebuilt cache data objects which can be -# used to accelerate build time. This variable can be used to configure the system -# to search other mirror locations for these objects before it builds the data itself. -# -# This can be a filesystem directory, or a remote url such as https or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the -# cache locations to check for the shared objects. -# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH -# at the end as shown in the examples below. This will be substituted with the -# correct path within the directory structure. -#SSTATE_MIRRORS ?= "\ -#file://.* https://someserver.tld/share/sstate/PATH%3Bdownloadfilename=PATH \ -#file://.* file:///some/local/dir/sstate/PATH" - -# -# Yocto Project SState Mirror -# -# The Yocto Project has prebuilt artefacts available for its releases, you can enable -# use of these by uncommenting the following lines. This will mean the build uses -# the network to check for artefacts at the start of builds, which does slow it down -# equally, it will also speed up the builds by not having to build things if they are -# present in the cache. It assumes you can download something faster than you can build it -# which will depend on your network. -# Note: For this to work you also need hash-equivalence passthrough to the matching server -# -#BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687" -#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH%3Bdownloadfilename=PATH" - -# -# Qemu configuration -# -# By default native qemu will build with a builtin VNC server where graphical output can be -# seen. The line below enables the SDL UI frontend too. -PACKAGECONFIG:append:pn-qemu-system-native = " sdl" -# By default libsdl2-native will be built, if you want to use your host's libSDL instead of -# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. -#ASSUME_PROVIDED += "libsdl2-native" - -# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds -# a handy set of menus for controlling the emulator. -#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" - -# -# Hash Equivalence -# -# Enable support for automatically running a local hash equivalence server and -# instruct bitbake to use a hash equivalence aware signature generator. Hash -# equivalence improves reuse of sstate by detecting when a given sstate -# artifact can be reused as equivalent, even if the current task hash doesn't -# match the one that generated the artifact. -# -# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format -# -#BB_HASHSERVE = "auto" -#BB_SIGNATURE_HANDLER = "OEEquivHash" - -# -# Memory Resident Bitbake -# -# Bitbake's server component can stay in memory after the UI for the current command -# has completed. This means subsequent commands can run faster since there is no need -# for bitbake to reload cache files and so on. Number is in seconds, after which the -# server will shut down. -# -#BB_SERVER_TIMEOUT = "60" - -# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to -# track the version of this file when it was generated. This can safely be ignored if -# this doesn't mean anything to you. -CONF_VERSION = "2" diff --git a/classes/llvm-morello-native.bbclass b/meta-morello-toolchain/classes/llvm-morello-native.bbclass similarity index 100% rename from classes/llvm-morello-native.bbclass rename to meta-morello-toolchain/classes/llvm-morello-native.bbclass diff --git a/meta-morello-toolchain/conf/layer.conf b/meta-morello-toolchain/conf/layer.conf new file mode 100644 index 0000000..9e2d46e --- /dev/null +++ b/meta-morello-toolchain/conf/layer.conf @@ -0,0 +1,14 @@ +BBPATH := "${BBPATH}:${LAYERDIR}" + +BBFILES := "${BBFILES} \ + ${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "meta-morello-toolchain" +BBFILE_PATTERN_meta-morello-toolchain := "^${LAYERDIR}/" +BBFILE_PRIORITY_meta-morello-toolchain = "5" + +LAYERDEPENDS_meta-morello-toolchain = " \ + core \ +" +LAYERSERIES_COMPAT_meta-morello-toolchain = "kirkstone" diff --git a/recipes-devtools/gcc/gcc-cross-canadian_morello-10.1.bb b/meta-morello-toolchain/recipes-devtools/gcc/gcc-cross-canadian_morello-10.1.bb similarity index 100% rename from recipes-devtools/gcc/gcc-cross-canadian_morello-10.1.bb rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-cross-canadian_morello-10.1.bb diff --git a/recipes-devtools/gcc/gcc-cross_morello-10.1.bb b/meta-morello-toolchain/recipes-devtools/gcc/gcc-cross_morello-10.1.bb similarity index 100% rename from recipes-devtools/gcc/gcc-cross_morello-10.1.bb rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-cross_morello-10.1.bb diff --git a/recipes-devtools/gcc/gcc-crosssdk_morello-10.1.bb b/meta-morello-toolchain/recipes-devtools/gcc/gcc-crosssdk_morello-10.1.bb similarity index 100% rename from recipes-devtools/gcc/gcc-crosssdk_morello-10.1.bb rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-crosssdk_morello-10.1.bb diff --git a/recipes-devtools/gcc/gcc-morello-10.1.inc b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1.inc similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1.inc rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1.inc diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-Fix-install-path-of-linux64.h.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-Fix-install-path-of-linux64.h.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0001-Fix-install-path-of-linux64.h.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-Fix-install-path-of-linux64.h.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0002-gcc-poison-system-directories.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0002-gcc-poison-system-directories.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0002-gcc-poison-system-directories.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0002-gcc-poison-system-directories.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0004-64-bit-multilib-hack.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0004-64-bit-multilib-hack.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0004-64-bit-multilib-hack.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0004-64-bit-multilib-hack.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0009-cpp-honor-sysroot.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0009-cpp-honor-sysroot.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0009-cpp-honor-sysroot.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0009-cpp-honor-sysroot.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0012-gcc-Fix-argument-list-too-long-error.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0012-gcc-Fix-argument-list-too-long-error.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0012-gcc-Fix-argument-list-too-long-error.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0012-gcc-Fix-argument-list-too-long-error.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0014-libtool.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0014-libtool.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0014-libtool.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0014-libtool.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0018-export-CPP.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0018-export-CPP.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0018-export-CPP.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0018-export-CPP.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0019-Ensure-target-gcc-headers-can-be-included.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0019-Ensure-target-gcc-headers-can-be-included.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0019-Ensure-target-gcc-headers-can-be-included.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0019-Ensure-target-gcc-headers-can-be-included.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0024-handle-sysroot-support-for-nativesdk-gcc.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0024-handle-sysroot-support-for-nativesdk-gcc.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0024-handle-sysroot-support-for-nativesdk-gcc.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0024-handle-sysroot-support-for-nativesdk-gcc.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0030-sync-gcc-stddef.h-with-musl.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0030-sync-gcc-stddef.h-with-musl.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0030-sync-gcc-stddef.h-with-musl.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0030-sync-gcc-stddef.h-with-musl.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0033-Re-introduce-spe-commandline-options.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0033-Re-introduce-spe-commandline-options.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0033-Re-introduce-spe-commandline-options.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0033-Re-introduce-spe-commandline-options.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0037-libatomic-Do-not-enforce-march-on-aarch64.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0037-libatomic-Do-not-enforce-march-on-aarch64.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0037-libatomic-Do-not-enforce-march-on-aarch64.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0037-libatomic-Do-not-enforce-march-on-aarch64.patch diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch b/meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch similarity index 100% rename from recipes-devtools/gcc/gcc-morello-10.1/patches/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-morello-10.1/patches/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch diff --git a/recipes-devtools/gcc/gcc-runtime_morello-10.1.bb b/meta-morello-toolchain/recipes-devtools/gcc/gcc-runtime_morello-10.1.bb similarity index 100% rename from recipes-devtools/gcc/gcc-runtime_morello-10.1.bb rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-runtime_morello-10.1.bb diff --git a/recipes-devtools/gcc/gcc-sanitizers_morello-10.1.bb b/meta-morello-toolchain/recipes-devtools/gcc/gcc-sanitizers_morello-10.1.bb similarity index 100% rename from recipes-devtools/gcc/gcc-sanitizers_morello-10.1.bb rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-sanitizers_morello-10.1.bb diff --git a/recipes-devtools/gcc/gcc-source_morello-10.1.bb b/meta-morello-toolchain/recipes-devtools/gcc/gcc-source_morello-10.1.bb similarity index 100% rename from recipes-devtools/gcc/gcc-source_morello-10.1.bb rename to meta-morello-toolchain/recipes-devtools/gcc/gcc-source_morello-10.1.bb diff --git a/recipes-devtools/gcc/gcc_morello-10.1.bb b/meta-morello-toolchain/recipes-devtools/gcc/gcc_morello-10.1.bb similarity index 100% rename from recipes-devtools/gcc/gcc_morello-10.1.bb rename to meta-morello-toolchain/recipes-devtools/gcc/gcc_morello-10.1.bb diff --git a/recipes-devtools/gcc/libgcc-initial_morello-10.1.bb b/meta-morello-toolchain/recipes-devtools/gcc/libgcc-initial_morello-10.1.bb similarity index 100% rename from recipes-devtools/gcc/libgcc-initial_morello-10.1.bb rename to meta-morello-toolchain/recipes-devtools/gcc/libgcc-initial_morello-10.1.bb diff --git a/recipes-devtools/gcc/libgcc_morello-10.1.bb b/meta-morello-toolchain/recipes-devtools/gcc/libgcc_morello-10.1.bb similarity index 100% rename from recipes-devtools/gcc/libgcc_morello-10.1.bb rename to meta-morello-toolchain/recipes-devtools/gcc/libgcc_morello-10.1.bb diff --git a/recipes-devtools/gcc/libgfortan_morello-10.1.bb b/meta-morello-toolchain/recipes-devtools/gcc/libgfortan_morello-10.1.bb similarity index 100% rename from recipes-devtools/gcc/libgfortan_morello-10.1.bb rename to meta-morello-toolchain/recipes-devtools/gcc/libgfortan_morello-10.1.bb diff --git a/recipes-devtools/llvm/llvm-13.0.1-native.bb b/meta-morello-toolchain/recipes-devtools/llvm/llvm-13.0.1-native.bb similarity index 100% rename from recipes-devtools/llvm/llvm-13.0.1-native.bb rename to meta-morello-toolchain/recipes-devtools/llvm/llvm-13.0.1-native.bb diff --git a/recipes-devtools/llvm/llvm-morello-native_13.0.bb b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-native_13.0.bb similarity index 100% rename from recipes-devtools/llvm/llvm-morello-native_13.0.bb rename to meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-native_13.0.bb diff --git a/recipes-devtools/llvm/llvm-morello.inc b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc similarity index 100% rename from recipes-devtools/llvm/llvm-morello.inc rename to meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc diff --git a/recipes-devtools/llvm/llvm-morello_13.0.bb b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_13.0.bb similarity index 100% rename from recipes-devtools/llvm/llvm-morello_13.0.bb rename to meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_13.0.bb diff --git a/classes/pure-cap-application.bbclass b/meta-morello/classes/pure-cap-application.bbclass similarity index 100% rename from classes/pure-cap-application.bbclass rename to meta-morello/classes/pure-cap-application.bbclass diff --git a/conf/layer.conf b/meta-morello/conf/layer.conf similarity index 92% rename from conf/layer.conf rename to meta-morello/conf/layer.conf index 5cd622e..7abd8d5 100644 --- a/conf/layer.conf +++ b/meta-morello/conf/layer.conf @@ -11,5 +11,6 @@ BBFILE_PRIORITY_meta-morello = "5" LAYERDEPENDS_meta-morello = " \ core \ meta-arm \ + meta-morello-toolchain \ " LAYERSERIES_COMPAT_meta-morello = "kirkstone" diff --git a/conf/machine/include/morello-common.inc b/meta-morello/conf/machine/include/morello-common.inc similarity index 100% rename from conf/machine/include/morello-common.inc rename to meta-morello/conf/machine/include/morello-common.inc diff --git a/conf/machine/morello-fvp.conf b/meta-morello/conf/machine/morello-fvp.conf similarity index 100% rename from conf/machine/morello-fvp.conf rename to meta-morello/conf/machine/morello-fvp.conf diff --git a/conf/machine/morello-soc.conf b/meta-morello/conf/machine/morello-soc.conf similarity index 100% rename from conf/machine/morello-soc.conf rename to meta-morello/conf/machine/morello-soc.conf diff --git a/recipes-bsp/board-firmware/board-firmware-image.bb b/meta-morello/recipes-bsp/board-firmware/board-firmware-image.bb similarity index 100% rename from recipes-bsp/board-firmware/board-firmware-image.bb rename to meta-morello/recipes-bsp/board-firmware/board-firmware-image.bb diff --git a/recipes-bsp/board-firmware/board-firmware_1.4.bb b/meta-morello/recipes-bsp/board-firmware/board-firmware_1.4.bb similarity index 100% rename from recipes-bsp/board-firmware/board-firmware_1.4.bb rename to meta-morello/recipes-bsp/board-firmware/board-firmware_1.4.bb diff --git a/recipes-bsp/board-firmware/board-morello-fvp.inc b/meta-morello/recipes-bsp/board-firmware/board-morello-fvp.inc similarity index 100% rename from recipes-bsp/board-firmware/board-morello-fvp.inc rename to meta-morello/recipes-bsp/board-firmware/board-morello-fvp.inc diff --git a/recipes-bsp/board-firmware/board-morello-soc.inc b/meta-morello/recipes-bsp/board-firmware/board-morello-soc.inc similarity index 100% rename from recipes-bsp/board-firmware/board-morello-soc.inc rename to meta-morello/recipes-bsp/board-firmware/board-morello-soc.inc diff --git a/recipes-bsp/grub/grub-efi_2.%.bbappend b/meta-morello/recipes-bsp/grub/grub-efi_2.%.bbappend similarity index 100% rename from recipes-bsp/grub/grub-efi_2.%.bbappend rename to meta-morello/recipes-bsp/grub/grub-efi_2.%.bbappend diff --git a/recipes-bsp/grub/grub_2.%.bbappend b/meta-morello/recipes-bsp/grub/grub_2.%.bbappend similarity index 100% rename from recipes-bsp/grub/grub_2.%.bbappend rename to meta-morello/recipes-bsp/grub/grub_2.%.bbappend diff --git a/recipes-bsp/grub/morello-fvp/files/grub-config.cfg b/meta-morello/recipes-bsp/grub/morello-fvp/files/grub-config.cfg similarity index 100% rename from recipes-bsp/grub/morello-fvp/files/grub-config.cfg rename to meta-morello/recipes-bsp/grub/morello-fvp/files/grub-config.cfg diff --git a/recipes-bsp/grub/morello-soc/files/grub-config.cfg b/meta-morello/recipes-bsp/grub/morello-soc/files/grub-config.cfg similarity index 100% rename from recipes-bsp/grub/morello-soc/files/grub-config.cfg rename to meta-morello/recipes-bsp/grub/morello-soc/files/grub-config.cfg diff --git a/recipes-bsp/rom-binaries/rom-binaries_1.5.bb b/meta-morello/recipes-bsp/rom-binaries/rom-binaries_1.5.bb similarity index 100% rename from recipes-bsp/rom-binaries/rom-binaries_1.5.bb rename to meta-morello/recipes-bsp/rom-binaries/rom-binaries_1.5.bb diff --git a/recipes-bsp/scp-firmware/scp-firmware-morello-fvp.inc b/meta-morello/recipes-bsp/scp-firmware/scp-firmware-morello-fvp.inc similarity index 100% rename from recipes-bsp/scp-firmware/scp-firmware-morello-fvp.inc rename to meta-morello/recipes-bsp/scp-firmware/scp-firmware-morello-fvp.inc diff --git a/recipes-bsp/scp-firmware/scp-firmware-morello-soc.inc b/meta-morello/recipes-bsp/scp-firmware/scp-firmware-morello-soc.inc similarity index 100% rename from recipes-bsp/scp-firmware/scp-firmware-morello-soc.inc rename to meta-morello/recipes-bsp/scp-firmware/scp-firmware-morello-soc.inc diff --git a/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend b/meta-morello/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend similarity index 100% rename from recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend rename to meta-morello/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend diff --git a/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-fvp.inc b/meta-morello/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-fvp.inc similarity index 100% rename from recipes-bsp/trusted-firmware-a/tfa-firmware-morello-fvp.inc rename to meta-morello/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-fvp.inc diff --git a/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-soc.inc b/meta-morello/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-soc.inc similarity index 100% rename from recipes-bsp/trusted-firmware-a/tfa-firmware-morello-soc.inc rename to meta-morello/recipes-bsp/trusted-firmware-a/tfa-firmware-morello-soc.inc diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend b/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend similarity index 100% rename from recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend rename to meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend diff --git a/recipes-bsp/uefi/edk2-firmware-morello-fvp.inc b/meta-morello/recipes-bsp/uefi/edk2-firmware-morello-fvp.inc similarity index 100% rename from recipes-bsp/uefi/edk2-firmware-morello-fvp.inc rename to meta-morello/recipes-bsp/uefi/edk2-firmware-morello-fvp.inc diff --git a/recipes-bsp/uefi/edk2-firmware-morello-soc.inc b/meta-morello/recipes-bsp/uefi/edk2-firmware-morello-soc.inc similarity index 100% rename from recipes-bsp/uefi/edk2-firmware-morello-soc.inc rename to meta-morello/recipes-bsp/uefi/edk2-firmware-morello-soc.inc diff --git a/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-morello/recipes-bsp/uefi/edk2-firmware_%.bbappend similarity index 100% rename from recipes-bsp/uefi/edk2-firmware_%.bbappend rename to meta-morello/recipes-bsp/uefi/edk2-firmware_%.bbappend diff --git a/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch b/meta-morello/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch similarity index 100% rename from recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch rename to meta-morello/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch diff --git a/recipes-core/busybox/busybox-morello.inc b/meta-morello/recipes-core/busybox/busybox-morello.inc similarity index 100% rename from recipes-core/busybox/busybox-morello.inc rename to meta-morello/recipes-core/busybox/busybox-morello.inc diff --git a/recipes-core/busybox/busybox-morello_1.5.bb b/meta-morello/recipes-core/busybox/busybox-morello_1.5.bb similarity index 100% rename from recipes-core/busybox/busybox-morello_1.5.bb rename to meta-morello/recipes-core/busybox/busybox-morello_1.5.bb diff --git a/recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch b/meta-morello/recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch similarity index 100% rename from recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch rename to meta-morello/recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch diff --git a/recipes-core/musl/files/compiler_rt.cmake b/meta-morello/recipes-core/musl/files/compiler_rt.cmake similarity index 100% rename from recipes-core/musl/files/compiler_rt.cmake rename to meta-morello/recipes-core/musl/files/compiler_rt.cmake diff --git a/recipes-core/musl/musl-morello-a64-so.inc b/meta-morello/recipes-core/musl/musl-morello-a64-so.inc similarity index 100% rename from recipes-core/musl/musl-morello-a64-so.inc rename to meta-morello/recipes-core/musl/musl-morello-a64-so.inc diff --git a/recipes-core/musl/musl-morello-a64.inc b/meta-morello/recipes-core/musl/musl-morello-a64.inc similarity index 100% rename from recipes-core/musl/musl-morello-a64.inc rename to meta-morello/recipes-core/musl/musl-morello-a64.inc diff --git a/recipes-core/musl/musl-morello-c64-so.inc b/meta-morello/recipes-core/musl/musl-morello-c64-so.inc similarity index 100% rename from recipes-core/musl/musl-morello-c64-so.inc rename to meta-morello/recipes-core/musl/musl-morello-c64-so.inc diff --git a/recipes-core/musl/musl-morello-c64.inc b/meta-morello/recipes-core/musl/musl-morello-c64.inc similarity index 100% rename from recipes-core/musl/musl-morello-c64.inc rename to meta-morello/recipes-core/musl/musl-morello-c64.inc diff --git a/recipes-core/musl/musl-morello-common.inc b/meta-morello/recipes-core/musl/musl-morello-common.inc similarity index 100% rename from recipes-core/musl/musl-morello-common.inc rename to meta-morello/recipes-core/musl/musl-morello-common.inc diff --git a/recipes-core/musl/musl-morello-libs-native.bb b/meta-morello/recipes-core/musl/musl-morello-libs-native.bb similarity index 100% rename from recipes-core/musl/musl-morello-libs-native.bb rename to meta-morello/recipes-core/musl/musl-morello-libs-native.bb diff --git a/recipes-core/musl/musl-morello-native.bb b/meta-morello/recipes-core/musl/musl-morello-native.bb similarity index 100% rename from recipes-core/musl/musl-morello-native.bb rename to meta-morello/recipes-core/musl/musl-morello-native.bb diff --git a/recipes-core/musl/musl-morello-target.inc b/meta-morello/recipes-core/musl/musl-morello-target.inc similarity index 100% rename from recipes-core/musl/musl-morello-target.inc rename to meta-morello/recipes-core/musl/musl-morello-target.inc diff --git a/recipes-core/musl/musl_%.bbappend b/meta-morello/recipes-core/musl/musl_%.bbappend similarity index 100% rename from recipes-core/musl/musl_%.bbappend rename to meta-morello/recipes-core/musl/musl_%.bbappend diff --git a/recipes-core/musl/override-glibc.inc b/meta-morello/recipes-core/musl/override-glibc.inc similarity index 100% rename from recipes-core/musl/override-glibc.inc rename to meta-morello/recipes-core/musl/override-glibc.inc diff --git a/recipes-core/musl/override-musl.inc b/meta-morello/recipes-core/musl/override-musl.inc similarity index 100% rename from recipes-core/musl/override-musl.inc rename to meta-morello/recipes-core/musl/override-musl.inc diff --git a/recipes-devtools/fiptool/fiptool-native_2.7.bb b/meta-morello/recipes-devtools/fiptool/fiptool-native_2.7.bb similarity index 100% rename from recipes-devtools/fiptool/fiptool-native_2.7.bb rename to meta-morello/recipes-devtools/fiptool/fiptool-native_2.7.bb diff --git a/recipes-devtools/fvp/fvp-morello.bb b/meta-morello/recipes-devtools/fvp/fvp-morello.bb similarity index 100% rename from recipes-devtools/fvp/fvp-morello.bb rename to meta-morello/recipes-devtools/fvp/fvp-morello.bb diff --git a/recipes-devtools/gdb/gdb_%.bbappend b/meta-morello/recipes-devtools/gdb/gdb_%.bbappend similarity index 100% rename from recipes-devtools/gdb/gdb_%.bbappend rename to meta-morello/recipes-devtools/gdb/gdb_%.bbappend diff --git a/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb b/meta-morello/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb similarity index 100% rename from recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb rename to meta-morello/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb diff --git a/recipes-kernel/linux/linux-morello.inc b/meta-morello/recipes-kernel/linux/linux-morello.inc similarity index 100% rename from recipes-kernel/linux/linux-morello.inc rename to meta-morello/recipes-kernel/linux/linux-morello.inc diff --git a/recipes-kernel/linux/linux-morello_1.5.bb b/meta-morello/recipes-kernel/linux/linux-morello_1.5.bb similarity index 100% rename from recipes-kernel/linux/linux-morello_1.5.bb rename to meta-morello/recipes-kernel/linux/linux-morello_1.5.bb diff --git a/recipes-morello-apps/applications/files/Makefile b/meta-morello/recipes-morello-apps/applications/files/Makefile similarity index 100% rename from recipes-morello-apps/applications/files/Makefile rename to meta-morello/recipes-morello-apps/applications/files/Makefile diff --git a/recipes-morello-apps/applications/files/pure-cap-app.c b/meta-morello/recipes-morello-apps/applications/files/pure-cap-app.c similarity index 100% rename from recipes-morello-apps/applications/files/pure-cap-app.c rename to meta-morello/recipes-morello-apps/applications/files/pure-cap-app.c diff --git a/recipes-morello-apps/applications/pure-cap-app.bb b/meta-morello/recipes-morello-apps/applications/pure-cap-app.bb similarity index 100% rename from recipes-morello-apps/applications/pure-cap-app.bb rename to meta-morello/recipes-morello-apps/applications/pure-cap-app.bb diff --git a/recipes-morello/images/morello-fvp/files/init.sh b/meta-morello/recipes-morello/images/morello-fvp/files/init.sh similarity index 100% rename from recipes-morello/images/morello-fvp/files/init.sh rename to meta-morello/recipes-morello/images/morello-fvp/files/init.sh diff --git a/recipes-morello/images/morello-fvp/files/initramfs.list.template b/meta-morello/recipes-morello/images/morello-fvp/files/initramfs.list.template similarity index 100% rename from recipes-morello/images/morello-fvp/files/initramfs.list.template rename to meta-morello/recipes-morello/images/morello-fvp/files/initramfs.list.template diff --git a/recipes-morello/images/morello-initramfs.bb b/meta-morello/recipes-morello/images/morello-initramfs.bb similarity index 100% rename from recipes-morello/images/morello-initramfs.bb rename to meta-morello/recipes-morello/images/morello-initramfs.bb diff --git a/recipes-morello/images/morello-linux-image-fvp.inc b/meta-morello/recipes-morello/images/morello-linux-image-fvp.inc similarity index 100% rename from recipes-morello/images/morello-linux-image-fvp.inc rename to meta-morello/recipes-morello/images/morello-linux-image-fvp.inc diff --git a/recipes-morello/images/morello-linux-image-soc.inc b/meta-morello/recipes-morello/images/morello-linux-image-soc.inc similarity index 100% rename from recipes-morello/images/morello-linux-image-soc.inc rename to meta-morello/recipes-morello/images/morello-linux-image-soc.inc diff --git a/recipes-morello/images/morello-linux-image.bb b/meta-morello/recipes-morello/images/morello-linux-image.bb similarity index 100% rename from recipes-morello/images/morello-linux-image.bb rename to meta-morello/recipes-morello/images/morello-linux-image.bb diff --git a/recipes-morello/images/morello-soc/files/init.sh b/meta-morello/recipes-morello/images/morello-soc/files/init.sh similarity index 100% rename from recipes-morello/images/morello-soc/files/init.sh rename to meta-morello/recipes-morello/images/morello-soc/files/init.sh diff --git a/recipes-morello/images/morello-soc/files/initramfs.list.template b/meta-morello/recipes-morello/images/morello-soc/files/initramfs.list.template similarity index 100% rename from recipes-morello/images/morello-soc/files/initramfs.list.template rename to meta-morello/recipes-morello/images/morello-soc/files/initramfs.list.template

The LLVM toolchain shall now be selected by setting the TOOLCHAIN variable within the recipe or globally in .conf file. The idea is that one will be able to toggle between GCC/LLVM in the future. There is no detailed spec on how this will exactly work at this point in time.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../classes/gcc-morello.bbclass | 1 + .../classes/llvm-morello-native.bbclass | 47 ------------------- .../classes/llvm-morello.bbclass | 43 +++++++++++++++++ .../conf/compiler/gcc-morello.conf | 1 + .../conf/compiler/llvm-morello.conf | 1 + meta-morello-toolchain/conf/layer.conf | 20 +++++--- meta-morello/conf/layer.conf | 5 +- meta-morello/conf/machine/morello-fvp.conf | 1 + meta-morello/conf/machine/morello-soc.conf | 1 + 9 files changed, 64 insertions(+), 56 deletions(-) create mode 100644 meta-morello-toolchain/classes/gcc-morello.bbclass delete mode 100644 meta-morello-toolchain/classes/llvm-morello-native.bbclass create mode 100644 meta-morello-toolchain/classes/llvm-morello.bbclass create mode 100644 meta-morello-toolchain/conf/compiler/gcc-morello.conf create mode 100644 meta-morello-toolchain/conf/compiler/llvm-morello.conf

diff --git a/meta-morello-toolchain/classes/gcc-morello.bbclass b/meta-morello-toolchain/classes/gcc-morello.bbclass new file mode 100644 index 0000000..c66ac6a --- /dev/null +++ b/meta-morello-toolchain/classes/gcc-morello.bbclass @@ -0,0 +1 @@ +# tbc \ No newline at end of file diff --git a/meta-morello-toolchain/classes/llvm-morello-native.bbclass b/meta-morello-toolchain/classes/llvm-morello-native.bbclass deleted file mode 100644 index 3c1b9d3..0000000 --- a/meta-morello-toolchain/classes/llvm-morello-native.bbclass +++ /dev/null @@ -1,47 +0,0 @@ -MORELLO_COMPILER = "llvm-morello-native" - -LLVM_VERSION = "13.0.0" - -LLVM_PATH = "${STAGING_DIR_NATIVE}/usr/bin" - -INHIBIT_DEFAULT_DEPS = "1" - -DEPENDS += "virtual/llvm-morello-native" -DEPENDS:append:morello-fvp:class-target = " virtual/musl-morello-libs-native" -DEPENDS:append:morello-soc:class-target = " virtual/musl-morello-libs-native" - -# rough hack to deal with llvm-morello not being a proper toolchain in its own meta yet -DEPENDS:remove = "libgcc" - -do_configure[depends] += " ${@get_depends(d)}" - -LIBCPLUSPLUS = "-stdlib-libc++" - -export CC = "${LLVM_PATH}/clang" -export CXX = "${LLVM_PATH}/clang++" -export CPP = "${LLVM_PATH}/clang -E" -export CCLD = "${LLVM_PATH}/clang" -export RANLIB = "${LLVM_PATH}/llvm-ranlib" -export AR = "${LLVM_PATH}/llvm-ar" -export AS = "${LLVM_PATH}/llvm-as" -export NM = "${LLVM_PATH}/llvm-nm" -export OBJDUMP = "${LLVM_PATH}/llvm-objdump" -export OBJCOPY = "${LLVM_PATH}/llvm-objcopy" -export STRIP = "${LLVM_PATH}/llvm-strip" -export STRINGS = "${LLVM_PATH}/llvm-strings" -export READELF = "${LLVM_PATH}/llvm-readelf" -export LD = "${LLVM_PATH}/ld.lld" -export LTO = "-fuse-ld=lld" -export HOSTCC = "${LLVM_PATH}/clang" -export LLVM_CONFIG = "${LLVM_PATH}/llvm-config" - -def get_depends(d): - if d.getVar('DEPENDENCIES'): - return "llvm-morello-native:do_populate_sysroot" - else: - return "llvm-morello-native:do_populate_sysroot virtual/musl-morello:do_populate_sysroot" - -DEPENDENCIES:kernel = "1" -DEPENDENCIES:musl = "1" -DEPENDENCIES:musl-morello-native = "1" -DEPENDENCIES ?= "0" \ No newline at end of file diff --git a/meta-morello-toolchain/classes/llvm-morello.bbclass b/meta-morello-toolchain/classes/llvm-morello.bbclass new file mode 100644 index 0000000..7f69763 --- /dev/null +++ b/meta-morello-toolchain/classes/llvm-morello.bbclass @@ -0,0 +1,43 @@ +OVERRIDES =. "${@['', 'toolchain-${TOOLCHAIN}:']['${TOOLCHAIN}' != '']}" +OVERRIDES[vardepsexclude] += "TOOLCHAIN" + +# var default init +LLVM_PATH ??= "" +LLVM_VERSION ??= "" +LLVM_CONFIG ??= "" +LIBCPLUSPLUS ??= "" +TC_DEPENDS ??= "" + +LLVM_VERSION:toolchain-llvm-morello = "13.0.0" +LLVM_PATH:toolchain-llvm-morello = "${STAGING_DIR_NATIVE}/usr/bin" + +INHIBIT_DEFAULT_DEPS:toolchain-llvm-morello = "1" + +TC_DEPENDS:append:toolchain-llvm-morello = " virtual/llvm-morello-native" +TC_DEPENDS:append:toolchain-llvm-morello:class-target = " virtual/llvm-morello-runtime-native virtual/musl-morello" + +DEPENDS:append:toolchain-llvm-morello = "${TC_DEPENDS}" + +# leaving out ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} for now; +# -target is set kind off backwards inside the recipes until further notice +CC:toolchain-llvm-morello = "${LLVM_PATH}/clang" +CXX:toolchain-llvm-morello = "${LLVM_PATH}/clang++" +CPP:toolchain-llvm-morello = "${LLVM_PATH}/clang -E" +CCLD:toolchain-llvm-morello = "${LLVM_PATH}/clang" +HOSTCC:toolchain-llvm-morello = "${LLVM_PATH}/clang" +RANLIB:toolchain-llvm-morello = "${LLVM_PATH}/llvm-ranlib" +AR:toolchain-llvm-morello = "${LLVM_PATH}/llvm-ar" +AS:toolchain-llvm-morello = "${LLVM_PATH}/llvm-as" +NM:toolchain-llvm-morello = "${LLVM_PATH}/llvm-nm" +OBJDUMP:toolchain-llvm-morello = "${LLVM_PATH}/llvm-objdump" +OBJCOPY:toolchain-llvm-morello = "${LLVM_PATH}/llvm-objcopy" +STRIP:toolchain-llvm-morello = "${LLVM_PATH}/llvm-strip" +STRINGS:toolchain-llvm-morello = "${LLVM_PATH}/llvm-strings" +READELF:toolchain-llvm-morello = "${LLVM_PATH}/llvm-readelf" +LD:toolchain-llvm-morello = "${LLVM_PATH}/ld.lld" +LTO:toolchain-llvm-morello = "-fuse-ld=lld" +LLVM_CONFIG:toolchain-llvm-morello = "${LLVM_PATH}/llvm-config" + +export ${LLVM_CONFIG} + +DEPENDS:remove:toolchain-llvm-morello = "libgcc" diff --git a/meta-morello-toolchain/conf/compiler/gcc-morello.conf b/meta-morello-toolchain/conf/compiler/gcc-morello.conf new file mode 100644 index 0000000..b4396de --- /dev/null +++ b/meta-morello-toolchain/conf/compiler/gcc-morello.conf @@ -0,0 +1 @@ +INHERIT += "gcc-morello" \ No newline at end of file diff --git a/meta-morello-toolchain/conf/compiler/llvm-morello.conf b/meta-morello-toolchain/conf/compiler/llvm-morello.conf new file mode 100644 index 0000000..cd960c6 --- /dev/null +++ b/meta-morello-toolchain/conf/compiler/llvm-morello.conf @@ -0,0 +1 @@ +INHERIT += "llvm-morello" \ No newline at end of file diff --git a/meta-morello-toolchain/conf/layer.conf b/meta-morello-toolchain/conf/layer.conf index 9e2d46e..e40e76d 100644 --- a/meta-morello-toolchain/conf/layer.conf +++ b/meta-morello-toolchain/conf/layer.conf @@ -1,14 +1,22 @@ -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}"

-BBFILES := "${BBFILES} \ - ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend"

-BBFILE_COLLECTIONS += "meta-morello-toolchain" -BBFILE_PATTERN_meta-morello-toolchain := "^${LAYERDIR}/" -BBFILE_PRIORITY_meta-morello-toolchain = "5" +BBFILE_COLLECTIONS += "meta-morello-toolchain" +BBFILE_PATTERN_meta-morello-toolchain := "^${LAYERDIR}/" +BBFILE_PRIORITY_meta-morello-toolchain = "5"

LAYERDEPENDS_meta-morello-toolchain = " \ core \ " LAYERSERIES_COMPAT_meta-morello-toolchain = "kirkstone" + +MORELLO_ARCH ??= "c64" +TOOLCHAIN ??= "gnu" +MORELLO_TOOLCHAIN ??= "gcc-morello" + +LLVM_SHARED_SOURCE ??= "${TMPDIR}/work-shared/${MACHINE}/llvm-morello-source" + +require conf/compiler/gcc-morello.conf +require conf/compiler/llvm-morello.conf \ No newline at end of file diff --git a/meta-morello/conf/layer.conf b/meta-morello/conf/layer.conf index 7abd8d5..7ea9a43 100644 --- a/meta-morello/conf/layer.conf +++ b/meta-morello/conf/layer.conf @@ -1,7 +1,6 @@ -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}"

-BBFILES := "${BBFILES} \ - ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend"

BBFILE_COLLECTIONS += "meta-morello" diff --git a/meta-morello/conf/machine/morello-fvp.conf b/meta-morello/conf/machine/morello-fvp.conf index 2ec03d3..f9ead8d 100644 --- a/meta-morello/conf/machine/morello-fvp.conf +++ b/meta-morello/conf/machine/morello-fvp.conf @@ -13,6 +13,7 @@ BSP_DTB_DIR ?= "${TMPDIR}/deploy/images/morello-fvp"

TMPDIR = "${TOPDIR}/tmp-fvp"

+MORELLO_TOOLCHAIN = "llvm-morello" MUSL_INSTALL_DIR ?= "${libdir}/${GLOBAL_ARCH_TRIPLE}"

IMAGE_BASENAME = "rootfs" diff --git a/meta-morello/conf/machine/morello-soc.conf b/meta-morello/conf/machine/morello-soc.conf index cc8e6de..cafdcc9 100644 --- a/meta-morello/conf/machine/morello-soc.conf +++ b/meta-morello/conf/machine/morello-soc.conf @@ -13,6 +13,7 @@ BSP_DTB_DIR ?= "${TMPDIR}/deploy/images/morello-soc"

TMPDIR = "${TOPDIR}/tmp-soc"

+MORELLO_TOOLCHAIN = "llvm-morello" MUSL_INSTALL_DIR ?= "${libdir}/${GLOBAL_ARCH_TRIPLE}"

IMAGE_BASENAME = "rootfs"

Use TOOLCHAIN variable instead of directly inheriting the class.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello/classes/pure-cap-application.bbclass | 2 -- .../recipes-morello-apps/applications/pure-cap-app.bb | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-morello/classes/pure-cap-application.bbclass b/meta-morello/classes/pure-cap-application.bbclass index 78c01c9..4454173 100644 --- a/meta-morello/classes/pure-cap-application.bbclass +++ b/meta-morello/classes/pure-cap-application.bbclass @@ -2,8 +2,6 @@ OUTPUTS_NAME ?= "pure-cap-app-default-name"

FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/${PN}:"

-DEPENDS += "virtual/musl-morello" - MUSL_HOME = "${STAGING_DIR_TARGET}${MUSL_INSTALL_DIR}"

INHIBIT_SYSROOT_STRIP = "1" diff --git a/meta-morello/recipes-morello-apps/applications/pure-cap-app.bb b/meta-morello/recipes-morello-apps/applications/pure-cap-app.bb index 7f3c6db..c1e9d86 100644 --- a/meta-morello/recipes-morello-apps/applications/pure-cap-app.bb +++ b/meta-morello/recipes-morello-apps/applications/pure-cap-app.bb @@ -1,4 +1,4 @@ -inherit pure-cap-application llvm-morello-native +inherit pure-cap-application

COMPATIBLE_MACHINE = "morello" SUMMARY = "Simple capability application" @@ -7,6 +7,8 @@ OUTPUTS_NAME = "pure-cap-app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

+TOOLCHAIN = "${MORELLO_TOOLCHAIN}" + PROVIDES = "${OUTPUTS_NAME}" RDEPENDS:${PN} = "musl-libc" RPROVIDES:${PN} = "${OUTPUTS_NAME}"

Use TOOLCHAIN variable instead of directly inheriting the class.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../trusted-firmware-a/trusted-firmware-a_2.%.bbappend | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend b/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend index da47a7a..c4bfc69 100644 --- a/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend +++ b/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend @@ -1,17 +1,19 @@ -inherit llvm-morello-native +

COMPATIBLE_MACHINE = "morello" SUMMARY = "TF-A to be compiled with LLVM Morello" OUTPUTS_NAME = "trusted-firmware-a" SECTION = "firmware"

+TOOLCHAIN = "${MORELLO_TOOLCHAIN}" + MACHINE_TFA_REQUIRE ?= "" MACHINE_TFA_REQUIRE:morello-fvp = "tfa-firmware-morello-fvp.inc" MACHINE_TFA_REQUIRE:morello-soc = "tfa-firmware-morello-soc.inc"

require ${MACHINE_TFA_REQUIRE}

-PROVIDES += "virtual/${OUTPUTS_NAME}" +PROVIDES += "virtual/${OUTPUTS_NAME}"

SRC_URI = "gitsm://git.morello-project.org/morello/trusted-firmware-a;protocol=https;name=tfa;branch=${SRCBRANCH}" SRCREV_tfa = "3ce2815936774fe924ec7538151b71085c2f18d9"

Use TOOLCHAIN variable instead of directly inheriting the class.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello/recipes-core/busybox/busybox-morello.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-morello/recipes-core/busybox/busybox-morello.inc b/meta-morello/recipes-core/busybox/busybox-morello.inc index 97bb2ef..cb1e577 100644 --- a/meta-morello/recipes-core/busybox/busybox-morello.inc +++ b/meta-morello/recipes-core/busybox/busybox-morello.inc @@ -1,10 +1,12 @@ -inherit llvm-morello-native +

COMPATIBLE_MACHINE = "morello" SUMMARY = "CHERI enabled busybox" LICENSE = "GPL-2.0-only" SECTION = "base"

+TOOLCHAIN = "${MORELLO_TOOLCHAIN}" + FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/${PN}:"

DEPENDS += "virtual/kernel virtual/musl-morello"

Use TOOLCHAIN variable instead of directly inheriting the class.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello/recipes-kernel/linux/linux-morello.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-morello/recipes-kernel/linux/linux-morello.inc b/meta-morello/recipes-kernel/linux/linux-morello.inc index 8ab7833..5257b90 100644 --- a/meta-morello/recipes-kernel/linux/linux-morello.inc +++ b/meta-morello/recipes-kernel/linux/linux-morello.inc @@ -1,4 +1,4 @@ -inherit llvm-morello-native + require recipes-kernel/linux/linux-yocto.inc COMPATIBLE_MACHINE = "morello" SUMMARY = "Morello Linux kernel fork" @@ -6,11 +6,15 @@ DESCRIPTION = "CHERI aware Linux kernel" OUTPUTS_NAME = "morello-linux" SECTION = "kernel"

+TOOLCHAIN = "${MORELLO_TOOLCHAIN}" + FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/${PN}:"

DEPENDS += "rsync-native" PROVIDES += "virtual/${OUTPUTS_NAME}"

+DEPENDS:remove:toolchain-llvm-morello = "virtual/musl-morello" + SRC_URI = " \ git://git.morello-project.org/morello/kernel/linux;protocol=https;nobranch=1 \ "

Change the path to the layers under test to reflect the new tree structure.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c756ab7..555b96f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,8 +62,10 @@ check-layers: coverage: '/Coverage: \d+/' script: - kas shell --update --force-checkout kas/base.yml --command \ - "yocto-check-layer-wrapper $CI_PROJECT_DIR -n --dependency $KAS_WORK_DIR/meta-arm/meta-arm $KAS_WORK_DIR/meta-arm/meta-arm-toolchain" - + "yocto-check-layer-wrapper $CI_PROJECT_DIR/$LAYER -n --dependency $CI_PROJECT_DIR/meta-* $KAS_WORK_DIR/meta-arm/meta-arm $KAS_WORK_DIR/meta-arm/meta-arm-toolchain" + parallel: + matrix: + - LAYER: [meta-morello, meta-morello-toolchain] # # Build stage, the actual build jobs #