diff options
author | Phil Blundell <philb@gnu.org> | 2012-10-17 23:25:17 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-18 12:13:50 +0100 |
commit | a008df240caf179288dd229961b8b4b20a3311cf (patch) | |
tree | 4c7aa5326edaa063a43dc41dcda90fd43d24bd5c /meta/recipes-gnome | |
parent | f0a56f6d15d64b9f909628e7724a3aca9d677091 (diff) | |
download | poky-a008df240caf179288dd229961b8b4b20a3311cf.tar.gz |
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.
(From OE-Core rev: 2ee9601ae590b2964d1c44b131188a80cc5198a9)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r-- | meta/recipes-gnome/gnome/gconf_3.2.3.bb | 4 |
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() { | |||
33 | install -d ${D}${sysconfdir}/gconf/gconf.xml.system | 33 | install -d ${D}${sysconfdir}/gconf/gconf.xml.system |
34 | 34 | ||
35 | # this stuff is unusable | 35 | # this stuff is unusable |
36 | rm ${D}${libdir}/GConf/*/*.*a | 36 | rm -f ${D}${libdir}/GConf/*/*.*a |
37 | rm ${D}${libdir}/gio/*/*.*a | 37 | rm -f ${D}${libdir}/gio/*/*.*a |
38 | } | 38 | } |
39 | 39 | ||
40 | # disable dbus-x11 when x11 isn't in DISTRO_FEATURES | 40 | # disable dbus-x11 when x11 isn't in DISTRO_FEATURES |