summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDominic Sacré <dominic.sacre@gmx.de>2015-09-17 18:13:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-23 09:52:52 +0100
commitb17c02f98d2a4aff3bb33273195c366b1755b2cf (patch)
tree26287111b3eab0e0dadfe372688115e4ee9b11d2 /meta
parentb6f8ea1b4bc912c4716c3a57005659b1f5cb2167 (diff)
downloadpoky-b17c02f98d2a4aff3bb33273195c366b1755b2cf.tar.gz
gzip: 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: f9d676757af3a1ca9241a36c0310d6af56578fff) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/gzip/gzip.inc14
1 files changed, 8 insertions, 6 deletions
diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index 94480ec530..58e5e0c53b 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
@@ -10,12 +10,14 @@ inherit autotools texinfo
10EXTRA_OEMAKE_class-target = "GREP=${base_bindir}/grep" 10EXTRA_OEMAKE_class-target = "GREP=${base_bindir}/grep"
11 11
12do_install_append () { 12do_install_append () {
13 # Rename and move files into /bin (FHS), which is typical place for gzip 13 if [ "${base_bindir}" != "${bindir}" ]; then
14 install -d ${D}${base_bindir} 14 # Rename and move files into /bin (FHS), which is typical place for gzip
15 mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip 15 install -d ${D}${base_bindir}
16 mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip 16 mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip
17 mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat 17 mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip
18 mv ${D}${bindir}/uncompress ${D}${base_bindir}/uncompress 18 mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat
19 mv ${D}${bindir}/uncompress ${D}${base_bindir}/uncompress
20 fi
19} 21}
20 22
21inherit update-alternatives 23inherit update-alternatives