diff options
-rw-r--r-- | meta/classes/base.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 14 | ||||
-rw-r--r-- | meta/conf/sanity.conf | 2 |
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 | ||
236 | STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" | 236 | STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" |
237 | STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}" | 237 | STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}" |
238 | STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${HOST_SYS}" | 238 | STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${MULTIMACH_HOST_SYS}" |
239 | STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}" | 239 | STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}" |
240 | STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}" | 240 | STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}" |
241 | STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" | 241 | STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" |
242 | STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}" | 242 | STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}" |
243 | 243 | ||
244 | STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}" | 244 | STAGING_DIR_HOST = "${STAGING_DIR}/${MULTIMACH_HOST_SYS}" |
245 | STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" | 245 | STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" |
246 | STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" | 246 | STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" |
247 | STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" | 247 | STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" |
@@ -250,7 +250,7 @@ STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" | |||
250 | STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" | 250 | STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" |
251 | STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" | 251 | STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" |
252 | 252 | ||
253 | STAGING_DIR_TARGET = "${STAGING_DIR}/${TARGET_SYS}" | 253 | STAGING_DIR_TARGET = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}" |
254 | 254 | ||
255 | DEPLOY_DIR = "${TMPDIR}/deploy" | 255 | DEPLOY_DIR = "${TMPDIR}/deploy" |
256 | DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" | 256 | DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" |
@@ -260,7 +260,7 @@ DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" | |||
260 | DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" | 260 | DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" |
261 | DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" | 261 | DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" |
262 | 262 | ||
263 | PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_TARGET_SYS}" | 263 | PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" |
264 | 264 | ||
265 | SDK_NAME = "${DISTRO}/${TARGET_ARCH}" | 265 | SDK_NAME = "${DISTRO}/${TARGET_ARCH}" |
266 | SDK_PREFIX = "/usr/local/${SDK_NAME}" | 266 | SDK_PREFIX = "/usr/local/${SDK_NAME}" |
@@ -320,7 +320,7 @@ EXTRA_IMAGEDEPENDS = "" | |||
320 | # Toolchain info. | 320 | # Toolchain info. |
321 | ################################################################## | 321 | ################################################################## |
322 | 322 | ||
323 | CROSS_DIR = "${TMPDIR}/cross" | 323 | CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}" |
324 | CROSS_DATADIR = "${CROSS_DIR}/share" | 324 | CROSS_DATADIR = "${CROSS_DIR}/share" |
325 | PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:" | 325 | PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:" |
326 | export PATH | 326 | export PATH |
@@ -525,9 +525,9 @@ SLOT = "0" | |||
525 | 525 | ||
526 | # Other | 526 | # Other |
527 | 527 | ||
528 | export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" | 528 | export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${layout_libdir}/pkgconfig" |
529 | export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" | 529 | export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" |
530 | export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${TARGET_SYS}" | 530 | export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" |
531 | export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" | 531 | export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" |
532 | 532 | ||
533 | export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake" | 533 | export 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 | # |
14 | SANITY_ABI = "1" | 14 | SANITY_ABI = "2" |
15 | SANITY_ABIFILE = "${TMPDIR}/abi_version" | 15 | SANITY_ABIFILE = "${TMPDIR}/abi_version" |
16 | 16 | ||
17 | INHERIT += "sanity" | 17 | INHERIT += "sanity" |