summaryrefslogtreecommitdiff
path: root/conf/bitbake.conf
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-09-05 12:03:49 -0700
committerKhem Raj <raj.khem@gmail.com>2010-09-07 14:43:09 -0700
commit24dc165e69127f086ed7eb6970c64f91393e84ef (patch)
tree0cf37ec92f6d1e153b2f93d2fc5ec158fb868813 /conf/bitbake.conf
parent241b8865f20b9e3c3beb334535e6cd8452cbf47d (diff)
bitbake.conf: Redefine STAGING_DIR_JAVA to point to target sysroot by default
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'conf/bitbake.conf')
-rw-r--r--conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 677c76a2f7..b0994995cb 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -295,7 +295,6 @@ B = "${S}"
STAGING_DIR = "${TMPDIR}/sysroots"
-STAGING_DIR_JAVA = "${STAGING_DIR}/java"
STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
STAGING_SBINDIR_NATIVE = "${STAGING_DIR_NATIVE}${sbindir_native}"
@@ -321,6 +320,7 @@ STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
# This should really be MULTIMACH_TARGET_SYS but that breaks "all" and machine
# specific packages - hack around it for now.
STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
+STAGING_DIR_JAVA = "${STAGING_DATADIR}/java"
STAGING_DIR_SDK = "${STAGING_DIR}/${SDK_SYS}"