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

[git at git.openembedded.org]

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

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

cpio: 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/cpio/cpio_v2.inc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/cpio/cpio_v2.inc b/meta/recipes-extended/cpio/cpio_v2.inc
index 93de4bb..8520ff2 100644
--- a/meta/recipes-extended/cpio/cpio_v2.inc
+++ b/meta/recipes-extended/cpio/cpio_v2.inc
@@ -18,9 +18,11 @@ EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}"
 
 do_install () {
     autotools_do_install
-    install -d ${D}${base_bindir}/
-    mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio"
-    rmdir ${D}${bindir}/
+    if [ "${base_bindir}" != "${bindir}" ]; then
+        install -d ${D}${base_bindir}/
+        mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio"
+        rmdir ${D}${bindir}/
+    fi
 }
 
 PACKAGES =+ "${PN}-rmt"