Patchwork staging.bbclass: Ensure the task starts from a clean directory

login
register
mail settings
Submitter Richard Purdie
Date July 19, 2012, 1:23 p.m.
Message ID <1342704182.7940.9.camel@ted>
Download mbox | patch
Permalink /patch/32519/
State Accepted
Commit 8a313f6d32ae0bdac0393887712b09f1b685aaa5
Headers show

Comments

Richard Purdie - July 19, 2012, 1:23 p.m.
I found that some files were not getting removed from the sysroot, despite them
clearly being removed by the recipe. I found SYSROOT_DESTDIR is only ever copied
into, not cleaned. This patch ensures its empty when the task starts so that
stale files are removed and not persisted.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 6540349..1af9b15 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -105,6 +105,7 @@  python do_populate_sysroot () {
 }
 
 SSTATETASKS += "do_populate_sysroot"
+do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}"
 do_populate_sysroot[sstate-name] = "populate-sysroot"
 do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}"
 do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST}/"