[oe-commits] Richard Purdie : distutils/distutils3: Fix bashism
git at git.openembedded.org
git at git.openembedded.org
Mon Jun 30 15:37:34 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 7d61661348cf48cbe379ae600565840ea08664b1
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7d61661348cf48cbe379ae600565840ea08664b1
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Fri Jun 27 10:23:23 2014 +0100
distutils/distutils3: Fix bashism
read -d is a bashism. Replace with a direct exec to avoid the problem
in this case. This fixes silent build failures in do_install of
tasks on systems with dash as /bin/sh.
Also merge the fix to distutils for only changing necessary files
to disutils3 as well.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/distutils.bbclass | 8 ++------
meta/classes/distutils3.bbclass | 4 +---
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 12f2603..6ed7ecc 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -42,12 +42,8 @@ distutils_do_install() {
bbfatal "${PYTHON_PN} setup.py install execution failed."
# support filenames with *spaces*
- find ${D} -name "*.py" -print0 | while read -d $'\0' i ; do \
- # only modify file if it contains path to avoid recompilation on the target
- if grep -q "${D}" "$i"; then
- sed -i -e s:${D}::g "$i"
- fi
- done
+ # only modify file if it contains path to avoid recompilation on the target
+ find ${D} -name "*.py" -exec grep -q ${D} {} \; -exec sed -i -e s:${D}::g {} \;
if test -e ${D}${bindir} ; then
for i in ${D}${bindir}/* ; do \
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
index bbd645c..e909ef4 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -64,9 +64,7 @@ distutils3_do_install() {
bbfatal "${PYTHON_PN} setup.py install execution failed."
# support filenames with *spaces*
- find ${D} -name "*.py" -print0 | while read -d $'\0' i ; do \
- sed -i -e s:${D}::g "$i"
- done
+ find ${D} -name "*.py" -exec grep -q ${D} {} \; -exec sed -i -e s:${D}::g {} \;
if test -e ${D}${bindir} ; then
for i in ${D}${bindir}/* ; do \
More information about the Openembedded-commits
mailing list