summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2013-02-10 13:41:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-11 14:45:37 +0000
commit2fa5cc0d08e855e24a4497601d7cc73b9f2aa550 (patch)
tree675cb27cbfcf5ff0225c39ab0dfa33c915236552
parentc820ae11ce369002063bad8b11ee95e1882c99bb (diff)
downloadopenembedded-core-2fa5cc0d08e855e24a4497601d7cc73b9f2aa550.tar.gz
openembedded-core-2fa5cc0d08e855e24a4497601d7cc73b9f2aa550.tar.bz2
openembedded-core-2fa5cc0d08e855e24a4497601d7cc73b9f2aa550.zip
update-alternatives.bblcass: use oe.path.realpath()
oe.path.realpath() provides are common and more correct implementation for resolving symlinks within sysroot. Use it. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/update-alternatives.bbclass5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index 8f4d0976a9..0cefc51576 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -261,10 +261,7 @@ python perform_packagecopy_append () {
src = '%s/%s' % (pkgdest, alt_target)
dest = '%s/%s' % (pkgdest, link_rename[alt_target])
link = os.readlink(src)
- if os.path.isabs(link):
- link_target = pkgdest + os.readlink(src)
- else:
- link_target = os.path.join(os.path.dirname(src), link)
+ link_target = oe.path.realpath(src, pkgdest, True)
if os.path.lexists(link_target):
# Ok, the link_target exists, we can rename