Patchwork avahi-ui: Remove the locale files and rely on the main avahi package for these

login
register
mail settings
Submitter Richard Purdie
Date July 19, 2012, 1:24 p.m.
Message ID <1342704262.7940.11.camel@ted>
Download mbox | patch
Permalink /patch/32523/
State Accepted
Commit a4f31439a6a5c7e1766eff6a6e54ab87f3370c29
Headers show

Comments

Richard Purdie - July 19, 2012, 1:24 p.m.
Both avahi and avahi-ui were installing locale files. This is pointless duplication
and they are identical between the two packages. This changes things so they're only
handled by the main package.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Koen Kooi - July 19, 2012, 1:41 p.m.
Op 19 jul. 2012, om 15:24 heeft Richard Purdie het volgende geschreven:

> Both avahi and avahi-ui were installing locale files. This is pointless duplication
> and they are identical between the two packages. This changes things so they're only
> handled by the main package.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
> index 2c12053..7d56dad 100644
> --- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
> +++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
> @@ -54,6 +54,7 @@ do_install_append () {
> 	rm ${D}${sbindir} -rf
> 	rm ${D}${datadir}/avahi/a*
> 	rm ${D}${datadir}/avahi/s*
> +	rm ${D}${datadir}/locale/ -rf
> 	rm ${D}${datadir}/dbus* -rf
> 	rm ${D}${mandir}/man1/a*
> 	rm ${D}${mandir}/man5 -rf

MIssing PR bump
Richard Purdie - July 19, 2012, 1:54 p.m.
On Thu, 2012-07-19 at 15:41 +0200, Koen Kooi wrote:
> Op 19 jul. 2012, om 15:24 heeft Richard Purdie het volgende geschreven:
> 
> > Both avahi and avahi-ui were installing locale files. This is pointless duplication
> > and they are identical between the two packages. This changes things so they're only
> > handled by the main package.
> > 
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
> > index 2c12053..7d56dad 100644
> > --- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
> > +++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
> > @@ -54,6 +54,7 @@ do_install_append () {
> > 	rm ${D}${sbindir} -rf
> > 	rm ${D}${datadir}/avahi/a*
> > 	rm ${D}${datadir}/avahi/s*
> > +	rm ${D}${datadir}/locale/ -rf
> > 	rm ${D}${datadir}/dbus* -rf
> > 	rm ${D}${mandir}/man1/a*
> > 	rm ${D}${mandir}/man5 -rf
> 
> MIssing PR bump

No output changes, just removal of duplicate files in the sysroot which
are ignored anyway.

Cheers,

Richard

Patch

diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
index 2c12053..7d56dad 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
@@ -54,6 +54,7 @@  do_install_append () {
 	rm ${D}${sbindir} -rf
 	rm ${D}${datadir}/avahi/a*
 	rm ${D}${datadir}/avahi/s*
+	rm ${D}${datadir}/locale/ -rf
 	rm ${D}${datadir}/dbus* -rf
 	rm ${D}${mandir}/man1/a*
 	rm ${D}${mandir}/man5 -rf