[oe-commits] Mike Crowe : sed: Cope with ${bindir} and ${base_bindir} being the same

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: ab1452cacce6584bab27b73fc1e22d603606ecda
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ab1452cacce6584bab27b73fc1e22d603606ecda

Author: Mike Crowe <mac at mcrowe.com>
Date:   Thu Feb  5 17:50:23 2015 +0000

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 at mcrowe.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 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 4c0f345..40e3a53 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 72976de..bbfa238 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"