summaryrefslogtreecommitdiffstats
path: root/meta/conf/bitbake.conf
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-09-12 12:04:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-14 08:21:00 +0100
commit6670be71f75c3d7e11362d7c9076ca4de75b50f4 (patch)
tree485fcc33b9f2a7de82db59fd72485fa68ac1d316 /meta/conf/bitbake.conf
parentee7ccda0ec5d0be79bb65868c5827dea91710b2f (diff)
downloadpoky-6670be71f75c3d7e11362d7c9076ca4de75b50f4.tar.gz
bitbake.conf: include machine name in DEPLOY_DIR_IMAGE
This allows a clean seperation between image outputs from different machines, and makes it possible to have convenience symlinks to make the output ready to deploy. This did require some surgery in runqemu; if explicit paths to the image and kernel are not supplied then DEPLOY_DIR_IMAGE needs to be determined from bitbake or set in the environment. However the script does try to avoid requiring it unless it really is needed. Corresponding changes were made in the automated testing code as well. Based on an RFC patch by Koen Kooi <koen@dominion.thruhere.net> (From OE-Core rev: 7e90261aec61f79680b5eaeaf5b18c7b795412a4) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 578c7d00eb..9eed72ad3f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -379,7 +379,7 @@ DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
379DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" 379DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
380DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" 380DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
381DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" 381DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
382DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images" 382DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images/${MACHINE}"
383DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" 383DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
384 384
385PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" 385PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"