It's more hard to read but easy to rebase, no functional changes
(From OE-Core rev: 5065025a66f96140ca895a140067fbde82879941)
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>