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.

(From OE-Core rev: 7d61661348cf48cbe379ae600565840ea08664b1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2014-06-27 10:23:23 +01:00
parent 68824d9b8f
commit 946fb184bf
2 changed files with 3 additions and 9 deletions

View File

@ -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 \

View File

@ -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 \