summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-10-15 22:19:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-18 12:13:48 +0100
commitf0ec93caff148083baf81de714353e712a88831d (patch)
tree1341fe9dc09c5feca108ed48169699e0aa44de5c /meta/recipes-sato
parente5f9a9fa3ef640f362b0352e6b3ee5ff7528d1b3 (diff)
downloadpoky-f0ec93caff148083baf81de714353e712a88831d.tar.gz
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) (From OE-Core rev: 49d8f5d2257f00f02437b95e624960ba4aadd9d4) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc2
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb2
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 0bd48143a9..476e925944 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
12 12
13FILES_${PN} += "${datadir}" 13FILES_${PN} += "${datadir}"
14 14
15EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" 15EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
16 16
17# Explictly setting "Sato" as the default icon theme to avoid flickering from 17# Explictly setting "Sato" as the default icon theme to avoid flickering from
18# the desktop and settings daemon racing. This shouldn't be done here but in the sato image 18# 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 64053598bc..cd34caca29 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
2 2
3DEPENDS += "icon-naming-utils-native" 3DEPENDS += "icon-naming-utils-native"
4 4
5PR = "r4" 5PR = "r5"
6 6
7SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ 7SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
8 file://iconpath-option.patch \ 8 file://iconpath-option.patch \