diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 15:13:54 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 15:13:54 +0100 |
| commit | 74981bb0217ef397f510277351c369bf443cc591 (patch) | |
| tree | 4c04233d8447432172b45ce2c91bb563b40fd741 /conf/bitbake.conf | |
| parent | f45580a1527dccdda100eee7f25f9f2c41af4db8 (diff) | |
| parent | b7e9814253f4b8f61e68d9aa7f518c1404cf417f (diff) | |
| download | openembedded-74981bb0217ef397f510277351c369bf443cc591.tar.gz | |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 48e098db44..3a68959c6c 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -297,6 +297,7 @@ B = "${S}" STAGING_DIR = "${TMPDIR}/staging" +STAGING_DIR_JAVA = "${STAGING_DIR}/java" STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}" |