[yocto] [meta-gplv2][PATCH] grep: fix install if bindir == base_bindir

Wes Lindauer wesley.lindauer at gmail.com
Wed Nov 14 14:32:33 PST 2018


This same fix was made to the grep recipe in poky at hash
5f137933c05646dee685d7846cba875ae74064cd. Not everyone gets the luxury of
using GPLv3 code, so the same fix needs to be applied to the GPLv2
version.

Signed-off-by: Wes Lindauer <wesley.lindauer at gmail.com>
---
 recipes-extended/grep/grep_2.5.1a.bb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/recipes-extended/grep/grep_2.5.1a.bb b/recipes-extended/grep/grep_2.5.1a.bb
index 97ca768..b331fee 100644
--- a/recipes-extended/grep/grep_2.5.1a.bb
+++ b/recipes-extended/grep/grep_2.5.1a.bb
@@ -38,11 +38,13 @@ do_configure_prepend () {
 
 do_install () {
 	autotools_do_install
-	install -d ${D}${base_bindir}
-	mv ${D}${bindir}/grep ${D}${base_bindir}/grep
-	mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep
-	mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep
-	rmdir ${D}${bindir}/
+        if [ "${base_bindir}" != "${bindir}" ]; then
+        	install -d ${D}${base_bindir}
+	        mv ${D}${bindir}/grep ${D}${base_bindir}/grep
+	        mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep
+	        mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep
+	        rmdir ${D}${bindir}/
+        fi
 }
 
 inherit update-alternatives
-- 
2.14.5



More information about the yocto mailing list