| Submitter | Phil Blundell |
|---|---|
| Date | Oct. 17, 2012, 10:25 p.m. |
| Message ID | <1350512717.4470.171.camel@x121e.pbcl.net> |
| Download | mbox | patch |
| Permalink | /patch/38257/ |
| State | Accepted |
| Commit | 2ee9601ae590b2964d1c44b131188a80cc5198a9 |
| Headers | show |
Comments
On 10/17/2012 03:25 PM, Phil Blundell wrote: > 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> > --- > meta/recipes-gnome/gnome/gconf_3.2.3.bb | 4 ++-- > 1 file 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 dc3520f..4d77a14 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 > Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb index dc3520f..4d77a14 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
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> --- meta/recipes-gnome/gnome/gconf_3.2.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)