[oe-commits] Koen Kooi : tcp-wrappers: fix do_install when $prefix == $base_prefix

git at git.openembedded.org git at git.openembedded.org
Mon Aug 4 15:26:31 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: f5eba98bf5dbdae15656f1d74865a5a9ef2f9442
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f5eba98bf5dbdae15656f1d74865a5a9ef2f9442

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