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/classes/staging.bbclass | |
parent | c7ad2dada79f715e5a5d54b2711c2956217588e7 (diff) | |
download | poky-8cae183a22ee059afcd27dc215848aeb9bda12d2.tar.gz |
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/classes/staging.bbclass')
-rw-r--r-- | meta/classes/staging.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
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 ?= "" | |||
65 | SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/" | 65 | SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/" |
66 | SYSROOT_LOCK = "${STAGING_DIR}/staging.lock" | 66 | SYSROOT_LOCK = "${STAGING_DIR}/staging.lock" |
67 | 67 | ||
68 | # We clean out any existing sstate from the sysroot if we rerun configure | ||
69 | python sysroot_cleansstate () { | ||
70 | ss = sstate_state_fromvars(d, "populate_sysroot") | ||
71 | sstate_clean(ss, d) | ||
72 | } | ||
73 | do_configure[prefuncs] += "sysroot_cleansstate" | ||
68 | 74 | ||
69 | python do_populate_sysroot () { | 75 | python do_populate_sysroot () { |
70 | # | 76 | # |
@@ -92,7 +98,6 @@ python do_populate_sysroot_setscene () { | |||
92 | } | 98 | } |
93 | addtask do_populate_sysroot_setscene | 99 | addtask do_populate_sysroot_setscene |
94 | 100 | ||
95 | |||
96 | python () { | 101 | python () { |
97 | if bb.data.getVar('do_stage', d, True) is not None: | 102 | if bb.data.getVar('do_stage', d, True) is not None: |
98 | 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)) | 103 | 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)) |