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/base.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/base.bbclass')
| -rw-r--r-- | classes/base.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 31b551a9a2..3c854c6e7b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -325,7 +325,7 @@ python base_eventhandler() { addtask configure after do_unpack do_patch do_configure[dirs] = "${S} ${B}" -do_configure[deptask] = "do_populate_staging" +do_configure[deptask] = "do_populate_sysroot" base_do_configure() { : } @@ -393,7 +393,7 @@ python () { srcuri = bb.data.getVar('SRC_URI', d, 1) if "git://" in srcuri: depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" - depends = depends + " git-native:do_populate_staging" + depends = depends + " git-native:do_populate_sysroot" bb.data.setVarFlag('do_fetch', 'depends', depends, d) # unzip-native should already be staged before unpacking ZIP recipes @@ -402,7 +402,7 @@ python () { if ".zip" in src_uri or need_unzip == "1": depends = bb.data.getVarFlag('do_unpack', 'depends', d) or "" - depends = depends + " unzip-native:do_populate_staging" + depends = depends + " unzip-native:do_populate_sysroot" bb.data.setVarFlag('do_unpack', 'depends', depends, d) # 'multimachine' handling |