This replaces the proposed patch with a backport of what got accepted upstream
(From OE-Core rev: f3e92b7cb5833f61ff13a66f03be513d97a69894)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>