* [PATCH] rm_work: remove package and packages-split dirs
@ 2013-02-01 17:59 Martin Jansa
2013-02-04 13:26 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2013-02-01 17:59 UTC (permalink / raw)
To: openembedded-core
* as described in
http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] rm_work: remove package and packages-split dirs
2013-02-01 17:59 [PATCH] rm_work: remove package and packages-split dirs Martin Jansa
@ 2013-02-04 13:26 ` Richard Purdie
2013-02-06 13:26 ` Martin Jansa
2013-03-02 0:02 ` [PATCHv2] " Martin Jansa
0 siblings, 2 replies; 6+ messages in thread
From: Richard Purdie @ 2013-02-04 13:26 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On Fri, 2013-02-01 at 18:59 +0100, Martin Jansa wrote:
> * as described in
> http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> 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
The first part of the comment is wrong and we might as well drop the if
[ `basename ${S}` = $dir ]; too?
> 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
> ;;
I'd put a comment in here: "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 enf
of chain tasks depend directly on do_package anymore.".
> + *do_package|*do_package_setscene)
> + i=dummy
> + rm -f $i;
> + break
> + ;;
> *_setscene*)
> i=dummy
> break
Otherwise looks good, this is simpler than I'd expected which is nice :)
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] rm_work: remove package and packages-split dirs
2013-02-04 13:26 ` Richard Purdie
@ 2013-02-06 13:26 ` Martin Jansa
2013-02-06 13:44 ` Mike Looijmans
2013-03-02 0:02 ` [PATCHv2] " Martin Jansa
1 sibling, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2013-02-06 13:26 UTC (permalink / raw)
To: openembedded-core
* as described in
http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/classes/rm_work.bbclass | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 997dcd1..5aa5f24 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_setscene)
+ i=dummy
+ rm -f $i;
+ break
+ ;;
*_setscene*)
i=dummy
break
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] rm_work: remove package and packages-split dirs
2013-02-06 13:26 ` Martin Jansa
@ 2013-02-06 13:44 ` Mike Looijmans
2013-02-06 14:06 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Mike Looijmans @ 2013-02-06 13:44 UTC (permalink / raw)
To: openembedded-core
(see comment below)
On 02/06/2013 02:26 PM, Martin Jansa wrote:
> * as described in
> http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/classes/rm_work.bbclass | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
> index 997dcd1..5aa5f24 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_setscene)
> + i=dummy
> + rm -f $i;
Hmm, I think you intended "rm -f $dir" here? This would only remove a
file named "dummy".
> + break
> + ;;
> *_setscene*)
> i=dummy
> break
>
Mike.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] rm_work: remove package and packages-split dirs
2013-02-06 13:44 ` Mike Looijmans
@ 2013-02-06 14:06 ` Martin Jansa
0 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2013-02-06 14:06 UTC (permalink / raw)
To: Mike Looijmans; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2814 bytes --]
On Wed, Feb 06, 2013 at 02:44:29PM +0100, Mike Looijmans wrote:
> (see comment below)
>
> On 02/06/2013 02:26 PM, Martin Jansa wrote:
> > * as described in
> > http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta/classes/rm_work.bbclass | 18 ++++++++++++------
> > 1 file changed, 12 insertions(+), 6 deletions(-)
> >
> > diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
> > index 997dcd1..5aa5f24 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_setscene)
> > + i=dummy
> > + rm -f $i;
>
> Hmm, I think you intended "rm -f $dir" here? This would only remove a
> file named "dummy".
Good catch thanks, it should be before i=dummy. I'm testing v3 now.
Interesting that after last rebuild I haven't found any
do_package,do_package_setscene stamps..
Cheers,
> > + break
> > + ;;
> > *_setscene*)
> > i=dummy
> > break
> >
>
> Mike.
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCHv2] rm_work: remove package and packages-split dirs
2013-02-04 13:26 ` Richard Purdie
2013-02-06 13:26 ` Martin Jansa
@ 2013-03-02 0:02 ` Martin Jansa
1 sibling, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2013-03-02 0:02 UTC (permalink / raw)
To: openembedded-core
* as described in
http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/classes/rm_work.bbclass | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 997dcd1..d3be0be 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
--
1.8.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-03-02 0:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-01 17:59 [PATCH] rm_work: remove package and packages-split dirs Martin Jansa
2013-02-04 13:26 ` Richard Purdie
2013-02-06 13:26 ` Martin Jansa
2013-02-06 13:44 ` Mike Looijmans
2013-02-06 14:06 ` Martin Jansa
2013-03-02 0:02 ` [PATCHv2] " Martin Jansa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox