[PATCH] rm_work: remove package and packages-split dirs

Martin Jansa
2013-02-01T18:15:31Z

meta/classes/rm_work.bbclass | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 997dcd1..24d0679 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -19,13 +19,13 @@ do_rm_work () {
do
if [ `basename ${S}` = $dir ]; then
rm -rf $dir
- # The package and packages-split directories are retained by sstate for
- # do_package so we retain them here too. Anything in sstate 'plaindirs'
- # should be retained. Also retain logs and other files in temp.
- elif [ $dir != 'temp' ] && [ $dir != 'package' ] && [ $dir != 'packages-split' ]; then
+ # Anything in sstate 'plaindirs' should be retained.
+ # Also retain logs and other files in temp.
+ 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/
@@ -54,6 +54,11 @@ do_rm_work () {
i=dummy
break
;;
+ *do_package|*do_package_setscene)
+ i=dummy
+ rm -f $i;
+ break
+ ;;
*_setscene*)
i=dummy
break
--
1.8.1.2