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 /classes/sanity.bbclass | |
| 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 'classes/sanity.bbclass')
| -rw-r--r-- | classes/sanity.bbclass | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 4051d49557..2e9151f540 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -141,6 +141,13 @@ def check_sanity(e): if not abi.isdigit(): f = file(abifile, "w") f.write(current_abi) + elif abi == "3" and current_abi == "4": + bb.note("Converting staging from layout version 2 to layout version 3") + os.system(bb.data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots", e.data)) + os.system(bb.data.expand("ln -s sysroots ${TMPDIR}/staging", e.data)) + os.system(bb.data.expand("cd ${TMPDIR}/stamps; for i in */*do_populate_staging; do new=`echo $i | sed -e 's/do_populate_staging/do_populate_sysroot/'`; mv $i $new; done", e.data)) + f = file(abifile, "w") + f.write(current_abi) elif (abi != current_abi): # Code to convert from one ABI to another could go here if possible. messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi) |