From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Date: Sun, 10 Feb 2013 12:41:48 +0000 (+0100)
Subject: update-alternatives.bblcass: use oe.path.realpath()
X-Git-Tag: 2015-4~7595
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2fa5cc0d08e855e24a4497601d7cc73b9f2aa550;p=openembedded-core.git

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>
---

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