diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-27 20:58:38 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-28 10:28:19 +0000 |
| commit | 8cae183a22ee059afcd27dc215848aeb9bda12d2 (patch) | |
| tree | c93fb388265b637874ab44bdcdef8aee0b77790e /meta | |
| parent | c7ad2dada79f715e5a5d54b2711c2956217588e7 (diff) | |
| download | openembedded-core-8cae183a22ee059afcd27dc215848aeb9bda12d2.tar.gz openembedded-core-8cae183a22ee059afcd27dc215848aeb9bda12d2.tar.bz2 openembedded-core-8cae183a22ee059afcd27dc215848aeb9bda12d2.zip | |
staging.bbclass: Only clean out the sysroot if we rerun configure, not at setscene time
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/sstate.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/staging.bbclass | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index d7d30c0121..4435abc347 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -238,7 +238,6 @@ def sstate_clean(ss, d): oe.path.remove(d.getVar("STAMP", True) + ".do_" + ss['task'] + "*") -SCENEFUNCS += "sstate_cleanall" CLEANFUNCS += "sstate_cleanall" python sstate_cleanall() { diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 718b2f1f25..a713734c3f 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -65,6 +65,12 @@ SYSROOT_PREPROCESS_FUNCS ?= "" SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/" SYSROOT_LOCK = "${STAGING_DIR}/staging.lock" +# We clean out any existing sstate from the sysroot if we rerun configure +python sysroot_cleansstate () { + ss = sstate_state_fromvars(d, "populate_sysroot") + sstate_clean(ss, d) +} +do_configure[prefuncs] += "sysroot_cleansstate" python do_populate_sysroot () { # @@ -92,7 +98,6 @@ python do_populate_sysroot_setscene () { } addtask do_populate_sysroot_setscene - python () { if bb.data.getVar('do_stage', d, True) is not None: bb.fatal("Legacy staging found for %s as it has a do_stage function. This will need conversion to a do_install or often simply removal to work with Poky" % bb.data.getVar("FILE", d, True)) |