diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-09-12 12:04:52 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-12 16:48:38 +0100 |
| commit | 7e90261aec61f79680b5eaeaf5b18c7b795412a4 (patch) | |
| tree | e971aa90f82a754e6d005533036702903a450b72 /meta/conf | |
| parent | ebfdddc23ff78231a819c62c8ffcced9633aa08b (diff) | |
| download | openembedded-core-7e90261aec61f79680b5eaeaf5b18c7b795412a4.tar.gz openembedded-core-7e90261aec61f79680b5eaeaf5b18c7b795412a4.tar.bz2 openembedded-core-7e90261aec61f79680b5eaeaf5b18c7b795412a4.zip | |
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>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 2 |
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" DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" -DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images" +DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images/${MACHINE}" DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" |