diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-04-28 13:59:36 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-04-28 16:47:14 +0100 |
| commit | 6458da896fffe33ab5db8cc2606e8225e16b0f36 (patch) | |
| tree | 340e8d6ec9c0ed64eb422ab8ffda18815b3ae474 /meta/classes | |
| parent | 29813a43b5c50bab571c3b593460c78aab65eac4 (diff) | |
| download | openembedded-core-6458da896fffe33ab5db8cc2606e8225e16b0f36.tar.gz openembedded-core-6458da896fffe33ab5db8cc2606e8225e16b0f36.tar.bz2 openembedded-core-6458da896fffe33ab5db8cc2606e8225e16b0f36.tar.xz openembedded-core-6458da896fffe33ab5db8cc2606e8225e16b0f36.zip | |
Fix references to CROSS_DIR now that it has been removed
CROSS_DIR is no longer removed so fix up classes, packages and documentation
which refer to it.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/cross-canadian.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/cross.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/module_strip.bbclass | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index b7b449f47..56b0db8d6 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -17,7 +17,7 @@ INHIBIT_DEFAULT_DEPS = "1" STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk" STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}" -PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir_cross}" +PATH_append = ":${TMPDIR}/sysroots/${HOST_ARCH}/${bindir_cross}" PKGDATA_DIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}" PKGHIST_DIR = "${TMPDIR}/pkghistory/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/" @@ -36,7 +36,7 @@ DEPENDS_GETTEXT = "gettext-native gettext-nativesdk" # Path mangling needed by the cross packaging # Note that we use := here to ensure that libdir and includedir are -# target paths, not CROSS_DIR paths. +# target paths. target_libdir := "${libdir}" target_includedir := "${includedir}" target_base_libdir := "${base_libdir}" diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 30f136f15..5720cdbcc 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -32,7 +32,7 @@ DEPENDS_GETTEXT = "gettext-native" # Path mangling needed by the cross packaging # Note that we use := here to ensure that libdir and includedir are -# target paths, not CROSS_DIR paths. +# target paths. target_libdir := "${libdir}" target_includedir := "${includedir}" target_base_libdir := "${base_libdir}" diff --git a/meta/classes/module_strip.bbclass b/meta/classes/module_strip.bbclass index 63e656979..7636f1f40 100644 --- a/meta/classes/module_strip.bbclass +++ b/meta/classes/module_strip.bbclass @@ -9,8 +9,8 @@ do_strip_modules () { if ! [ -d "$module" ] ; then ${STRIP} -v -g $module fi - done -# NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules + done +# NM="${STAGING_BINDIR_NATIVE}/${HOST_PREFIX}nm" OBJCOPY="${STAGING_BINDIR_NATIVE}/${HOST_PREFIX}objcopy" strip_module $modules fi fi done |