fixing. Added meta-environment pacakge.
PATCH 2/2 meta-environment: inherit cross-canadian.bbclass
In reply to Lianhao Lu[BUGID #565] This is a part of the bug #565 fixing, to reduce the code duplication by inheriting the cross-canadian.bbclass.
--- meta/classes/cross-canadian.bbclass | 1 + meta/classes/toolchain-scripts.bbclass | 8 +++----- meta/recipes-core/meta/meta-environment.bb | 25 +++++++------------------ 3 files changed, 11 insertions(+), 23 deletions(-)
meta/classes/cross-canadian.bbclass +1 -0
@@ -15,6 +15,7 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S # Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS # OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" +OLD_MULTIMACH_TARGET_SYS := "${MULTIMACH_TARGET_SYS}" OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH} BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk" python () {
meta/classes/toolchain-scripts.bbclass +3 -5
@@ -69,7 +69,7 @@ toolchain_create_sdk_env_script_for_installer () { touch $script echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${OLD_MULTIMACH_TARGET_SYS}:$PATH' >> $script echo 'export PKG_CONFIG_SYSROOT_DIR=##SDKTARGETSYSROOT##' >> $script - echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${libdir}/pkgconfig' >> $script + echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${target_libdir}/pkgconfig' >> $script echo 'export CONFIG_SITE=${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS}' >> $script echo 'export CC=${TARGET_PREFIX}gcc' >> $script echo 'export CXX=${TARGET_PREFIX}g++' >> $script
@@ -77,16 +77,14 @@ toolchain_create_sdk_env_script_for_installer () { echo 'export TARGET_PREFIX=${TARGET_PREFIX}' >> $script echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux"' >> $script if [ "${TARGET_OS}" = "darwin8" ]; then - echo 'export TARGET_CFLAGS="-I##SDKTARGETSYSROOT##${includedir}"' >> $script - echo 'export TARGET_LDFLAGS="-L##SDKTARGETSYSROOT##{libdir}"' >> $script + echo 'export TARGET_CFLAGS="-I##SDKTARGETSYSROOT##${target_includedir}"' >> $script + echo 'export TARGET_LDFLAGS="-L##SDKTARGETSYSROOT##{target_libdir}"' >> $script # Workaround darwin toolchain sysroot path problems cd ${SDK_OUTPUT}${SDKTARGETSYSROOT}/usr ln -s /usr/local local fi echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT## -I##SDKTARGETSYSROOT##${GXX_INCLUDEDIR}"' >> $script - echo "# alias opkg='LD_LIBRARY_PATH=${SDKPATHNATIVE}${libdir_nativesdk} ${SDKPATHNATIVE}${bindir_nativesdk}/opkg-cl -f ${SDKPATHNATIVE}/${sysconfdir}/opkg-sdk.conf -o ${SDKPATHNATIVE}'" >> $script - echo "# alias opkg-target='LD_LIBRARY_PATH=${SDKPATHNATIVE}${libdir_nativesdk} ${SDKPATHNATIVE}${bindir_nativesdk}/opkg-cl -f ##SDKTARGETSYSROOT##${sysconfdir}/opkg.conf -o ##SDKTARGETSYSROOT##'" >> $script echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
meta/recipes-core/meta/meta-environment.bb +7 -18
@@ -4,30 +4,19 @@ LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 LICENSE = "MIT" PR = "r0" -inherit meta toolchain-scripts - -TRANSLATED_TARGET_ARCH ?= "${TARGET_ARCH}" - EXCLUDE_FROM_WORLD = "1" +inherit toolchain-scripts +# get target config site before inheritting corss-canadian +TARGET_CONFIG_SITE := "${@siteinfo_get_files(d)}" + SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" - SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}" -# Save MULTIMACH_TARGET_SYS -OLD_MULTIMACH_TARGET_SYS := "${MULTIMACH_TARGET_SYS}" -MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${SDK_VENDOR}-${SDK_OS}" - -# Save PACKAGE_ARCH -OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH} -BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk" - -#change SSTATE_PKGARCH due to the PACKAGE_ARCH change -SSTATE_PKGARCH = "${SDK_ARCH}" +inherit cross-canadian -CONFIG_SITE = "${@siteinfo_get_files(d)}" -GXX_INCLUDEDIR := "${includedir}/c++" +GXX_INCLUDEDIR := "${target_includedir}/c++" do_generate_content[nostamp] = "1" do_generate_content() {
@@ -38,7 +27,7 @@ do_generate_content() { siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS} touch $siteconfig - for sitefile in ${CONFIG_SITE} ; do + for sitefile in ${TARGET_CONFIG_SITE} ; do cat $sitefile >> $siteconfig done
Signature · 1 line
1.7.0.4
PATCH 1/2 meta-environment: Added package of meta-environment-${TARGET_ARCH} for environment files.
In reply to Lianhao Lu[BUGID #565] Fixing bug #565, added package of meta-environment-${TARGET_ARCH} for environment files used by cross-canadian toolchain.
Also corrected the situation of empty config site file for target.
--- meta/classes/toolchain-scripts.bbclass | 32 ++++++++++ meta/recipes-core/meta/meta-environment.bb | 75 ++++++++++++++++++++++++ meta/recipes-core/tasks/task-cross-canadian.bb | 1 + 3 files changed, 108 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/meta/meta-environment.bb
meta/classes/toolchain-scripts.bbclass +32 -0
@@ -60,3 +60,35 @@ toolchain_create_tree_env_script () { echo 'export POKY_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script echo 'export POKY_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script } + +# This function creates an environment-setup-script for use by the ADT installer +toolchain_create_sdk_env_script_for_installer () { + # Create environment setup script + script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${OLD_MULTIMACH_TARGET_SYS} + rm -f $script + touch $script + echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${OLD_MULTIMACH_TARGET_SYS}:$PATH' >> $script + echo 'export PKG_CONFIG_SYSROOT_DIR=##SDKTARGETSYSROOT##' >> $script + echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${libdir}/pkgconfig' >> $script + echo 'export CONFIG_SITE=${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS}' >> $script + echo 'export CC=${TARGET_PREFIX}gcc' >> $script + echo 'export CXX=${TARGET_PREFIX}g++' >> $script + echo 'export GDB=${TARGET_PREFIX}gdb' >> $script + echo 'export TARGET_PREFIX=${TARGET_PREFIX}' >> $script + echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux"' >> $script + if [ "${TARGET_OS}" = "darwin8" ]; then + echo 'export TARGET_CFLAGS="-I##SDKTARGETSYSROOT##${includedir}"' >> $script + echo 'export TARGET_LDFLAGS="-L##SDKTARGETSYSROOT##{libdir}"' >> $script + # Workaround darwin toolchain sysroot path problems + cd ${SDK_OUTPUT}${SDKTARGETSYSROOT}/usr + ln -s /usr/local local + fi + echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script + echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT## -I##SDKTARGETSYSROOT##${GXX_INCLUDEDIR}"' >> $script + echo "# alias opkg='LD_LIBRARY_PATH=${SDKPATHNATIVE}${libdir_nativesdk} ${SDKPATHNATIVE}${bindir_nativesdk}/opkg-cl -f ${SDKPATHNATIVE}/${sysconfdir}/opkg-sdk.conf -o ${SDKPATHNATIVE}'" >> $script + echo "# alias opkg-target='LD_LIBRARY_PATH=${SDKPATHNATIVE}${libdir_nativesdk} ${SDKPATHNATIVE}${bindir_nativesdk}/opkg-cl -f ##SDKTARGETSYSROOT##${sysconfdir}/opkg.conf -o ##SDKTARGETSYSROOT##'" >> $script + echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script + echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script + echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script + echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script +}
meta/recipes-core/meta/meta-environment.bb new file +75 -0
75 lines not on this page · raw message
meta/recipes-core/tasks/task-cross-canadian.bb +1 -0
@@ -12,5 +12,6 @@ RDEPENDS_${PN} = "\ binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \ gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} \ gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} \ + meta-environment-${TRANSLATED_TARGET_ARCH} \ "
Signature · 1 line
1.7.0.4
cover fixing. Added meta-environment pacakge.
Added pacakge of meta-environment-${TARGET_ARCH} for environment files. Had config site files with correct target config site files' content.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: llu/bug565
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug565
Thanks,
Lianhao Lu <[email protected]>
---
Lianhao Lu (2):
meta-environment: Added package of meta-environment-${TARGET_ARCH}
for environment files.
meta-environment: inherit cross-canadian.bbclass
meta/classes/cross-canadian.bbclass | 1 + meta/classes/toolchain-scripts.bbclass | 30 +++++++++++ meta/recipes-core/meta/meta-environment.bb | 64 ++++++++++++++++++++++++ meta/recipes-core/tasks/task-cross-canadian.bb | 1 + 4 files changed, 96 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/meta/meta-environment.bb
Richard Purdie
AppliedQuoted 9 lines · Lianhao Lu
Added pacakge of meta-environment-${TARGET_ARCH} for environment files. Had config site files with correct target config site files' content.
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: llu/bug565
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug565Thanks,
Lianhao Lu <[email protected]>
I've merged these but I squashed the two commits into one.
Cheers,
Richard