diff options
author | Ross Burton <ross.burton@intel.com> | 2014-02-28 18:28:54 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-02 17:25:28 +0000 |
commit | f363c361fb0f3b7eaa82a4d6f125be5cdc0375fe (patch) | |
tree | c969b1b61c558f78b16c799eb0d8cf1d7d21cd8d | |
parent | e6e5f64bafb692b7bf9d1c536a09ea9517fa24e6 (diff) | |
download | ast2050-yocto-poky-f363c361fb0f3b7eaa82a4d6f125be5cdc0375fe.zip ast2050-yocto-poky-f363c361fb0f3b7eaa82a4d6f125be5cdc0375fe.tar.gz |
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.
(From OE-Core rev: 65c2439ab6dcbd4c52439cdc96acb8ba222c196b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index a94466a..835ecc3 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 |