diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-16 10:21:30 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-16 10:21:30 +0000 |
| commit | d762c7504032becb9d05cd48c86dabb1ec764911 (patch) | |
| tree | 8abe172395656fbede9fe1ce4dcd0eebb3de501a | |
| parent | 5f13a271b010da627fc8b411182fbc58c03aec23 (diff) | |
gconf/gtk-icon-theme/mime: Really fix PKGDEST references
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | classes/gconf.bbclass | 3 | ||||
| -rw-r--r-- | classes/gtk-icon-cache.bbclass | 3 | ||||
| -rw-r--r-- | classes/mime.bbclass | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass index 9f51bc0cde..f55ae2c2ae 100644 --- a/classes/gconf.bbclass +++ b/classes/gconf.bbclass @@ -33,10 +33,9 @@ python populate_packages_append () { import os.path, re 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: - schema_dir = '%s/%s/%s/etc/gconf/schemas' % (workdir, pkgdest, pkg) + schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg) schemas = [] schema_re = re.compile(".*\.schemas$") if os.path.exists(schema_dir): diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index ce78d1f7c9..d6c86a383e 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -30,10 +30,9 @@ python populate_packages_append () { import os.path 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/%s/%s/%s/icons' % (workdir, pkgdest, pkg, bb.data.getVar('datadir', d, 1)) + icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1)) if not os.path.exists(icon_dir): continue diff --git a/classes/mime.bbclass b/classes/mime.bbclass index afba5e79a7..2416c1466f 100644 --- a/classes/mime.bbclass +++ b/classes/mime.bbclass @@ -28,10 +28,9 @@ python populate_packages_append () { import os.path, re 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: - mime_dir = '%s/%s/%s/usr/share/mime/packages' % (workdir, pkgdest, pkg) + mime_dir = '%s/%s/usr/share/mime/packages' % (pkgdest, pkg) mimes = [] mime_re = re.compile(".*\.xml$") if os.path.exists(mime_dir): |