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 | |
| parent | 45d0dac16ad84f9eb0264dfd662238e3913619d6 (diff) | |
| download | openembedded-core-767d9ca544c9c5bce686d8924619d9ab2385d8e8.tar.gz openembedded-core-767d9ca544c9c5bce686d8924619d9ab2385d8e8.tar.bz2 openembedded-core-767d9ca544c9c5bce686d8924619d9ab2385d8e8.tar.xz openembedded-core-767d9ca544c9c5bce686d8924619d9ab2385d8e8.zip | |
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')
| -rw-r--r-- | meta/conf/bitbake.conf | 11 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index ad85dc386..cee68ef9f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -91,6 +91,9 @@ 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_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" @@ -218,8 +221,8 @@ SVNDIR = "${DL_DIR}/svn" GITDIR = "${DL_DIR}/git" BZRDIR = "${DL_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}" @@ -254,7 +257,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}" @@ -264,7 +267,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. diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index ba51d1e19..2a6927371 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -9,7 +9,7 @@ MAINTAINER = "OpenedHand <poky@openedhand.com>" PACKAGE_CLASSES ?= "package_ipk" INHERIT_INSANE ?= "insane" -INHERIT += "${PACKAGE_CLASSES} debian multimachine poky devshell ${INHERIT_INSANE}" +INHERIT += "${PACKAGE_CLASSES} debian poky devshell ${INHERIT_INSANE}" # For some reason, this doesn't work # TARGET_OS ?= "linux" # TARGET_VENDOR ?= "-poky" |