diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-10-15 22:19:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-18 12:03:29 +0100 |
| commit | 49d8f5d2257f00f02437b95e624960ba4aadd9d4 (patch) | |
| tree | cd609133d5715c641def0e57a9c6b460b41c57ec /meta/recipes-sato/sato-icon-theme | |
| parent | 945c8f5c687ec61c312209e075edc402f6272186 (diff) | |
| download | openembedded-core-49d8f5d2257f00f02437b95e624960ba4aadd9d4.tar.gz openembedded-core-49d8f5d2257f00f02437b95e624960ba4aadd9d4.tar.bz2 openembedded-core-49d8f5d2257f00f02437b95e624960ba4aadd9d4.zip | |
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@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/sato-icon-theme')
| -rw-r--r-- | meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-sato/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 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 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 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 DEPENDS += "icon-naming-utils-native" -PR = "r4" +PR = "r5" SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ file://iconpath-option.patch \ |