summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2015-02-05 17:50:23 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-10 10:47:43 +0000
commit3f8ce1e755e4204c7bf03f937d063b70abd8c73c (patch)
treeb4393711d6229725fa0d68bc5c3545f2b060abd8 /meta/recipes-extended
parent9d078a14a5072d26a959f423da5be1d7712a33ab (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-extended/sed/sed_4.1.2.bb6
-rw-r--r--meta/recipes-extended/sed/sed_4.2.2.bb6
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 () {
23do_install () { 23do_install () {
24 autotools_do_install 24 autotools_do_install
25 install -d ${D}${base_bindir} 25 install -d ${D}${base_bindir}
26 mv ${D}${bindir}/sed ${D}${base_bindir}/sed 26 if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then
27 rmdir ${D}${bindir}/ 27 mv ${D}${bindir}/sed ${D}${base_bindir}/sed
28 rmdir ${D}${bindir}/
29 fi
28} 30}
29 31
30ALTERNATIVE_${PN} = "sed" 32ALTERNATIVE_${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 \
22do_install () { 22do_install () {
23 autotools_do_install 23 autotools_do_install
24 install -d ${D}${base_bindir} 24 install -d ${D}${base_bindir}
25 mv ${D}${bindir}/sed ${D}${base_bindir}/sed 25 if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then
26 rmdir ${D}${bindir}/ 26 mv ${D}${bindir}/sed ${D}${base_bindir}/sed
27 rmdir ${D}${bindir}/
28 fi
27} 29}
28 30
29ALTERNATIVE_${PN} = "sed" 31ALTERNATIVE_${PN} = "sed"