diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/abi_version.conf | 2 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index a6704254d4..3ffcb616ca 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf | |||
@@ -4,4 +4,4 @@ | |||
4 | # that breaks the format and have been previously discussed on the mailing list | 4 | # that breaks the format and have been previously discussed on the mailing list |
5 | # with general agreement from the core team. | 5 | # with general agreement from the core team. |
6 | # | 6 | # |
7 | OELAYOUT_ABI = "2" | 7 | OELAYOUT_ABI = "3" |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 33fc9c6b60..bcc858c287 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -250,7 +250,7 @@ D = "${WORKDIR}/image" | |||
250 | S = "${WORKDIR}/${BP}" | 250 | S = "${WORKDIR}/${BP}" |
251 | B = "${S}" | 251 | B = "${S}" |
252 | 252 | ||
253 | STAGING_DIR = "${TMPDIR}/staging" | 253 | STAGING_DIR = "${TMPDIR}/sysroots" |
254 | 254 | ||
255 | STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" | 255 | STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" |
256 | STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" | 256 | STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" |