diff options
Diffstat (limited to 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index b5b25407c3..9ce51821b1 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -86,10 +86,15 @@ TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS' TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" -PACKAGE_ARCH = "${HOST_ARCH}" +BASE_PACKAGE_ARCH = "${HOST_ARCH}" +PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" +MULTIMACH_ARCH = "${PACKAGE_ARCH}" +MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" + # select proper CPU to get binary locales generated QEMU_OPTIONS = "" QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5" @@ -160,6 +165,8 @@ RPROVIDES = "" MULTI_PROVIDER_WHITELIST = "virtual/libintl" PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" +#enable this when bitbake is upgraded to cope with ++ values in the field +#PACKAGES_DYNAMIC = "${PN}-locale-*" FILES = "" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ @@ -209,8 +216,8 @@ SVNDIR = "${CO_DIR}/svn" GITDIR = "${CO_DIR}/git" BZRDIR = "${CO_DIR}/bzr" -STAMP = "${TMPDIR}/stamps/${PF}" -WORKDIR = "${TMPDIR}/work/${PF}" +STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}" +WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" T = "${WORKDIR}/temp" D = "${WORKDIR}/image" S = "${WORKDIR}/${P}" @@ -246,7 +253,7 @@ DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" -PKGDATA_DIR = "${STAGING_DIR}/pkgdata" +PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_TARGET_SYS}" SDK_NAME = "${DISTRO}/${TARGET_ARCH}" SDK_PREFIX = "/usr/local/${SDK_NAME}" @@ -256,7 +263,7 @@ SDK_PREFIX = "/usr/local/${SDK_NAME}" ################################################################## OLDEST_KERNEL = "2.4.0" -STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel" +STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/kernel" ################################################################## # Specific image creation and rootfs population info. @@ -380,6 +387,7 @@ export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ ALLOWED_FLAGS = "-O -mcpu -march -pipe" # Pass parallel make options to the compile task only +EXTRA_OEMAKE_prepend_task_do_compile = "${PARALLEL_MAKE} " EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} " ################################################################## |