aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominic Sacré <dominic.sacre@gmx.de>2015-09-17 18:13:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-21 15:20:04 +0100
commit29e4d21a7101428ac44e60411883952b041fcbc1 (patch)
treefe6eee4fa30a55a23799882ae7ba3b1bad9e81de
parent2c7149633731272df5323dd0bd5165a67b0eb2f4 (diff)
downloadopenembedded-core-contrib-29e4d21a7101428ac44e60411883952b041fcbc1.tar.gz
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@gmx.de> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-extended/cpio/cpio_v2.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-extended/cpio/cpio_v2.inc b/meta/recipes-extended/cpio/cpio_v2.inc
index 93de4bb92b..8520ff267c 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"