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.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
index 4c0f3452ac08459bba15e24da9899c7bbf5b9710..40e3a53ceb111493dfab88fe502095eccdc4dd2a 100644 (file)
--- 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 72976deb645be571971c1609ab50ddf47b9ef1d9..bbfa238df18a22ec51939db14b89a6367d40ca68 100644 (file)
--- 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"