diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-10 14:55:23 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-13 12:15:42 +0000 |
| commit | b772c8cde5a8d53de5588ff5d2771c1bd3eb259f (patch) | |
| tree | 60251b8473d901544fb39acae4d0b9b780e81575 /meta/conf | |
| parent | 6c92cfc02014a55c4d3a40d70ff29308ad6255e7 (diff) | |
| download | openembedded-core-b772c8cde5a8d53de5588ff5d2771c1bd3eb259f.tar.gz openembedded-core-b772c8cde5a8d53de5588ff5d2771c1bd3eb259f.tar.bz2 openembedded-core-b772c8cde5a8d53de5588ff5d2771c1bd3eb259f.zip | |
bitbake.conf/base.bbclass: Rename the staging directory to sysroots and the populate_staging task to populate_sysroot
This change makes the purpose of the staging directory more obvious and
the taskname more true to what it now actually does.
The layout version number is increased due to the change in layout
but code to convert existing directories and insert a symlink for
backwards compatibility is included.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
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 @@ # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "2" +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" S = "${WORKDIR}/${BP}" B = "${S}" -STAGING_DIR = "${TMPDIR}/staging" +STAGING_DIR = "${TMPDIR}/sysroots" STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" |