summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-10-17 23:25:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-18 12:07:29 +0100
commit2ee9601ae590b2964d1c44b131188a80cc5198a9 (patch)
tree9abd65783d923fdcac3237909471ddd72f8cefc0
parent11f5998e539f7b884ae1387252f8995b2dc7437f (diff)
downloadopenembedded-core-2ee9601ae590b2964d1c44b131188a80cc5198a9.tar.gz
openembedded-core-2ee9601ae590b2964d1c44b131188a80cc5198a9.tar.bz2
openembedded-core-2ee9601ae590b2964d1c44b131188a80cc5198a9.zip
gconf: Avoid error when trying to delete files that don't exist
Use "rm -f" in do_install_append() so we don't fail if the files we're trying to delete have already been removed. This can happen if the distro policy suppresses both static libs and .la files. Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.3.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index dc3520fc1c..4d77a14f81 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -33,8 +33,8 @@ do_install_append() {
install -d ${D}${sysconfdir}/gconf/gconf.xml.system
# this stuff is unusable
- rm ${D}${libdir}/GConf/*/*.*a
- rm ${D}${libdir}/gio/*/*.*a
+ rm -f ${D}${libdir}/GConf/*/*.*a
+ rm -f ${D}${libdir}/gio/*/*.*a
}
# disable dbus-x11 when x11 isn't in DISTRO_FEATURES