[oe-commits] [openembedded-core] 29/30: rm_work: Stop appending _setscene to do_image_complete_setscene stamps
git at git.openembedded.org
git at git.openembedded.org
Wed May 9 22:52:57 UTC 2018
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 44fbd023a09471a6e85d3cbd1f7eaa1ea58a30e0
Author: Mike Crowe <mac at mcrowe.com>
AuthorDate: Wed May 9 12:02:35 2018 +0100
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*.
Signed-off-by: Mike Crowe <mac at mcrowe.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/rm_work.bbclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 31d99e4..318d121 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list