summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorDominic Sacré <dominic.sacre@gmx.de>2015-09-17 18:13:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-21 15:20:04 +0100
commit2c7149633731272df5323dd0bd5165a67b0eb2f4 (patch)
tree8ba525f8f136d2d7f21c7155b16c941543f85ccc /meta
parent10e017fd3de3ff1ab0c1b32ac7a9610a04f8ff13 (diff)
downloadopenembedded-core-2c7149633731272df5323dd0bd5165a67b0eb2f4.tar.gz
openembedded-core-2c7149633731272df5323dd0bd5165a67b0eb2f4.tar.bz2
openembedded-core-2c7149633731272df5323dd0bd5165a67b0eb2f4.zip
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@gmx.de> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/tar/tar.inc10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
index b339c43385..93e4da114b 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"