From 3fbbc44cfd0d68c67bda0f6180773922431cca0e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 17 Sep 2009 13:18:48 +0100 Subject: nativesdk/package_ipk.bbclass: Clean up sdk package architectures Signed-off-by: Richard Purdie --- meta/classes/cross-canadian.bbclass | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'meta/classes/cross-canadian.bbclass') diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 334f12cdae..bd738ecd4d 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -6,7 +6,8 @@ EXCLUDE_FROM_WORLD = "1" OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" # Save PACKAGE_ARCH OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} -PACKAGE_ARCH = "${HOST_ARCH}-${OLD_PACKAGE_ARCH}-nativesdk" +PACKAGE_ARCH = "${SDK_ARCH}-${TARGET_ARCH}-canadian" +PACKAGE_ARCHS = "${PACKAGE_ARCH}" # Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}" BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}" @@ -17,7 +18,7 @@ STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk" STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}" PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir_cross}" -PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_HOST_SYS}" +PKGDATA_DIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}" HOST_ARCH = "${SDK_ARCH}" HOST_VENDOR = "${SDK_VENDOR}" @@ -43,14 +44,3 @@ FILES_${PN}-dbg += "${prefix}/.debug \ export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" -python () { - barch = bb.data.getVar('HOST_ARCH', d, True) - archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split() - sdkarchs = [] - for arch in archs: - sdkarchs.append(barch + '-' + arch + '-nativesdk') - bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d) -} - - - -- cgit v1.2.3-54-g00ecf