diff options
author | Richard Purdie <richard@openedhand.com> | 2008-07-17 20:49:48 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-07-17 20:49:48 +0000 |
commit | 767d9ca544c9c5bce686d8924619d9ab2385d8e8 (patch) | |
tree | c68c8b6f810d0c72eb82bf894de42e6d39c369dd /meta/conf/bitbake.conf | |
parent | 45d0dac16ad84f9eb0264dfd662238e3913619d6 (diff) | |
download | poky-767d9ca544c9c5bce686d8924619d9ab2385d8e8.tar.gz |
Merge multimachine class into bitbake.conf and create singlemachine.bbclass as a backwards compatibility option
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4858 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r-- | meta/conf/bitbake.conf | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index ad85dc3861..cee68ef9fc 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -91,6 +91,9 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" | |||
91 | MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" | 91 | MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" |
92 | PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" | 92 | PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" |
93 | 93 | ||
94 | MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" | ||
95 | MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" | ||
96 | |||
94 | # select proper CPU to get binary locales generated | 97 | # select proper CPU to get binary locales generated |
95 | QEMU_OPTIONS = "" | 98 | QEMU_OPTIONS = "" |
96 | QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5" | 99 | QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5" |
@@ -218,8 +221,8 @@ SVNDIR = "${DL_DIR}/svn" | |||
218 | GITDIR = "${DL_DIR}/git" | 221 | GITDIR = "${DL_DIR}/git" |
219 | BZRDIR = "${DL_DIR}/bzr" | 222 | BZRDIR = "${DL_DIR}/bzr" |
220 | 223 | ||
221 | STAMP = "${TMPDIR}/stamps/${PF}" | 224 | STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}" |
222 | WORKDIR = "${TMPDIR}/work/${PF}" | 225 | WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" |
223 | T = "${WORKDIR}/temp" | 226 | T = "${WORKDIR}/temp" |
224 | D = "${WORKDIR}/image" | 227 | D = "${WORKDIR}/image" |
225 | S = "${WORKDIR}/${P}" | 228 | S = "${WORKDIR}/${P}" |
@@ -254,7 +257,7 @@ DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" | |||
254 | DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" | 257 | DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" |
255 | DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" | 258 | DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" |
256 | 259 | ||
257 | PKGDATA_DIR = "${STAGING_DIR}/pkgdata" | 260 | PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_TARGET_SYS}" |
258 | 261 | ||
259 | SDK_NAME = "${DISTRO}/${TARGET_ARCH}" | 262 | SDK_NAME = "${DISTRO}/${TARGET_ARCH}" |
260 | SDK_PREFIX = "/usr/local/${SDK_NAME}" | 263 | SDK_PREFIX = "/usr/local/${SDK_NAME}" |
@@ -264,7 +267,7 @@ SDK_PREFIX = "/usr/local/${SDK_NAME}" | |||
264 | ################################################################## | 267 | ################################################################## |
265 | 268 | ||
266 | OLDEST_KERNEL = "2.4.0" | 269 | OLDEST_KERNEL = "2.4.0" |
267 | STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel" | 270 | STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/kernel" |
268 | 271 | ||
269 | ################################################################## | 272 | ################################################################## |
270 | # Specific image creation and rootfs population info. | 273 | # Specific image creation and rootfs population info. |