aboutsummaryrefslogtreecommitdiffstats
path: root/classes/gconf.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'classes/gconf.bbclass')
-rw-r--r--classes/gconf.bbclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass
index 99f33e433a..47df06329b 100644
--- a/classes/gconf.bbclass
+++ b/classes/gconf.bbclass
@@ -45,9 +45,10 @@ python populate_packages_append () {
if schemas != []:
bb.note("adding gconf postinst and prerm scripts to %s" % pkg)
bb.data.setVar('SCHEMA_FILES', " ".join(schemas), d)
- postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
- if not postinst:
- postinst = '#!/bin/sh\n'
+ postinst = '#!/bin/sh\n'
+ pkgpostinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
+ if pkgpostinst:
+ postinst += pkgpostinst
postinst += bb.data.getVar('gconf_postinst', d, 1)
bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
prerm = bb.data.getVar('pkg_prerm_%s' % pkg, d, 1) or bb.data.getVar('pkg_prerm', d, 1)