diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2013-03-02 01:02:17 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-02 12:53:29 +0000 |
| commit | 4067afcda78d17058f2aa8d7f82173d181e0aae4 (patch) | |
| tree | 9c732fc5a6ba7731b2d2958e03569f07655f582a | |
| parent | c3c51a5961f77d51e7f8eb1f0746d16576663bba (diff) | |
| download | openembedded-core-4067afcda78d17058f2aa8d7f82173d181e0aae4.tar.gz openembedded-core-4067afcda78d17058f2aa8d7f82173d181e0aae4.tar.bz2 openembedded-core-4067afcda78d17058f2aa8d7f82173d181e0aae4.zip | |
rm_work: remove package and packages-split dirs
* as described in
http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/classes/rm_work.bbclass | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass index 997dcd18e2..d3be0be887 100644 --- a/meta/classes/rm_work.bbclass +++ b/meta/classes/rm_work.bbclass @@ -17,15 +17,12 @@ do_rm_work () { cd ${WORKDIR} for dir in * 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 + # Retain only logs and other files in temp. + if [ $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 +51,15 @@ do_rm_work () { i=dummy break ;; + # We remove do_package entirely, including any + # sstate version since otherwise we'd need to leave 'plaindirs' around + # such as 'packages' and 'packages-split' and these can be large. No end + # of chain tasks depend directly on do_package anymore. + *do_package|*do_package.*|*do_package_setscene.*) + rm -f $i; + i=dummy + break + ;; *_setscene*) i=dummy break @@ -71,7 +77,7 @@ do_rm_work () { addtask rm_work after do_${RMWORK_ORIG_TASK} do_rm_work_all () { - : + : } do_rm_work_all[recrdeptask] = "do_rm_work" addtask rm_work_all after do_rm_work |