From b772c8cde5a8d53de5588ff5d2771c1bd3eb259f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 10 Nov 2009 14:55:23 +0000 Subject: 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 --- meta/classes/sanity.bbclass | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'meta/classes/sanity.bbclass') diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 39f1e22003..71250b80af 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -147,6 +147,13 @@ def check_sanity(e): if not abi.isdigit(): f = file(abifile, "w") f.write(current_abi) + elif abi == "2" and current_abi == "3": + 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) -- cgit v1.2.3-54-g00ecf