[oe-commits] Ross Burton : ncurses: use ln -r to generate relative symlink
git at git.openembedded.org
git at git.openembedded.org
Sat Mar 1 15:58:19 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 65c2439ab6dcbd4c52439cdc96acb8ba222c196b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=65c2439ab6dcbd4c52439cdc96acb8ba222c196b
Author: Ross Burton <ross.burton at intel.com>
Date: Fri Feb 28 18:28:54 2014 +0000
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 <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/ncurses/ncurses.inc | 10 ++--------
1 file 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
More information about the Openembedded-commits
mailing list