diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-04-22 15:20:05 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-04-27 18:29:57 +0100 |
commit | c22ab5fc9fd0f18153e73f941f050539d415ff56 (patch) | |
tree | 0af352c233ff4524595e924ebb32f72c7a8828db /meta/classes | |
parent | 00c5c9744220ed8a019ede55cdf2809b1d3b72a5 (diff) | |
download | openembedded-core-c22ab5fc9fd0f18153e73f941f050539d415ff56.tar.gz openembedded-core-c22ab5fc9fd0f18153e73f941f050539d415ff56.tar.bz2 openembedded-core-c22ab5fc9fd0f18153e73f941f050539d415ff56.tar.xz openembedded-core-c22ab5fc9fd0f18153e73f941f050539d415ff56.zip |
Install cross-packages into the native sysroot
Cross is no longer required so can go away, we now install cross packages into
the native sysroot and use them from there.
This patch includes updates to classes and some recipes which reference
CROSS_DIR. Others still need fixing an image can be built and run with this
patch applied.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/cross.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/glibc-package.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/icecc.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/nativesdk.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/packaged-staging.bbclass | 5 |
5 files changed, 8 insertions, 15 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index d5f630077..487ec60f7 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -40,9 +40,9 @@ target_base_libdir := "${base_libdir}" target_prefix := "${prefix}" # Overrides for paths -prefix = "${CROSS_DIR}" -base_prefix = "${prefix}" -exec_prefix = "${prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +base_prefix = "${STAGING_DIR_NATIVE}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" base_sbindir = "${base_prefix}/bin" sbindir = "${exec_prefix}/bin" diff --git a/meta/classes/glibc-package.bbclass b/meta/classes/glibc-package.bbclass index cef888c54..56bf8ba40 100644 --- a/meta/classes/glibc-package.bbclass +++ b/meta/classes/glibc-package.bbclass @@ -96,8 +96,8 @@ do_prep_locale_tree() { gunzip $i done cp -pPR ${PKGD}${base_libdir}/* $treedir/lib - if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then - cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib + if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/lib/libgcc_s.* ]; then + cp -pPR ${STAGING_DIR_NATIVE}/${prefix_native}/lib/libgcc_s.* $treedir/lib fi install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin } diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index be37318d9..715f87077 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -46,8 +46,8 @@ def create_cross_env(bb,d): return "" import tarfile, socket, time - ice_dir = bb.data.expand('${CROSS_DIR}', d) prefix = bb.data.expand('${HOST_PREFIX}' , d) + ice_dir = bb.data.expand("${STAGING_DIR_NATIVE}${prefix_native}") distro = bb.data.expand('${DISTRO}', d) target_sys = bb.data.expand('${TARGET_SYS}', d) target_prefix = bb.data.expand('${TARGET_PREFIX}', d) @@ -93,7 +93,7 @@ def create_cross_env(bb,d): def create_native_env(bb,d): import tarfile, socket, time - ice_dir = bb.data.expand('${CROSS_DIR}', d) + ice_dir = bb.data.expand("${STAGING_DIR_NATIVE}${prefix_native}") prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) target_sys = bb.data.expand('${TARGET_SYS}', d) @@ -131,7 +131,7 @@ def create_native_env(bb,d): def create_cross_kernel_env(bb,d): import tarfile, socket, time - ice_dir = bb.data.expand('${CROSS_DIR}', d) + ice_dir = bb.data.expand("${STAGING_DIR_NATIVE}${prefix_native}") prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) target_sys = bb.data.expand('${TARGET_SYS}', d) diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 95ffc064a..2c897c607 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -18,8 +18,6 @@ python () { #STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk" #STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}-nativesdk" -CROSS_DIR = "${TMPDIR}/cross/${HOST_ARCH}" - HOST_ARCH = "${SDK_ARCH}" HOST_VENDOR = "${SDK_VENDOR}" HOST_OS = "${SDK_OS}" diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index a04c956c8..cda16d1cc 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass @@ -128,7 +128,6 @@ def pstage_cleanpackage(pkgname, d): else: bb.note("No. Manually removing any installed files") pstage_manualclean("sysroots", "STAGING_DIR", d) - pstage_manualclean("cross", "CROSS_DIR", d) pstage_manualclean("deploy", "DEPLOY_DIR", d) bb.utils.unlockfile(lf) @@ -297,7 +296,6 @@ python packagedstage_stampfixing_eventhandler() { populate_sysroot_preamble () { if [ "$PSTAGING_ACTIVE" = "1" ]; then stage-manager -p ${STAGING_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-staging -u || true - stage-manager -p ${CROSS_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-cross -u || true fi } @@ -313,7 +311,6 @@ populate_sysroot_postamble () { if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then exit $exitcode fi - stage-manager -p ${CROSS_DIR} -c ${PSTAGE_WORKDIR}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH} if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then exit $exitcode fi @@ -324,9 +321,7 @@ populate_sysroot_postamble () { packagedstaging_fastpath () { if [ "$PSTAGING_ACTIVE" = "1" ]; then mkdir -p ${PSTAGE_TMPDIR_STAGE}/sysroots/ - mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/sysroots/ || /bin/true - cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ || /bin/true fi } |