summaryrefslogtreecommitdiffstats
path: root/meta/classes/gconf.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/gconf.bbclass')
-rw-r--r--meta/classes/gconf.bbclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index 7bfa871bd2..095d04b1b8 100644
--- a/meta/classes/gconf.bbclass
+++ b/meta/classes/gconf.bbclass
@@ -32,8 +32,8 @@ done
32 32
33python populate_packages_append () { 33python populate_packages_append () {
34 import re 34 import re
35 packages = d.getVar('PACKAGES', 1).split() 35 packages = d.getVar('PACKAGES', True).split()
36 pkgdest = d.getVar('PKGDEST', 1) 36 pkgdest = d.getVar('PKGDEST', True)
37 37
38 for pkg in packages: 38 for pkg in packages:
39 schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg) 39 schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg)
@@ -46,15 +46,15 @@ python populate_packages_append () {
46 if schemas != []: 46 if schemas != []:
47 bb.note("adding gconf postinst and prerm scripts to %s" % pkg) 47 bb.note("adding gconf postinst and prerm scripts to %s" % pkg)
48 d.setVar('SCHEMA_FILES', " ".join(schemas)) 48 d.setVar('SCHEMA_FILES', " ".join(schemas))
49 postinst = d.getVar('pkg_postinst_%s' % pkg, 1) or d.getVar('pkg_postinst', 1) 49 postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
50 if not postinst: 50 if not postinst:
51 postinst = '#!/bin/sh\n' 51 postinst = '#!/bin/sh\n'
52 postinst += d.getVar('gconf_postinst', 1) 52 postinst += d.getVar('gconf_postinst', True)
53 d.setVar('pkg_postinst_%s' % pkg, postinst) 53 d.setVar('pkg_postinst_%s' % pkg, postinst)
54 prerm = d.getVar('pkg_prerm_%s' % pkg, 1) or d.getVar('pkg_prerm', 1) 54 prerm = d.getVar('pkg_prerm_%s' % pkg, True) or d.getVar('pkg_prerm', True)
55 if not prerm: 55 if not prerm:
56 prerm = '#!/bin/sh\n' 56 prerm = '#!/bin/sh\n'
57 prerm += d.getVar('gconf_prerm', 1) 57 prerm += d.getVar('gconf_prerm', True)
58 d.setVar('pkg_prerm_%s' % pkg, prerm) 58 d.setVar('pkg_prerm_%s' % pkg, prerm)
59 rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or "" 59 rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
60 rdepends += " gconf" 60 rdepends += " gconf"