summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominic Sacré <dominic.sacre@gmx.de>2015-09-17 18:13:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-23 09:52:52 +0100
commit5f137933c05646dee685d7846cba875ae74064cd (patch)
tree0c98f90f0bea034f64074424dd6638ec23e877c6
parentb17c02f98d2a4aff3bb33273195c366b1755b2cf (diff)
downloadpoky-5f137933c05646dee685d7846cba875ae74064cd.tar.gz
grep: fix install if bindir == base_bindir
Don't try to move binaries onto themselves if ${bindir} and ${base_bindir} are the same, as is the case on systems with a merged /usr directory. (From OE-Core rev: f1c9042ee4c42ac81f8846f5eb912f8db48e5c5f) Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/grep/grep_2.21.bb12
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-extended/grep/grep_2.21.bb b/meta/recipes-extended/grep/grep_2.21.bb
index 3661098c51..c51147b574 100644
--- a/meta/recipes-extended/grep/grep_2.21.bb
+++ b/meta/recipes-extended/grep/grep_2.21.bb
@@ -23,11 +23,13 @@ do_configure_prepend () {
23 23
24do_install () { 24do_install () {
25 autotools_do_install 25 autotools_do_install
26 install -d ${D}${base_bindir} 26 if [ "${base_bindir}" != "${bindir}" ]; then
27 mv ${D}${bindir}/grep ${D}${base_bindir}/grep 27 install -d ${D}${base_bindir}
28 mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep 28 mv ${D}${bindir}/grep ${D}${base_bindir}/grep
29 mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep 29 mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep
30 rmdir ${D}${bindir}/ 30 mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep
31 rmdir ${D}${bindir}/
32 fi
31} 33}
32 34
33inherit update-alternatives 35inherit update-alternatives