diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-07-19 14:07:55 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-07-19 14:07:55 +0000 |
| commit | cfdb9ae992bf4e218a9b8410205c46d4da749170 (patch) | |
| tree | f6aedcd7e1bbb345695c832c2c9f2c3c672052de /conf/bitbake.conf | |
| parent | 73d44fbb08742d10c1cd1a7ce07a4a699465c4ad (diff) | |
conf/bitbake.conf: Merge in multimachine making it the standard layout as discussed on the mailing list. Anyone wanting the previous layout can INHERIT the new singlemachine class
Diffstat (limited to 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 8ee1cc6838..1e385f1394 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -91,6 +91,10 @@ 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" @@ -211,8 +215,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}" @@ -248,7 +252,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}" @@ -258,7 +262,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. |