[oe-commits] =?UTF-8?Q?Dominic=20Sacr=C3=A9=20?=: tar: fix install if bindir == base_bindir

[git at git.openembedded.org]

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

Author: Dominic Sacré <dominic.sacre at gmx.de>
Date:   Thu Sep 17 18:13:42 2015 +0200

tar: 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.

Signed-off-by: Dominic Sacré <dominic.sacre at gmx.de>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-extended/tar/tar.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
index b339c43..93e4da1 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/meta/recipes-extended/tar/tar.inc
@@ -22,10 +22,12 @@ do_install () {
 }
 
 do_install_append_class-target() {
-    install -d ${D}${base_bindir}
-    mv ${D}${bindir}/tar ${D}${base_bindir}/tar
-    mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar
-    rmdir ${D}${bindir}/
+    if [ "${base_bindir}" != "${bindir}" ]; then
+        install -d ${D}${base_bindir}
+        mv ${D}${bindir}/tar ${D}${base_bindir}/tar
+        mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar
+        rmdir ${D}${bindir}/
+    fi
 }
 
 PACKAGES =+ "${PN}-rmt"