From patchwork Fri Feb 1 17:59:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: rm_work: remove package and packages-split dirs Date: Fri, 01 Feb 2013 17:59:41 -0000 From: Martin Jansa X-Patchwork-Id: 43853 Message-Id: <1359741581-16500-1-git-send-email-Martin.Jansa@gmail.com> To: openembedded-core@lists.openembedded.org * as described in http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9 Signed-off-by: Martin Jansa --- 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