From 061df5abaf727741b11c05db2c47e2778f96d96e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 2 Jul 2010 14:35:08 +0100 Subject: 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 --- meta/classes/cross-canadian.bbclass | 8 ++++---- meta/classes/nativesdk.bbclass | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index e5453848ae..29ee99042b 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 2c897c6076..892bae5ecf 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 \ -- cgit 1.2.3-korg