From: Peter Kjellerstedt <[email protected]> Commit 0e1f8fa0 (bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target) changed the default PACKAGECONFIG for native and nativesdk so that it becomes empty unless "x11" is in DISTRO_FEATURES since "trace" was also removed (propbably unintentionally). This highlighted than an empty PACKAGECONFIG would lead to a build failure since /usr/bin is never created under these conditions, but the recipe still tried to remove it.
Signed-off-by: Peter Kjellerstedt <[email protected]> Signed-off-by: Richard Purdie <[email protected]> (cherry picked from commit 9bb2268677ac8f0c97433bf1f04555abe88028a9) Signed-off-by: Steve Sakoman <[email protected]> --- meta/recipes-graphics/cairo/cairo_1.16.0.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb b/meta/recipes-graphics/cairo/cairo_1.16.0.bb index b772c2ece2..8663dec404 100644 --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb @@ -68,8 +68,10 @@ do_install_append () { rm -rf ${D}${libdir}/cairo/cairo-sphinx* rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr* rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx* - rmdir -p --ignore-fail-on-non-empty ${D}${bindir} - rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/cairo + [ ! -d ${D}${bindir} ] || + rmdir -p --ignore-fail-on-non-empty ${D}${bindir} + [ ! -d ${D}${libdir}/cairo ] || + rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/cairo } PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139521): https://lists.openembedded.org/g/openembedded-core/message/139521 Mute This Topic: https://lists.openembedded.org/mt/74902433/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
