]> code.ossystems Code Review - openembedded-core.git/commitdiff
ncurses: use ln -r to generate relative symlink
authorRoss Burton <ross.burton@intel.com>
Fri, 28 Feb 2014 18:28:54 +0000 (18:28 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 1 Mar 2014 16:04:18 +0000 (16:04 +0000)
Instead of using a Python do_install() and calling
oe.path.make_relative_symlink, just pass -r to ln to generate a relative symlink
directly.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/ncurses/ncurses.inc

index a94466a6349e57dd6b93f4cac1fd111c4f947ad0..835ecc33e8bb341f0423aa1f0137856ed9e77c91 100644 (file)
@@ -147,12 +147,7 @@ _install_cfgs = "\
   PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
 "
 
-python do_install () {
-    bb.build.exec_func("shell_do_install", d)
-    oe.path.make_relative_symlink(d.expand("${D}${libdir}/libtinfo.so"))
-}
-
-shell_do_install() {
+do_install() {
         # Order of installation is important; widec installs a 'curses.h'
         # header with more definitions and must be installed last hence.
         # Compatibility of these headers will be checked in 'do_test()'.
@@ -226,8 +221,7 @@ shell_do_install() {
 
             mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
             rm ${D}${libdir}/libtinfo.so
-            # We'll turn this into a relative symlink after do_install returns
-            ln -sf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
+            ln -rsf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
         fi
 
         oe_multilib_header curses.h