diff options
| author | Mike Crowe <mac@mcrowe.com> | 2015-02-05 17:50:23 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-10 10:47:43 +0000 |
| commit | 3f8ce1e755e4204c7bf03f937d063b70abd8c73c (patch) | |
| tree | b4393711d6229725fa0d68bc5c3545f2b060abd8 /meta/recipes-extended/sed | |
| parent | 9d078a14a5072d26a959f423da5be1d7712a33ab (diff) | |
| download | ast2050-yocto-poky-3f8ce1e755e4204c7bf03f937d063b70abd8c73c.zip ast2050-yocto-poky-3f8ce1e755e4204c7bf03f937d063b70abd8c73c.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.
(From OE-Core rev: ab1452cacce6584bab27b73fc1e22d603606ecda)
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sed')
| -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 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" |
