diff options
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r-- | meta/conf/bitbake.conf | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index c973ce1da4..8ac5846052 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -94,6 +94,8 @@ PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE} | |||
94 | MULTIMACH_ARCH = "${PACKAGE_ARCH}" | 94 | MULTIMACH_ARCH = "${PACKAGE_ARCH}" |
95 | MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" | 95 | MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" |
96 | MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" | 96 | MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" |
97 | BASEPKG_HOST_SYS = "${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}" | ||
98 | BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" | ||
97 | 99 | ||
98 | # select proper CPU to get binary locales generated | 100 | # select proper CPU to get binary locales generated |
99 | QEMU_OPTIONS = "" | 101 | QEMU_OPTIONS = "" |
@@ -242,7 +244,9 @@ STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}" | |||
242 | STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" | 244 | STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" |
243 | STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}" | 245 | STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}" |
244 | 246 | ||
245 | STAGING_DIR_HOST = "${STAGING_DIR}/${MULTIMACH_HOST_SYS}" | 247 | # This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine |
248 | # specific packages - hack around it for now. | ||
249 | STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}" | ||
246 | STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" | 250 | STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" |
247 | STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" | 251 | STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" |
248 | STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" | 252 | STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" |
@@ -252,7 +256,9 @@ STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" | |||
252 | STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" | 256 | STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" |
253 | STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" | 257 | STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" |
254 | 258 | ||
255 | STAGING_DIR_TARGET = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}" | 259 | # This should really be MULTIMACH_TARGET_SYS but that breaks "all" and machine |
260 | # specific packages - hack around it for now. | ||
261 | STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}" | ||
256 | 262 | ||
257 | DEPLOY_DIR = "${TMPDIR}/deploy" | 263 | DEPLOY_DIR = "${TMPDIR}/deploy" |
258 | DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" | 264 | DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" |