aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-03-29 11:08:55 +0200
committerArmin Kuster <akuster808@gmail.com>2017-08-05 07:53:02 -0700
commitb40116cf457b88a2db14b86fda9627fb34d56ae6 (patch)
tree0ae7f29392bbec6eeaf52c9f4c6ee9f323518839
parentf6e647205f4e154f287ef769f3f5d054d44a0ba2 (diff)
downloadmeta-openembedded-morty.zip
meta-openembedded-morty.tar.gz
meta-openembedded-morty.tar.bz2
zile: fix do_installmorty-nextmorty
* --ignore-fail-on-non-empty works when the directory isn't empty, but still reports failure when the directory doesn't exist at all, like in: http://errors.yoctoproject.org/Errors/Details/138248/ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit b8368598aed3e07cfb638b537e409bd0b3692df9) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/zile/zile_2.4.11.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/zile/zile_2.4.11.bb b/meta-oe/recipes-support/zile/zile_2.4.11.bb
index d5c555e..49fbaea 100644
--- a/meta-oe/recipes-support/zile/zile_2.4.11.bb
+++ b/meta-oe/recipes-support/zile/zile_2.4.11.bb
@@ -15,8 +15,8 @@ SRC_URI[sha256sum] = "1fd27bbddc61491b1fbb29a345d0d344734aa9e80cfa07b02892eedf83
inherit autotools pkgconfig
do_install_append() {
- rm -rf ${D}${libdir}/charset.alias
- rmdir --ignore-fail-on-non-empty ${D}${libdir}
+ rm -rf ${D}${libdir}/charset.alias
+ rmdir --ignore-fail-on-non-empty ${D}${libdir} || true
}
PACKAGECONFIG ??= ""