diff options
Diffstat (limited to 'meta/classes/gconf.bbclass')
| -rw-r--r-- | meta/classes/gconf.bbclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass index 67986787d7..bffc92ea7a 100644 --- a/meta/classes/gconf.bbclass +++ b/meta/classes/gconf.bbclass | |||
| @@ -27,8 +27,8 @@ done | |||
| 27 | 27 | ||
| 28 | python populate_packages_append () { | 28 | python populate_packages_append () { |
| 29 | import re | 29 | import re |
| 30 | packages = bb.data.getVar('PACKAGES', d, 1).split() | 30 | packages = d.getVar('PACKAGES', 1).split() |
| 31 | pkgdest = bb.data.getVar('PKGDEST', d, 1) | 31 | pkgdest = d.getVar('PKGDEST', 1) |
| 32 | 32 | ||
| 33 | for pkg in packages: | 33 | for pkg in packages: |
| 34 | schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg) | 34 | schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg) |
| @@ -41,15 +41,15 @@ python populate_packages_append () { | |||
| 41 | if schemas != []: | 41 | if schemas != []: |
| 42 | bb.note("adding gconf postinst and prerm scripts to %s" % pkg) | 42 | bb.note("adding gconf postinst and prerm scripts to %s" % pkg) |
| 43 | bb.data.setVar('SCHEMA_FILES', " ".join(schemas), d) | 43 | bb.data.setVar('SCHEMA_FILES', " ".join(schemas), d) |
| 44 | postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) | 44 | postinst = d.getVar('pkg_postinst_%s' % pkg, 1) or d.getVar('pkg_postinst', 1) |
| 45 | if not postinst: | 45 | if not postinst: |
| 46 | postinst = '#!/bin/sh\n' | 46 | postinst = '#!/bin/sh\n' |
| 47 | postinst += bb.data.getVar('gconf_postinst', d, 1) | 47 | postinst += d.getVar('gconf_postinst', 1) |
| 48 | bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) | 48 | d.setVar('pkg_postinst_%s' % pkg, postinst) |
| 49 | prerm = bb.data.getVar('pkg_prerm_%s' % pkg, d, 1) or bb.data.getVar('pkg_prerm', d, 1) | 49 | prerm = d.getVar('pkg_prerm_%s' % pkg, 1) or d.getVar('pkg_prerm', 1) |
| 50 | if not prerm: | 50 | if not prerm: |
| 51 | prerm = '#!/bin/sh\n' | 51 | prerm = '#!/bin/sh\n' |
| 52 | prerm += bb.data.getVar('gconf_prerm', d, 1) | 52 | prerm += d.getVar('gconf_prerm', 1) |
| 53 | bb.data.setVar('pkg_prerm_%s' % pkg, prerm, d) | 53 | d.setVar('pkg_prerm_%s' % pkg, prerm) |
| 54 | 54 | ||
| 55 | } | 55 | } |