diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2020-06-02 11:06:05 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-06-09 05:39:30 -1000 |
| commit | 5e33d1d1d655c50a817acda85f2df67c67196daf (patch) | |
| tree | 0950597fb1035f71ffbd833a780aa7e68a642e2f /meta/recipes-graphics | |
| parent | 3f8f1385428a2057610dca71e9f122c922df5202 (diff) | |
| download | openembedded-core-contrib-5e33d1d1d655c50a817acda85f2df67c67196daf.tar.gz | |
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.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9bb2268677ac8f0c97433bf1f04555abe88028a9)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/cairo/cairo_1.16.0.bb | 6 |
1 files 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" |