From 3f8ce1e755e4204c7bf03f937d063b70abd8c73c Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Thu, 5 Feb 2015 17:50:23 +0000 Subject: sed: Cope with ${bindir} and ${base_bindir} being the same ${bindir} and ${base_bindir} may be the same. If they are don't try and move files onto themselves. (From OE-Core rev: ab1452cacce6584bab27b73fc1e22d603606ecda) Signed-off-by: Mike Crowe Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/sed/sed_4.1.2.bb | 6 ++++-- meta/recipes-extended/sed/sed_4.2.2.bb | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb index 4c0f3452ac..40e3a53ceb 100644 --- a/meta/recipes-extended/sed/sed_4.1.2.bb +++ b/meta/recipes-extended/sed/sed_4.1.2.bb @@ -23,8 +23,10 @@ do_configure_prepend () { do_install () { autotools_do_install install -d ${D}${base_bindir} - mv ${D}${bindir}/sed ${D}${base_bindir}/sed - rmdir ${D}${bindir}/ + if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then + mv ${D}${bindir}/sed ${D}${base_bindir}/sed + rmdir ${D}${bindir}/ + fi } ALTERNATIVE_${PN} = "sed" diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.2.2.bb index 72976deb64..bbfa238df1 100644 --- a/meta/recipes-extended/sed/sed_4.2.2.bb +++ b/meta/recipes-extended/sed/sed_4.2.2.bb @@ -22,8 +22,10 @@ EXTRA_OECONF = "--disable-acl \ do_install () { autotools_do_install install -d ${D}${base_bindir} - mv ${D}${bindir}/sed ${D}${base_bindir}/sed - rmdir ${D}${bindir}/ + if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then + mv ${D}${bindir}/sed ${D}${base_bindir}/sed + rmdir ${D}${bindir}/ + fi } ALTERNATIVE_${PN} = "sed" -- cgit v1.2.3-54-g00ecf