diff options
| author | Dominic Sacré <dominic.sacre@gmx.de> | 2015-09-17 18:13:42 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-23 09:52:51 +0100 |
| commit | fe0cdaba8d06f1dc126c647b8ef7150dcd18cc98 (patch) | |
| tree | 519209d209a5d9136e6ba74be653bd938961131f | |
| parent | c6b52f32afd748004f532abf00fcf5a3e7fa1e8a (diff) | |
| download | poky-fe0cdaba8d06f1dc126c647b8ef7150dcd18cc98.tar.gz | |
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.
(From OE-Core rev: 2c7149633731272df5323dd0bd5165a67b0eb2f4)
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/tar/tar.inc | 10 |
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 () { | |||
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | do_install_append_class-target() { | 24 | do_install_append_class-target() { |
| 25 | install -d ${D}${base_bindir} | 25 | if [ "${base_bindir}" != "${bindir}" ]; then |
| 26 | mv ${D}${bindir}/tar ${D}${base_bindir}/tar | 26 | install -d ${D}${base_bindir} |
| 27 | mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar | 27 | mv ${D}${bindir}/tar ${D}${base_bindir}/tar |
| 28 | rmdir ${D}${bindir}/ | 28 | mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar |
| 29 | rmdir ${D}${bindir}/ | ||
| 30 | fi | ||
| 29 | } | 31 | } |
| 30 | 32 | ||
| 31 | PACKAGES =+ "${PN}-rmt" | 33 | PACKAGES =+ "${PN}-rmt" |
