From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 30 May 2012 11:53:39 +0000 (+0100)
Subject: update-alternatives: Fix absolute symlink handling
X-Git-Tag: 2015-4~10458
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ecea2fab2063a3c478a63e62ba0e80305674c5e0;p=openembedded-core.git

update-alternatives: Fix absolute symlink handling

After the class changes, absolute symlinks are not being handled correctly
by the class file. This adds handling for absolute symlinks to account for the
pkgdest directory, removing dangling symlink messages from recipes like bzip2.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index fce1e848f5..9f2e59f584 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -247,7 +247,11 @@ python perform_packagecopy_append () {
 		for alt_target in link_rename:
 			src = '%s/%s' % (pkgdest, alt_target)
 			dest = '%s/%s' % (pkgdest, link_rename[alt_target])
-			link_target = os.path.join(os.path.dirname(src), os.readlink(src))
+			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)
 
 			if os.path.lexists(link_target):
 				# Ok, the link_target exists, we can rename