From 069a332d1cf0778831673ed4ab5dfadbe2758783 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 3 Feb 2013 22:10:21 +0000 Subject: classes: Drop none package specific packaging variable accesses (From OE-Core rev: 24cbe88429ba021d7c461e0271b67106d11d5eb2) Signed-off-by: Richard Purdie --- meta/classes/gconf.bbclass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'meta/classes/gconf.bbclass') 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') } -- cgit v1.2.3-54-g00ecf