[oe-commits] Christopher Larson : update-alternatives.bbclass: use absolute paths for link targets

git at git.openembedded.org git at git.openembedded.org
Mon Jan 7 11:36:17 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: 2b8bf64f1f6999b65ddd3efc2c6ddb7e70fead53
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2b8bf64f1f6999b65ddd3efc2c6ddb7e70fead53

Author: Christopher Larson <chris_larson at mentor.com>
Date:   Fri Dec 28 22:19:23 2012 -0700

update-alternatives.bbclass: use absolute paths for link targets

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

Signed-off-by: Christopher Larson <chris_larson at mentor.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/update-alternatives.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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)





More information about the Openembedded-commits mailing list