diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 12:53:39 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 17:32:31 +0100 |
| commit | 0b8d5dad9cc3eaff77b03e72039a63a0a670b321 (patch) | |
| tree | 7fbd291865701a7b5103006e270d886436426a89 /meta/classes/update-alternatives.bbclass | |
| parent | b3e76b33f354c7747f86514abd3844afba64d8bb (diff) | |
| download | openembedded-core-contrib-0b8d5dad9cc3eaff77b03e72039a63a0a670b321.tar.gz | |
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.
(From OE-Core rev: ecea2fab2063a3c478a63e62ba0e80305674c5e0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/update-alternatives.bbclass')
| -rw-r--r-- | meta/classes/update-alternatives.bbclass | 6 |
1 files changed, 5 insertions, 1 deletions
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 |