summaryrefslogtreecommitdiffstats
path: root/meta/classes/update-alternatives.bbclass
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-11-21 02:32:50 (GMT)
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-21 18:17:24 (GMT)
commitad0e271a0337a58c039bf6c0d01684783bbc214f (patch)
tree09f20bf56532de34df3793f681bcd5e9e3e8120e /meta/classes/update-alternatives.bbclass
parentbd3b63179ccdb030dbf0ff1e792b896f0e1476ae (diff)
downloadpoky-ad0e271a0337a58c039bf6c0d01684783bbc214f.tar.gz
update-alternatives.bbclass: don't expand var when appending do_install
Or else absolute paths may be expanded which then breaks sstate signature comparison. I'm not sure whether pre/post funcs can be expanded or not. They are invoked at image build or on the target, and thus need be expanded some place. But if one recipe does use directories under TMP in its postinst helpers, this would be an issue again. Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/classes/update-alternatives.bbclass')
-rw-r--r--meta/classes/update-alternatives.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index fdb4214..ba81221 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -79,8 +79,8 @@ fi
79 79
80def update_alternatives_after_parse(d): 80def update_alternatives_after_parse(d):
81 if bb.data.getVar('ALTERNATIVE_LINKS', d) != None: 81 if bb.data.getVar('ALTERNATIVE_LINKS', d) != None:
82 doinstall = bb.data.getVar('do_install', d, 1) 82 doinstall = bb.data.getVar('do_install', d, 0)
83 doinstall += bb.data.getVar('update_alternatives_batch_doinstall', d, 1) 83 doinstall += bb.data.getVar('update_alternatives_batch_doinstall', d, 0)
84 bb.data.setVar('do_install', doinstall, d) 84 bb.data.setVar('do_install', doinstall, d)
85 return 85 return
86 86