diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-03 22:10:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-17 09:06:48 +0000 |
| commit | 24cbe88429ba021d7c461e0271b67106d11d5eb2 (patch) | |
| tree | 9cd8a214a2a4e5027ce8f211340002a4f62c7e42 /meta/classes/gconf.bbclass | |
| parent | 323ef78e377525e2214f4700c30305c493137853 (diff) | |
| download | openembedded-core-24cbe88429ba021d7c461e0271b67106d11d5eb2.tar.gz openembedded-core-24cbe88429ba021d7c461e0271b67106d11d5eb2.tar.bz2 openembedded-core-24cbe88429ba021d7c461e0271b67106d11d5eb2.zip | |
classes: Drop none package specific packaging variable accesses
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 () { if schemas != []: bb.note("adding gconf postinst and prerm scripts to %s" % pkg) d.setVar('SCHEMA_FILES', " ".join(schemas)) - postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) + postinst = d.getVar('pkg_postinst_%s' % pkg, True) if not postinst: postinst = '#!/bin/sh\n' postinst += d.getVar('gconf_postinst', True) d.setVar('pkg_postinst_%s' % pkg, postinst) - prerm = d.getVar('pkg_prerm_%s' % pkg, True) or d.getVar('pkg_prerm', True) + prerm = d.getVar('pkg_prerm_%s' % pkg, True) if not prerm: prerm = '#!/bin/sh\n' prerm += d.getVar('gconf_prerm', True) d.setVar('pkg_prerm_%s' % pkg, prerm) - rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or "" - rdepends += ' ' + d.getVar('MLPREFIX') + 'gconf' - d.setVar("RDEPENDS_%s" % pkg, rdepends) - + d.appendVar("RDEPENDS_%s" % pkg, ' ' + d.getVar('MLPREFIX') + 'gconf') } |