Upstream meta-environment already provides standard site-config and version files, keep our own environment-setup for now.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- ...bbappend => packagegroup-cross-canadian.bbappend} | 0 .../recipes-core/meta/meta-toolchain-arago.bb | 8 +------- .../packagegroup-arago-cross-canadian.bb | 20 -------------------- 3 files changed, 1 insertion(+), 27 deletions(-) rename meta-arago-distro/recipes-core/packagegroups/{packagegroup-arago-cross-canadian.bbappend => packagegroup-cross-canadian.bbappend} (100%) delete mode 100644 meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-cross-canadian.bb diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-cross-canadian.bbappend b/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend similarity index 100% rename from meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-cross-canadian.bbappend rename to meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb index 065531e..03d18a3 100644 --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb @@ -1,6 +1,6 @@ TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-arago-sdk-host" TOOLCHAIN_HOST_TASK += "nativesdk-buildtools-perl-dummy" -TOOLCHAIN_HOST_TASK += "packagegroup-arago-cross-canadian-${MACHINE}" +TOOLCHAIN_HOST_TASK += "packagegroup-cross-canadian-${MACHINE}" TOOLCHAIN_TARGET_TASK ?= "packagegroup-arago-standalone-sdk-target" TOOLCHAIN_SUFFIX ?= "-sdk" TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}${TOOLCHAIN_SUFFIX}" @@ -113,14 +113,8 @@ arago_sdk_fixup () { } fakeroot create_sdk_files() { - # Setup site file for external use - toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} - toolchain_create_sdk_env_script ${SDK_OUTPUT}/${SDKPATH}/environment-setup - # Add version information - toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS} - cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/ # Replace the ##DEFAULT_INSTALL_DIR## with the correct pattern. diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-cross-canadian.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-cross-canadian.bb deleted file mode 100644 index b89c5d0..0000000 --- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-cross-canadian.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Host Arago SDK package for cross canadian toolchain" -PN = "packagegroup-arago-cross-canadian-${MACHINE}" -PR = "r7" - -inherit cross-canadian packagegroup - -PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" - -# Use indirection to stop these being expanded prematurely -BINUTILS = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" -GCC = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" -GDB = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" - -RDEPENDS_${PN} = "\ - ${@all_multilib_tune_values(d, 'BINUTILS')} \ - ${@all_multilib_tune_values(d, 'GCC')} \ - ${@all_multilib_tune_values(d, 'GDB')} \ - " - -# meta-environment-${MACHINE} -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
