diff options
Diffstat (limited to 'poky/meta/classes/rm_work.bbclass')
-rw-r--r-- | poky/meta/classes/rm_work.bbclass | 83 |
1 files changed, 42 insertions, 41 deletions
diff --git a/poky/meta/classes/rm_work.bbclass b/poky/meta/classes/rm_work.bbclass index 31d99e4554..10e134b958 100644 --- a/poky/meta/classes/rm_work.bbclass +++ b/poky/meta/classes/rm_work.bbclass @@ -47,59 +47,60 @@ do_rm_work () { cd `dirname ${STAMP}` for i in `basename ${STAMP}`* do - for j in ${SSTATETASKS} do_shared_workdir - do - case $i in - *do_setscene*) - break - ;; - *sigdata*|*sigbasedata*) - i=dummy - break - ;; - *do_package_write*) - i=dummy - break - ;; - *do_image_complete*) - mv $i `echo $i | sed -e "s#do_image_complete#do_image_complete_setscene#"` - i=dummy - break - ;; - *do_rootfs*|*do_image*|*do_bootimg*|*do_write_qemuboot_conf*) - i=dummy - break - ;; - *do_build*) - i=dummy - break - ;; - *do_addto_recipe_sysroot*) - # Preserve recipe-sysroot-native if do_addto_recipe_sysroot has been used - excludes="$excludes recipe-sysroot-native" - i=dummy - break - ;; + # By default we'll delete the stamp, unless $i is changed by the inner loop + # (i=dummy does this) + + case $i in + *sigdata*|*sigbasedata*) + # Save/skip anything that looks like a signature data file. + i=dummy + ;; + *do_image_complete_setscene*) + # Ensure we don't 'stack' setscene extensions to this stamp with the section below + i=dummy + ;; + *do_image_complete*) + # Promote do_image_complete stamps to setscene versions (ahead of *do_image* below) + mv $i `echo $i | sed -e "s#do_image_complete#do_image_complete_setscene#"` + i=dummy + ;; + *do_package_write*|*do_rootfs*|*do_image*|*do_bootimg*|*do_write_qemuboot_conf*|*do_build*) + i=dummy + ;; + *do_addto_recipe_sysroot*) + # Preserve recipe-sysroot-native if do_addto_recipe_sysroot has been used + excludes="$excludes recipe-sysroot-native" + i=dummy + ;; + *do_package|*do_package.*|*do_package_setscene.*) # 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 + rm -f $i; + i=dummy + ;; + *_setscene*) + # Skip stamps which are already setscene versions + i=dummy + ;; + esac + + for j in ${SSTATETASKS} do_shared_workdir + do + case $i in + dummy) break ;; *$j|*$j.*) + # Promote the stamp to a setscene version mv $i `echo $i | sed -e "s#${j}#${j}_setscene#"` i=dummy break - ;; + ;; esac done + rm -f $i done |