Patchwork [2/2] sato-icon-theme: update mapping program location

login
register
mail settings
Submitter Saul Wold
Date Oct. 15, 2012, 10:19 p.m.
Message ID <1350339551-8820-2-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/38169/
State New
Headers show

Comments

Saul Wold - Oct. 15, 2012, 10:19 p.m.
When we changed the /usr/libexec default to be
/usr/lib/<pn>, the icon name mapping needed to
be updated also.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../sato-icon-theme/sato-icon-theme.inc            |    2 +-
 .../sato-icon-theme/sato-icon-theme_0.4.1.bb       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Saul Wold - Oct. 16, 2012, 4:14 a.m.
On 10/15/2012 03:19 PM, Saul Wold wrote:
> When we changed the /usr/libexec default to be
> /usr/lib/<pn>, the icon name mapping needed to
> be updated also.
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>   .../sato-icon-theme/sato-icon-theme.inc            |    2 +-
>   .../sato-icon-theme/sato-icon-theme_0.4.1.bb       |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> index 0bd4814..b07d8c3 100644
> --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> @@ -12,7 +12,7 @@ inherit autotools pkgconfig allarch gtk-icon-cache
>
>   FILES_${PN} += "${datadir}"
>
> -EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
> +EXTRA_OECONF += "--with-iconmap=${STAGING_LIBEXECDIR_NATIVE}/icon-name-mapping"
>
This is still wrong apparently since icon-naming-mapping is not placed 
in sato-icon-theme, but in /usr/lib/icon-naming-utils.  So my original 
patch should be correct.

Sau!


>   # Explictly setting "Sato" as the default icon theme to avoid flickering from
>   # the desktop and settings daemon racing.  This shouldn't be done here but in the sato image
> diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
> index 6405359..cd34cac 100644
> --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
> +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
> @@ -2,7 +2,7 @@ require sato-icon-theme.inc
>
>   DEPENDS += "icon-naming-utils-native"
>
> -PR = "r4"
> +PR = "r5"
>
>   SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
>              file://iconpath-option.patch \
>
Richard Purdie - Oct. 16, 2012, 11:37 a.m.
On Mon, 2012-10-15 at 21:14 -0700, Saul Wold wrote:
> On 10/15/2012 03:19 PM, Saul Wold wrote:
> > When we changed the /usr/libexec default to be
> > /usr/lib/<pn>, the icon name mapping needed to
> > be updated also.
> >
> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > ---
> >   .../sato-icon-theme/sato-icon-theme.inc            |    2 +-
> >   .../sato-icon-theme/sato-icon-theme_0.4.1.bb       |    2 +-
> >   2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> > index 0bd4814..b07d8c3 100644
> > --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> > +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> > @@ -12,7 +12,7 @@ inherit autotools pkgconfig allarch gtk-icon-cache
> >
> >   FILES_${PN} += "${datadir}"
> >
> > -EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
> > +EXTRA_OECONF += "--with-iconmap=${STAGING_LIBEXECDIR_NATIVE}/icon-name-mapping"
> >
> This is still wrong apparently since icon-naming-mapping is not placed 
> in sato-icon-theme, but in /usr/lib/icon-naming-utils.  So my original 
> patch should be correct.

No, it should be:

EXTRA_OECONF += "--with-iconmap=${STAGING_LIBEXECDIR_NATIVE}/../icon-name-mapping"

Cheers,

Richard

Patch

diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
index 0bd4814..b07d8c3 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
@@ -12,7 +12,7 @@  inherit autotools pkgconfig allarch gtk-icon-cache
 
 FILES_${PN} += "${datadir}"
 
-EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
+EXTRA_OECONF += "--with-iconmap=${STAGING_LIBEXECDIR_NATIVE}/icon-name-mapping"
 
 # Explictly setting "Sato" as the default icon theme to avoid flickering from
 # the desktop and settings daemon racing.  This shouldn't be done here but in the sato image
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
index 6405359..cd34cac 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
@@ -2,7 +2,7 @@  require sato-icon-theme.inc
 
 DEPENDS += "icon-naming-utils-native"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
            file://iconpath-option.patch \