Patchwork [1/6] update-alternatives.bbclass: use absolute paths for link targets

login
mail settings
Submitter Christopher Larson
Date Dec. 29, 2012, 5:19 a.m.
Message ID <3f926cfa57debf042253c7c0db7be5b63de98209.1356758000.git.chris_larson@mentor.com>
Download mbox | patch
Permalink /patch/41797/
State Accepted
Commit 2b8bf64f1f6999b65ddd3efc2c6ddb7e70fead53
Headers show

Comments

Christopher Larson - Dec. 29, 2012, 5:19 a.m.
From: Christopher Larson <chris_larson@mentor.com>

This improves compatibility, as both the debian update-alternatives and the
chkconfig alternatives require absolute paths.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/classes/update-alternatives.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index a3631ec..556ee7c 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -298,7 +298,7 @@  python populate_packages_prepend () {
                 continue
 
             # Default to generate shell script.. eventually we may want to change this...
-            alt_target = os.path.relpath(alt_target, os.path.dirname(alt_link))
+            alt_target = os.path.normpath(alt_target)
 
             alt_setup_links  += '\tupdate-alternatives --install %s %s %s %s\n' % (alt_link, alt_name, alt_target, alt_priority)
             alt_remove_links += '\tupdate-alternatives --remove  %s %s\n' % (alt_name, alt_target)