[oe-commits] Koen Kooi : tcp-wrappers: fix do_install when $prefix == $base_prefix
git at git.openembedded.org
git at git.openembedded.org
Wed Aug 6 09:03:52 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: ebc2b2f7d256ab1f05b9fe8af414c6425f9a2bf1
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ebc2b2f7d256ab1f05b9fe8af414c6425f9a2bf1
Author: Koen Kooi <koen at dominion.thruhere.net>
Date: Mon Aug 4 11:10:02 2014 +0200
tcp-wrappers: fix do_install when $prefix == $base_prefix
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index c7954e7..11cc243 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -87,10 +87,12 @@ do_install () {
oe_libinstall -a libwrap ${D}${libdir}
oe_libinstall -C shared -so libwrap ${D}${base_libdir}
- rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'`
- libname=`readlink ${D}${base_libdir}/libwrap.so | xargs basename`
- ln -s ${rel_lib_prefix}${base_libdir}/${libname} ${D}${libdir}/libwrap.so
- rm -f ${D}${base_libdir}/libwrap.so
+ if [ "${libdir}" != "${base_libdir}" ] ; then
+ rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'`
+ libname=`readlink ${D}${base_libdir}/libwrap.so | xargs basename`
+ ln -s ${rel_lib_prefix}${base_libdir}/${libname} ${D}${libdir}/libwrap.so
+ rm -f ${D}${base_libdir}/libwrap.so
+ fi
install -d ${D}${sbindir}
for b in ${BINS}; do
More information about the Openembedded-commits
mailing list