staging.bbclass: Only clean out the sysroot if we rerun configure, not at setscene time
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
c7ad2dada7
commit
8cae183a22
|
@ -238,7 +238,6 @@ def sstate_clean(ss, d):
|
||||||
|
|
||||||
oe.path.remove(d.getVar("STAMP", True) + ".do_" + ss['task'] + "*")
|
oe.path.remove(d.getVar("STAMP", True) + ".do_" + ss['task'] + "*")
|
||||||
|
|
||||||
SCENEFUNCS += "sstate_cleanall"
|
|
||||||
CLEANFUNCS += "sstate_cleanall"
|
CLEANFUNCS += "sstate_cleanall"
|
||||||
|
|
||||||
python sstate_cleanall() {
|
python sstate_cleanall() {
|
||||||
|
|
|
@ -65,6 +65,12 @@ SYSROOT_PREPROCESS_FUNCS ?= ""
|
||||||
SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/"
|
SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/"
|
||||||
SYSROOT_LOCK = "${STAGING_DIR}/staging.lock"
|
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 () {
|
python do_populate_sysroot () {
|
||||||
#
|
#
|
||||||
|
@ -92,7 +98,6 @@ python do_populate_sysroot_setscene () {
|
||||||
}
|
}
|
||||||
addtask do_populate_sysroot_setscene
|
addtask do_populate_sysroot_setscene
|
||||||
|
|
||||||
|
|
||||||
python () {
|
python () {
|
||||||
if bb.data.getVar('do_stage', d, True) is not None:
|
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))
|
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))
|
||||||
|
|
Loading…
Reference in New Issue