summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/update-rc.d.bbclass12
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 0c2b94a25b..d8cc34234e 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -62,22 +62,28 @@ python populate_packages_updatercd () {
62 execute on the target. Not doing so may cause update_rc.d postinst invoked 62 execute on the target. Not doing so may cause update_rc.d postinst invoked
63 twice to cause unwanted warnings. 63 twice to cause unwanted warnings.
64 """ 64 """
65
66 localdata = bb.data.createCopy(d)
67 overrides = localdata.getVar("OVERRIDES", True)
68 localdata.setVar("OVERRIDES", "%s:%s" % (pkg, overrides))
69 bb.data.update_data(localdata)
70
65 postinst = d.getVar('pkg_postinst_%s' % pkg, True) 71 postinst = d.getVar('pkg_postinst_%s' % pkg, True)
66 if not postinst: 72 if not postinst:
67 postinst = '#!/bin/sh\n' 73 postinst = '#!/bin/sh\n'
68 postinst += d.getVar('updatercd_postinst', True) 74 postinst += localdata.getVar('updatercd_postinst', True)
69 d.setVar('pkg_postinst_%s' % pkg, postinst) 75 d.setVar('pkg_postinst_%s' % pkg, postinst)
70 76
71 prerm = d.getVar('pkg_prerm_%s' % pkg, True) 77 prerm = d.getVar('pkg_prerm_%s' % pkg, True)
72 if not prerm: 78 if not prerm:
73 prerm = '#!/bin/sh\n' 79 prerm = '#!/bin/sh\n'
74 prerm += d.getVar('updatercd_prerm', True) 80 prerm += localdata.getVar('updatercd_prerm', True)
75 d.setVar('pkg_prerm_%s' % pkg, prerm) 81 d.setVar('pkg_prerm_%s' % pkg, prerm)
76 82
77 postrm = d.getVar('pkg_postrm_%s' % pkg, True) 83 postrm = d.getVar('pkg_postrm_%s' % pkg, True)
78 if not postrm: 84 if not postrm:
79 postrm = '#!/bin/sh\n' 85 postrm = '#!/bin/sh\n'
80 postrm += d.getVar('updatercd_postrm', True) 86 postrm += localdata.getVar('updatercd_postrm', True)
81 d.setVar('pkg_postrm_%s' % pkg, postrm) 87 d.setVar('pkg_postrm_%s' % pkg, postrm)
82 88
83 # Check that this class isn't being inhibited (generally, by 89 # Check that this class isn't being inhibited (generally, by