diff options
| author | Kevin Tian <kevin.tian@intel.com> | 2010-11-21 10:32:50 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-21 18:17:24 +0000 |
| commit | ad0e271a0337a58c039bf6c0d01684783bbc214f (patch) | |
| tree | 09f20bf56532de34df3793f681bcd5e9e3e8120e /meta/classes/update-alternatives.bbclass | |
| parent | bd3b63179ccdb030dbf0ff1e792b896f0e1476ae (diff) | |
| download | openembedded-core-ad0e271a0337a58c039bf6c0d01684783bbc214f.tar.gz openembedded-core-ad0e271a0337a58c039bf6c0d01684783bbc214f.tar.bz2 openembedded-core-ad0e271a0337a58c039bf6c0d01684783bbc214f.tar.xz openembedded-core-ad0e271a0337a58c039bf6c0d01684783bbc214f.zip | |
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.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index fdb4214b6..ba812210a 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 |