From 99c0cbd6d6ab0d0130c251ad89b114a09c6df1c4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 12 Oct 2010 15:52:07 +0100 Subject: rm_work: Fix interaction issues with pseudo This class needs to wipe out the contents of the pseudo database but also ensure the pseudo directory exists for any subsequent tasks and also ensure any pseudo server has shut down before removing the database. This patch does all of these things. [BUGID #222] Signed-off-by: Richard Purdie --- meta/classes/rm_work.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/classes/rm_work.bbclass') diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass index 998172e0c0..1600fc8177 100644 --- a/meta/classes/rm_work.bbclass +++ b/meta/classes/rm_work.bbclass @@ -10,15 +10,20 @@ RMWORK_ORIG_TASK := "${BB_DEFAULT_TASK}" BB_DEFAULT_TASK = "rm_work_all" do_rm_work () { + # Ensure pseudo is no longer active + ${FAKEROOT} -S cd ${WORKDIR} for dir in * do if [ `basename ${S}` = $dir ]; then rm -rf $dir - elif [ $dir != 'temp' -a $dir != 'pseudo' ]; then + elif [ $dir != 'temp' ]; then rm -rf $dir fi done + # Need to add pseudo back or subsqeuent work in this workdir + # might fail since setscene may not rerun to recreate it + mkdir ${WORKDIR}/pseudo/ } addtask rm_work after do_${RMWORK_ORIG_TASK} -- cgit 1.2.3-korg