diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-16 10:13:39 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-16 10:13:39 +0000 |
| commit | a59f67fdb9077c84f80577aeab5b4cce37539d0d (patch) | |
| tree | 870f7ecbcdbe4b55b9421278e4e1089953db1c89 | |
| parent | 67fa7a1c60eebc2eb664fd9eea46febb8af694d6 (diff) | |
| download | openembedded-core-a59f67fdb9077c84f80577aeab5b4cce37539d0d.tar.gz openembedded-core-a59f67fdb9077c84f80577aeab5b4cce37539d0d.tar.bz2 openembedded-core-a59f67fdb9077c84f80577aeab5b4cce37539d0d.zip | |
gtk-icon-cache.bbclass: Fix hardcoded PKGDEST reference and operate on directories other than hicolor (from OE.dev)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index 4a59b74754..d1aeee5f89 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass @@ -11,19 +11,28 @@ fi # Update the pixbuf loaders in case they haven't been registered yet gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders -gtk-update-icon-cache -q /usr/share/icons/hicolor +for icondir in /usr/share/icons/* ; do + if [ -d $icondir ] ; then + gtk-update-icon-cache -qt $icondir + fi +done } gtk_icon_cache_postrm() { -gtk-update-icon-cache -q /usr/share/icons/hicolor +for icondir in /usr/share/icons/* ; do + if [ -d $icondir ] ; then + gtk-update-icon-cache -qt $icondir + fi +done } python populate_packages_append () { packages = bb.data.getVar('PACKAGES', d, 1).split() + pkgdest = bb.data.getVar('PKGDEST', d, 1) workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages: - icon_dir = '%s/install/%s/%s/icons/hicolor' % (workdir, pkg, bb.data.getVar('datadir', d, 1)) + icon_dir = '%s/%s/%s/%s/icons' % (workdir, pkgdest, pkg, bb.data.getVar('datadir', d, 1)) if not os.path.exists(icon_dir): continue |