diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 14:35:08 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 14:35:08 +0100 |
| commit | 061df5abaf727741b11c05db2c47e2778f96d96e (patch) | |
| tree | a79062441b0bd9564320c951cc330a268b28994e /meta/classes | |
| parent | 4e0ee648b4c18b770aba11921370258f3e2aaeef (diff) | |
| download | openembedded-core-061df5abaf727741b11c05db2c47e2778f96d96e.tar.gz openembedded-core-061df5abaf727741b11c05db2c47e2778f96d96e.tar.bz2 openembedded-core-061df5abaf727741b11c05db2c47e2778f96d96e.tar.xz openembedded-core-061df5abaf727741b11c05db2c47e2778f96d96e.zip | |
meta-toolchain: Improve layout
* Switch from /usr/local/poky to /opt/poky
* Use a sysroots directory for both the "native" sdk binaries and the target
* Drop the meta-toolchain extras packages. These are replaced with packaged-staging.
* Change the nativesdk layout to match our usual filesystem layout
* Clean up various hardcoded prefix references
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/cross-canadian.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/nativesdk.bbclass | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index e5453848a..29ee99042 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -44,9 +44,9 @@ target_prefix := "${prefix}" target_exec_prefix := "${exec_prefix}" # Change to place files in SDKPATH -prefix = "${SDKPATH}" -exec_prefix = "${SDKPATH}" -base_prefix = "${SDKPATH}" +base_prefix = "${SDKPATHNATIVE}" +prefix = "${SDKPATHNATIVE}${prefix_nativesdk}" +exec_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}" FILES_${PN} = "${prefix}" FILES_${PN}-dbg += "${prefix}/.debug \ @@ -56,5 +56,5 @@ FILES_${PN}-dbg += "${prefix}/.debug \ export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" -# Cross-canadian packages need to pull in nativesdk so's, sorry for ugliness +# Cross-canadian packages need to pull in nativesdk dynamic libs SHLIBSDIR = "${STAGING_DIR}/${SDK_ARCH}-nativesdk-pokysdk-${BUILD_OS}/shlibs" diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 2c897c607..892bae5ec 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -37,9 +37,9 @@ CXXFLAGS = "${BUILDSDK_CFLAGS}" LDFLAGS = "${BUILDSDK_LDFLAGS}" # Change to place files in SDKPATH -prefix = "${SDKPATH}" -exec_prefix = "${SDKPATH}" -base_prefix = "${SDKPATH}" +base_prefix = "${SDKPATHNATIVE}" +prefix = "${SDKPATHNATIVE}${prefix_nativesdk}" +exec_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}" FILES_${PN} += "${prefix}" FILES_${PN}-dbg += "${prefix}/.debug \ |