[poky] [PATCH 1/1] rm_work.bbclass: reserve 'image' folder when remove WORKDIR


Tue Jan 25 22:30:08 PST 2011


From: Dongxiao Xu <dongxiao.xu at intel.com>

After the implementation of per machine sysroot, do_populate_sysroot
and do_package need to be re-run if we build two machines of one
architecture (in case that sstate prebuilt result could not be reused
for certain recipes). But if removing all the WORKDIR contents after
the first macine build, the second machine's do_populate_sysroot and
do_package will fail due to the missing of "image" directory.

Thus reserve 'image' folder when doing rm_work.

Signed-off-by: Dongxiao Xu <dongxiao.xu at intel.com>
---
 meta/classes/rm_work.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 260ecb0..3699aca 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -19,7 +19,7 @@ do_rm_work () {
     do
         if [ `basename ${S}` = $dir ]; then
             rm -rf $dir
-        elif [ $dir != 'temp' ]; then
+        elif [ $dir != 'temp' ] && [ $dir != 'image' ]; then
             rm -rf $dir
         fi
     done
-- 
1.6.3.3




More information about the poky mailing list