From ad0e271a0337a58c039bf6c0d01684783bbc214f Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Sun, 21 Nov 2010 10:32:50 +0800 Subject: 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 --- meta/classes/update-alternatives.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/update-alternatives.bbclass') diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index fdb4214b65..ba812210a7 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -79,8 +79,8 @@ fi def update_alternatives_after_parse(d): if bb.data.getVar('ALTERNATIVE_LINKS', d) != None: - doinstall = bb.data.getVar('do_install', d, 1) - doinstall += bb.data.getVar('update_alternatives_batch_doinstall', d, 1) + doinstall = bb.data.getVar('do_install', d, 0) + doinstall += bb.data.getVar('update_alternatives_batch_doinstall', d, 0) bb.data.setVar('do_install', doinstall, d) return -- cgit v1.2.3-54-g00ecf