diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-19 11:07:43 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-19 13:23:10 +0100 |
| commit | 7bedc857ceb3f8c3126233291f5338588127418a (patch) | |
| tree | eaf9d8d02d1005ac823b04c358e8fdc73546cbc6 /meta/classes | |
| parent | 76a701e71029fb3685f2939ee9066e7f8653f0c2 (diff) | |
| download | openembedded-core-7bedc857ceb3f8c3126233291f5338588127418a.tar.gz | |
Revert "rm_work: Stop appending _setscene to do_image_complete_setscene stamps"
Whilst this fixes the do_image_complete_setscene append problem, it creates a
new problem since the code can no longer reach the *do_package_setscene.*
code block below it. This breaks builds as per [YOCTO #12765]. Revert this
change in search of a better fix.
This reverts commit 5479654eeaaa0f81bfff54ca49369c87f1658705.
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/rm_work.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass index 318d121d2b..31d99e4554 100644 --- a/meta/classes/rm_work.bbclass +++ b/meta/classes/rm_work.bbclass @@ -53,10 +53,6 @@ do_rm_work () { *do_setscene*) break ;; - *_setscene*) - i=dummy - break - ;; *sigdata*|*sigbasedata*) i=dummy break @@ -93,6 +89,10 @@ do_rm_work () { i=dummy break ;; + *_setscene*) + i=dummy + break + ;; *$j|*$j.*) mv $i `echo $i | sed -e "s#${j}#${j}_setscene#"` i=dummy |