rm_work: Stop appending _setscene to do_image_complete_setscene stamps
PATCH 1/1 rm_work: Stop appending _setscene to do_image_complete_setscene stamps
Each time I build my image after the first, I end up with a do_image_complete_setscene stamp file with an extra _setscene appended to the name. Eventually, the filenames end up being so long that mv complains and the build fails.
It looks like this behaviour was introduced when the special handling was added for do_image_complete in 2ff9d40dc88d43567472218cf3d3faf414398c71.
So, let's ensure that the *_setscene* pattern is matched before anything else so that the do_image_complete_setscene stamp file is merely ignored and only the do_image_complete non-setscene stamp file is moved once.
It's not straightforward to just move *do_image_complete* after the *_setscene* pattern because do_image_complete stamps would then match do_image*.
--- meta/classes/rm_work.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/classes/rm_work.bbclass +4 -4
@@ -53,6 +53,10 @@ do_rm_work () { *do_setscene*) break ;; + *_setscene*) + i=dummy + break + ;; *sigdata*|*sigbasedata*) i=dummy break
@@ -89,10 +93,6 @@ do_rm_work () { i=dummy break ;; - *_setscene*) - i=dummy - break - ;; *$j|*$j.*) mv $i `echo $i | sed -e "s#${j}#${j}_setscene#"` i=dummy
Signature · 1 line
2.11.0
PATCH v2 1/1 rm_work: Stop appending _setscene to do_image_complete_setscene stamps
Each time I build my image after the first, I end up with a do_image_complete_setscene stamp file with an extra _setscene appended to the name. Eventually, the filenames end up being so long that mv complains and the build fails.
It looks like this behaviour was introduced when the special handling was added for do_image_complete in 2ff9d40dc88d43567472218cf3d3faf414398c71.
So, let's ensure that the *_setscene* pattern is matched before anything else so that any do_image_complete_setscene stamp file is always ignored and the do_image_complete non-setscene stamp file is moved only once.
It's not straightforward to just move *do_image_complete* after the *_setscene* pattern because do_image_complete stamps would then match do_image*.
--- meta/classes/rm_work.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
(diff unchanged, commit message updated so that paragraph three actually makes sense.)
meta/classes/rm_work.bbclass +4 -4
@@ -53,6 +53,10 @@ do_rm_work () { *do_setscene*) break ;; + *_setscene*) + i=dummy + break + ;; *sigdata*|*sigbasedata*) i=dummy break
@@ -89,10 +93,6 @@ do_rm_work () { i=dummy break ;; - *_setscene*) - i=dummy - break - ;; *$j|*$j.*) mv $i `echo $i | sed -e "s#${j}#${j}_setscene#"` i=dummy
Signature · 1 line
2.11.0