diff options
| author |   Mike Crowe <mac@mcrowe.com> | 2015-02-05 17:50:23 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-09 16:00:18 +0000 |
| commit | ab1452cacce6584bab27b73fc1e22d603606ecda (patch) | |
| tree | 19e0da788c566f31ea073317ea74970c0f1c95d7 | |
| parent | bcf1f0e18c656f75d8d1b8bbe1607bd8c722b529 (diff) | |
| download | openembedded-core-contrib-ab1452cacce6584bab27b73fc1e22d603606ecda.tar.gz | |
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>
| -rw-r--r-- | meta/recipes-extended/sed/sed_4.1.2.bb | 6 | ||||
| -rw-r--r-- | 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" |