From f9d676757af3a1ca9241a36c0310d6af56578fff Mon Sep 17 00:00:00 2001 From: =?utf8?q?Dominic=20Sacr=C3=A9?= Date: Thu, 17 Sep 2015 18:13:44 +0200 Subject: [PATCH] gzip: fix install if bindir == base_bindir MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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é Signed-off-by: Ross Burton --- meta/recipes-extended/gzip/gzip.inc | 14 ++++++++------ 1 file 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 EXTRA_OEMAKE_class-target = "GREP=${base_bindir}/grep" do_install_append () { - # Rename and move files into /bin (FHS), which is typical place for gzip - install -d ${D}${base_bindir} - mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip - mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip - mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat - mv ${D}${bindir}/uncompress ${D}${base_bindir}/uncompress + if [ "${base_bindir}" != "${bindir}" ]; then + # Rename and move files into /bin (FHS), which is typical place for gzip + install -d ${D}${base_bindir} + mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip + mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip + mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat + mv ${D}${bindir}/uncompress ${D}${base_bindir}/uncompress + fi } inherit update-alternatives -- 2.40.1