From: Ross Burton Date: Fri, 28 Feb 2014 18:28:54 +0000 (+0000) Subject: ncurses: use ln -r to generate relative symlink X-Git-Tag: 2015-4~3492 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=65c2439ab6dcbd4c52439cdc96acb8ba222c196b;p=openembedded-core.git ncurses: use ln -r to generate relative symlink 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 Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index a94466a634..835ecc33e8 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -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