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

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

diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass
index 9f51bc0cdeb19184f04761d0bf416edbb50ff405..f55ae2c2ae22acd26087cb7155cb383d5044d2c8 100644 (file)
--- 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 ce78d1f7c96df6113c5c0177192a469660b2b0a7..d6c86a383e1d13e941bcaf1d983292dbe475b525 100644 (file)
--- 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 afba5e79a726b766cfb5e2b8990a07b1f945b111..2416c1466f438989c2b0fae8953f7242d5574d51 100644 (file)
--- 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):