From: Denys Dmytriyenko <[email protected]> The proper implementation with multiconfig is taking longer, so re-instate the older solution for now with minor fixes.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-arago-distro/conf/distro/include/toolchain-arm.inc | 6 ++++++ .../recipes-core/meta/external-arm-secondary-sdk-toolchain.bb | 4 ++++ .../packagegroups/packagegroup-cross-canadian.bbappend | 10 ++++++++++ 3 files changed, 20 insertions(+) create mode 100644 meta-arago-distro/recipes-core/meta/external-arm-secondary-sdk-toolchain.bb create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend diff --git a/meta-arago-distro/conf/distro/include/toolchain-arm.inc b/meta-arago-distro/conf/distro/include/toolchain-arm.inc index 0ee0a4c..58efc00 100644 --- a/meta-arago-distro/conf/distro/include/toolchain-arm.inc +++ b/meta-arago-distro/conf/distro/include/toolchain-arm.inc @@ -9,6 +9,9 @@ EAT_TARGET_SYS_arm = "${EAT_TARGET_SYS_ARMV5}" EAT_TARGET_SYS_armv7a = "${EAT_TARGET_SYS_ARMV7}" EAT_TARGET_SYS_aarch64 = "${EAT_TARGET_SYS_ARMV8}" +SECONDARY_TARGET_ARCH = "invalid" +SECONDARY_TARGET_ARCH_k3 = "armv7a" + TARGET_VENDOR = "" TOOLCHAIN_BASE ?= "/opt" @@ -31,6 +34,9 @@ PREFERRED_PROVIDER_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "external-arm PREFERRED_PROVIDER_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain-${TRANSLATED_TARGET_ARCH}" #PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "external-arm-sdk-toolchain-${TRANSLATED_TARGET_ARCH}" +PREFERRED_PROVIDER_gcc-cross-canadian-${SECONDARY_TARGET_ARCH} ?= "external-arm-secondary-sdk-toolchain-${SECONDARY_TARGET_ARCH}" +PREFERRED_PROVIDER_binutils-cross-canadian-${SECONDARY_TARGET_ARCH} ?= "external-arm-secondary-sdk-toolchain-${SECONDARY_TARGET_ARCH}" + # Special case for gdb to be built as part of canadian-cross-sdk, instead of packaged from external toolchain bindir_pn-gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${exec_prefix}/bin" PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" diff --git a/meta-arago-distro/recipes-core/meta/external-arm-secondary-sdk-toolchain.bb b/meta-arago-distro/recipes-core/meta/external-arm-secondary-sdk-toolchain.bb new file mode 100644 index 0000000..22a8aa0 --- /dev/null +++ b/meta-arago-distro/recipes-core/meta/external-arm-secondary-sdk-toolchain.bb @@ -0,0 +1,4 @@ +TARGET_ARCH := "${SECONDARY_TARGET_ARCH}" +MACHINEOVERRIDES := "${SECONDARY_TARGET_ARCH}" + +require recipes-core/meta/external-arm-sdk-toolchain.bb diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend b/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend new file mode 100644 index 0000000..9f59ac8 --- /dev/null +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend @@ -0,0 +1,10 @@ +PR_append = ".arago0" + +SECONDARY_TARGET_ARCH ?= "invalid" + +SECONDARY_TOOLCHAIN = "gcc-cross-canadian-${SECONDARY_TARGET_ARCH} \ + binutils-cross-canadian-${SECONDARY_TARGET_ARCH}" + +RDEPENDS_${PN}_append = " \ + ${@oe.utils.conditional('SECONDARY_TARGET_ARCH', 'invalid', '', '${SECONDARY_TOOLCHAIN}', d)} \ +" -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
