[oe-commits] Richard Purdie : gconf/gtk-icon-theme/mime: Really fix PKGDEST references

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: d762c7504032becb9d05cd48c86dabb1ec764911
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d762c7504032becb9d05cd48c86dabb1ec764911

Author: Richard Purdie <rpurdie at linux.intel.com>
Date:   Mon Nov 16 10:21:30 2009 +0000

gconf/gtk-icon-theme/mime: Really fix PKGDEST references

Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>

---

 classes/gconf.bbclass          |    3 +--
 classes/gtk-icon-cache.bbclass |    3 +--
 classes/mime.bbclass           |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass
index 9f51bc0..f55ae2c 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 ce78d1f..d6c86a3 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 afba5e7..2416c14 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):