From a09c5d66732fdd22b0f5f78304000798db88e495 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sun, 10 Feb 2013 13:41:48 +0100 Subject: update-alternatives.bblcass: use oe.path.realpath() oe.path.realpath() provides are common and more correct implementation for resolving symlinks within sysroot. Use it. (From OE-Core rev: 2fa5cc0d08e855e24a4497601d7cc73b9f2aa550) Signed-off-by: Enrico Scholz Signed-off-by: Richard Purdie --- meta/classes/update-alternatives.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'meta/classes') 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 -- cgit v1.2.3-54-g00ecf