summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-07-19 11:59:42 +0000
committerRichard Purdie <richard@openedhand.com>2008-07-19 11:59:42 +0000
commita566074ef3d690ce21306b5f8636da7ccabb7bf9 (patch)
tree8de2a7e558f20d1cc785e824a402a397d5cf9502 /meta
parent7471ff92aead597d027e90bfe273606de989dea4 (diff)
downloadpoky-a566074ef3d690ce21306b5f8636da7ccabb7bf9.tar.gz
bitbake.conf: Split STAGING and CROSS to become target specific so armv5 binaries don't mix with armv6 or v7, likewise with the cross compilers themselves. Also move pkgdata our of staging since it follows a totally different directory structure to staging. These changes break ABI so change the ABI number
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4893 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/conf/bitbake.conf14
-rw-r--r--meta/conf/sanity.conf2
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 60a69e24f3..3b10c985e5 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -897,7 +897,7 @@ def get_subpkgedata_fn(pkg, d):
897 import bb, os 897 import bb, os
898 archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ") 898 archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ")
899 archs.reverse() 899 archs.reverse()
900 pkgdata = bb.data.expand('${STAGING_DIR}/pkgdata/', d) 900 pkgdata = bb.data.expand('${TMPDIR}/pkgdata/', d)
901 targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d) 901 targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d)
902 for arch in archs: 902 for arch in archs:
903 fn = pkgdata + arch + targetdir + pkg 903 fn = pkgdata + arch + targetdir + pkg
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 49bb6f0964..3005f97bac 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -235,13 +235,13 @@ STAGING_DIR = "${TMPDIR}/staging"
235 235
236STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" 236STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
237STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}" 237STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}"
238STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${HOST_SYS}" 238STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${MULTIMACH_HOST_SYS}"
239STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}" 239STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}"
240STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}" 240STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}"
241STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" 241STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
242STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}" 242STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}"
243 243
244STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}" 244STAGING_DIR_HOST = "${STAGING_DIR}/${MULTIMACH_HOST_SYS}"
245STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" 245STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}"
246STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" 246STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}"
247STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" 247STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}"
@@ -250,7 +250,7 @@ STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
250STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" 250STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
251STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" 251STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
252 252
253STAGING_DIR_TARGET = "${STAGING_DIR}/${TARGET_SYS}" 253STAGING_DIR_TARGET = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}"
254 254
255DEPLOY_DIR = "${TMPDIR}/deploy" 255DEPLOY_DIR = "${TMPDIR}/deploy"
256DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" 256DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
@@ -260,7 +260,7 @@ DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
260DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" 260DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
261DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" 261DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
262 262
263PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_TARGET_SYS}" 263PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
264 264
265SDK_NAME = "${DISTRO}/${TARGET_ARCH}" 265SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
266SDK_PREFIX = "/usr/local/${SDK_NAME}" 266SDK_PREFIX = "/usr/local/${SDK_NAME}"
@@ -320,7 +320,7 @@ EXTRA_IMAGEDEPENDS = ""
320# Toolchain info. 320# Toolchain info.
321################################################################## 321##################################################################
322 322
323CROSS_DIR = "${TMPDIR}/cross" 323CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}"
324CROSS_DATADIR = "${CROSS_DIR}/share" 324CROSS_DATADIR = "${CROSS_DIR}/share"
325PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:" 325PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:"
326export PATH 326export PATH
@@ -525,9 +525,9 @@ SLOT = "0"
525 525
526# Other 526# Other
527 527
528export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" 528export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${layout_libdir}/pkgconfig"
529export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" 529export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
530export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${TARGET_SYS}" 530export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
531export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" 531export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
532 532
533export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake" 533export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake"
diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf
index 35d9d32de1..e5fe74894d 100644
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -11,7 +11,7 @@ BB_MIN_VERSION = "1.8.10"
11# that breaks the format and have been previously discussed on the mailing list 11# that breaks the format and have been previously discussed on the mailing list
12# with general agreement from the core team. 12# with general agreement from the core team.
13# 13#
14SANITY_ABI = "1" 14SANITY_ABI = "2"
15SANITY_ABIFILE = "${TMPDIR}/abi_version" 15SANITY_ABIFILE = "${TMPDIR}/abi_version"
16 16
17INHERIT += "sanity" 17INHERIT += "sanity"