diff options
Diffstat (limited to 'meta/classes/gconf.bbclass')
-rw-r--r-- | meta/classes/gconf.bbclass | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass index cc01bcad2a..e9076b2779 100644 --- a/meta/classes/gconf.bbclass +++ b/meta/classes/gconf.bbclass | |||
@@ -56,18 +56,15 @@ python populate_packages_append () { | |||
56 | if schemas != []: | 56 | if schemas != []: |
57 | bb.note("adding gconf postinst and prerm scripts to %s" % pkg) | 57 | bb.note("adding gconf postinst and prerm scripts to %s" % pkg) |
58 | d.setVar('SCHEMA_FILES', " ".join(schemas)) | 58 | d.setVar('SCHEMA_FILES', " ".join(schemas)) |
59 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) | 59 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) |
60 | if not postinst: | 60 | if not postinst: |
61 | postinst = '#!/bin/sh\n' | 61 | postinst = '#!/bin/sh\n' |
62 | postinst += d.getVar('gconf_postinst', True) | 62 | postinst += d.getVar('gconf_postinst', True) |
63 | d.setVar('pkg_postinst_%s' % pkg, postinst) | 63 | d.setVar('pkg_postinst_%s' % pkg, postinst) |
64 | prerm = d.getVar('pkg_prerm_%s' % pkg, True) or d.getVar('pkg_prerm', True) | 64 | prerm = d.getVar('pkg_prerm_%s' % pkg, True) |
65 | if not prerm: | 65 | if not prerm: |
66 | prerm = '#!/bin/sh\n' | 66 | prerm = '#!/bin/sh\n' |
67 | prerm += d.getVar('gconf_prerm', True) | 67 | prerm += d.getVar('gconf_prerm', True) |
68 | d.setVar('pkg_prerm_%s' % pkg, prerm) | 68 | d.setVar('pkg_prerm_%s' % pkg, prerm) |
69 | rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or "" | 69 | d.appendVar("RDEPENDS_%s" % pkg, ' ' + d.getVar('MLPREFIX') + 'gconf') |
70 | rdepends += ' ' + d.getVar('MLPREFIX') + 'gconf' | ||
71 | d.setVar("RDEPENDS_%s" % pkg, rdepends) | ||
72 | |||
73 | } | 70 | } |