From 756f6d0fe98596c949d1f70a7999ce1a5844ba55 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 2 Jun 2020 11:06:05 +0200 Subject: cairo: Do not try to remove nonexistent directories 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. (From OE-Core rev: 5e33d1d1d655c50a817acda85f2df67c67196daf) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie (cherry picked from commit 9bb2268677ac8f0c97433bf1f04555abe88028a9) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-graphics/cairo/cairo_1.16.0.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta') 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" -- cgit v1.2.3-54-g00ecf