diff options
author | Tom Rini <trini@embeddedalley.com> | 2009-01-27 18:03:07 -0500 |
---|---|---|
committer | Tom Rini <trini@embeddedalley.com> | 2009-01-27 18:03:07 -0500 |
commit | 2ae4d66192f2db96bbd79ddcc33e6aac7c1bd960 (patch) | |
tree | 11a2c7c90703d8034d755297e156b420c075c8e7 /conf/bitbake.conf | |
parent | ffee230ed0b6c49ef4a0b23bc850b843c429f19a (diff) | |
parent | 04c9615b938eaabfbadc99c1707eb44657c95a61 (diff) | |
download | openembedded-2ae4d66192f2db96bbd79ddcc33e6aac7c1bd960.tar.gz |
Merge trini/canadian-merge branch into org.openembedded.dev, fixup a
conflict on checksums.ini
Diffstat (limited to 'conf/bitbake.conf')
-rw-r--r-- | conf/bitbake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 1164411963..effa67003d 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -285,7 +285,7 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" SDK_NAME = "${DISTRO}/${TARGET_ARCH}" -SDK_PREFIX = "/usr/local/${SDK_NAME}" +SDK_PATH = "/usr/local/${SDK_NAME}" ################################################################## # Kernel info. |