summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-02-28 18:28:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-02 17:25:28 +0000
commitf363c361fb0f3b7eaa82a4d6f125be5cdc0375fe (patch)
treec969b1b61c558f78b16c799eb0d8cf1d7d21cd8d /meta/recipes-core
parente6e5f64bafb692b7bf9d1c536a09ea9517fa24e6 (diff)
downloadpoky-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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc10
1 files changed, 2 insertions, 8 deletions
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 = "\
147 PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ 147 PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
148" 148"
149 149
150python do_install () { 150do_install() {
151 bb.build.exec_func("shell_do_install", d)
152 oe.path.make_relative_symlink(d.expand("${D}${libdir}/libtinfo.so"))
153}
154
155shell_do_install() {
156 # Order of installation is important; widec installs a 'curses.h' 151 # Order of installation is important; widec installs a 'curses.h'
157 # header with more definitions and must be installed last hence. 152 # header with more definitions and must be installed last hence.
158 # Compatibility of these headers will be checked in 'do_test()'. 153 # Compatibility of these headers will be checked in 'do_test()'.
@@ -226,8 +221,7 @@ shell_do_install() {
226 221
227 mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir} 222 mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
228 rm ${D}${libdir}/libtinfo.so 223 rm ${D}${libdir}/libtinfo.so
229 # We'll turn this into a relative symlink after do_install returns 224 ln -rsf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
230 ln -sf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
231 fi 225 fi
232 226
233 oe_multilib_header curses.h 227 oe_multilib_header curses.h