Skip to contentSkip to conversation

rm_work: remove package and packages-split dirs

PATCH In review Martin Jansa 3 participants 6 messages Feb 1, 2013 – Mar 2, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rm_work: remove package and packages-split dirs

* as described in
http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9

---
 meta/classes/rm_work.bbclass | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
meta/classes/rm_work.bbclass +9 -4
index 997dcd1..24d0679 100644
@@ -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
Signature · 1 line
1.8.1.2
#1 lore raw
Quoted 15 lines · Martin Jansa

* as described in
http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9

---
 meta/classes/rm_work.bbclass | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
meta/classes/rm_work.bbclass +0 -0
index 997dcd1..24d0679 100644
@@ -19,13 +19,13 @@ do_rm_work () {
     do
         if [ `basename ${S}` = $dir ]; then

meta/classes/rm_work.bbclass do_rm_work () { · line 26

Quoted 10 lines
meta/classes/rm_work.bbclass +3 -4
             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?

meta/classes/rm_work.bbclass do_rm_work () { · line 56

Quoted 9 lines
meta/classes/rm_work.bbclass +1 -0
     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.".

meta/classes/rm_work.bbclass do_rm_work () { · line 64

Quoted 8 lines
meta/classes/rm_work.bbclass +5 -0
+            *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

#2 lore raw

PATCH 1/1 rm_work: remove package and packages-split dirs

* as described in
http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9

---
 meta/classes/rm_work.bbclass | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
meta/classes/rm_work.bbclass +12 -6
index 997dcd1..5aa5f24 100644
@@ -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
Signature · 1 line
1.8.1.2
#3 lore raw

(see comment below)

Quoted 32 lines · Martin Jansa

* as described in
http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9

---
  meta/classes/rm_work.bbclass | 18 ++++++++++++------
  1 file changed, 12 insertions(+), 6 deletions(-)
meta/classes/rm_work.bbclass +3 -6
index 997dcd1..5aa5f24 100644
@@ -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/

meta/classes/rm_work.bbclass do_rm_work () { · line 60

Quoted 10 lines
meta/classes/rm_work.bbclass +7 -0
@@ -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".

meta/classes/rm_work.bbclass do_rm_work () { · line 65

Quoted 6 lines
meta/classes/rm_work.bbclass +2 -0
+                break
+                ;;
              *_setscene*)
                  i=dummy
                  break

Mike.

#4 lore raw
Quoted 40 lines · Mike Looijmans

(see comment below)

Quoted 37 lines · Martin Jansa

* as described in
http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9

---
  meta/classes/rm_work.bbclass | 18 ++++++++++++------
  1 file changed, 12 insertions(+), 6 deletions(-)
meta/classes/rm_work.bbclass +5 -6
index 997dcd1..5aa5f24 100644
@@ -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
Quoted 8 lines

meta/classes/rm_work.bbclass do_rm_work () { · line 60

Quoted 5 lines
meta/classes/rm_work.bbclass +5 -0
+            # 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,

Quoted 13 lines

meta/classes/rm_work.bbclass do_rm_work () { · line 65

Quoted 6 lines
meta/classes/rm_work.bbclass +2 -0
+                break
+                ;;
              *_setscene*)
                  i=dummy
                  break

Mike.

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#5 lore raw

PATCH v2 1/1 rm_work: remove package and packages-split dirs

In reply to Richard Purdie

* as described in
http://git.openembedded.org/openembedded-core/commit/?id=6107ee294afde395e39d084c33e8e94013c625a9

---
 meta/classes/rm_work.bbclass | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)
meta/classes/rm_work.bbclass +13 -7
index 997dcd1..d3be0be 100644
@@ -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
Signature · 1 line
1.8.1.4