diff options
| author |   Joshua Lock <josh@linux.intel.com> | 2010-03-30 14:47:57 +0100 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-05-05 15:04:57 +0100 |
| commit | 838a58ab01a9f325430fe6c4cc1dac7c2255a69c (patch) | |
| tree | ca2b0e767dffe00aed392c8fd37be32aeb869d7e /conf | |
| parent | 692f64df9aa931780b98a9dc8505cfa7b61fbac0 (diff) | |
| download | openembedded-838a58ab01a9f325430fe6c4cc1dac7c2255a69c.tar.gz | |
bitbake.conf/base.bbclass: Rename the staging directory to sysroots and the populate_staging task to populate_sysroot
This change, pulled from Poky, 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.
This patch also includes fixes for all recipes which reference the directory.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/abi_version.conf | 2 | ||||
| -rw-r--r-- | conf/bitbake.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/abi_version.conf b/conf/abi_version.conf index 7f190c38c1..92b6b5868a 100644 --- a/conf/abi_version.conf +++ b/conf/abi_version.conf @@ -4,7 +4,7 @@ # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "3" +OELAYOUT_ABI = "4" # # DISTRO_PR allows us to regenerate all packages when a fundamental change is diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 74d4da238e..5a5eefad94 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -295,7 +295,7 @@ D = "${WORKDIR}/image" S = "${WORKDIR}/${BP}" B = "${S}" -STAGING_DIR = "${TMPDIR}/staging" +STAGING_DIR = "${TMPDIR}/sysroots" STAGING_DIR_JAVA = "${STAGING_DIR}/java" STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" |