diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-27 10:23:23 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-29 09:04:21 +0100 |
| commit | 946fb184bf986b8bde2fe0502d48f69bc7cd4a18 (patch) | |
| tree | aec660da19e084e2942a5e765b25de4b8d1cfcb7 /meta/classes/distutils3.bbclass | |
| parent | 68824d9b8f6e290da078383316b3f4b732585f2b (diff) | |
| download | openembedded-core-contrib-946fb184bf986b8bde2fe0502d48f69bc7cd4a18.tar.gz | |
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>
Diffstat (limited to 'meta/classes/distutils3.bbclass')
| -rw-r--r-- | meta/classes/distutils3.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass index bbd645cc63..e909ef41b6 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 \ |