rm_work: Retain package and package-split directories to be consistent with sstate code

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

1 files changed, 4 insertions, 1 deletions

diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 501583cdc9..7cbdb17623 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -19,7 +19,10 @@ do_rm_work () {
     do
         if [ `basename ${S}` = $dir ]; then
             rm -rf $dir
-        elif [ $dir != 'temp' ]; then
+        # The package and package-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 != 'package-split' ]; then
             rm -rf $dir
         fi
     done