[oe-commits] Saul Wold : sato-icon-theme: update mapping program location
git at git.openembedded.org
git at git.openembedded.org
Wed Oct 17 17:13:54 UTC 2012
Module: openembedded-core.git
Branch: master-next
Commit: 5befee15f785e6a66f9952e5c93c6be16bb5f3df
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5befee15f785e6a66f9952e5c93c6be16bb5f3df
Author: Saul Wold <sgw at linux.intel.com>
Date: Mon Oct 15 22:19:11 2012 +0000
sato-icon-theme: update mapping program location
When we changed the /usr/libexec default to be
/usr/lib/<pn>, the icon name mapping needed to
be updated also.
(From OE-Core rev: 58b20de32f4b6ca684120d1b87a7aece2df6f0a6)
(From OE-Core rev: b3ff57c7a15c8509397d4b8e84410aab08ea4d1c)
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../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..476e925 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=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/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 \
More information about the Openembedded-commits
mailing list