mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-16 04:09:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

rm_work: Simplify logic for setscene promotion

Browse Source 
* Instead of overwriting the stamp name with 'dummy', handle
  setscene promotion in the default case block
* Merge '*do_image_complete_setscene*' and '*do_image_qa_setscene*'
  case handling

(From OE-Core rev: 3fe6574c93a02e2e67d16e66f24be1053af383b7)

Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jacob Kroon
2019-11-07 16:35:15 +01:00
committed by Richard Purdie
parent 92b60da8b2
commit 381ebd7439
1 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
meta/classes/rm_work.bbclass
View File

@@ -47,39 +47,26 @@ do_rm_work () {
cd `dirname ${STAMP}`
for i in `basename ${STAMP}`*
do
# 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_setscene*|*do_image_qa_setscene*)
# Ensure we don't 'stack' setscene extensions to these stamps with the sections below
;;
*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_image_qa_setscene*)
# Ensure we don't 'stack' setscene extensions to this stamp with the section below
i=dummy
;;
*do_image_qa*)
# Promote do_image_qa stamps to setscene versions (ahead of *do_image* below)
mv $i `echo $i | sed -e "s#do_image_qa#do_image_qa_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
@@ -87,30 +74,24 @@ do_rm_work () {
# such as 'packages' and 'packages-split' and these can be large. No end
# of chain tasks depend directly on do_package anymore.
rm -f $i;
i=dummy
;;
*_setscene*)
# Skip stamps which are already setscene versions
i=dummy
;;
*)
# For everything else: if suitable, promote the stamp to a setscene
# version, otherwise remove it
for j in ${SSTATETASKS} do_shared_workdir
do
case $i in
*$j|*$j.*)
mv $i `echo $i | sed -e "s#${j}#${j}_setscene#"`
break
;;
esac
done
rm -f $i
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
cd ${WORKDIR}