diff options
author | Ting Liu <b28495@freescale.com> | 2012-06-07 14:17:37 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2012-07-10 20:11:35 -0700 |
commit | 70720a51b0486f169c0824598483b3fe7e5c7a64 (patch) | |
tree | 363dd2d949d04bfa2710fa5f94eef109593cd08a | |
parent | f9598086d6bab11ede083c96902d219f23adc167 (diff) | |
download | meta-fsl-ppc-70720a51b0486f169c0824598483b3fe7e5c7a64.tar.gz |
testfloat: fix dos2unix not found issue during do_unpack2
On some distros such as Ubuntu 10.04, dos2unix is replaced by
fromdos. Reference:
http://www.virtualhelp.me/linux/164-dos2unix-missing-ubuntu-1004
Fix the following error:
| NOTE: Applying patch 'TestFloat-powerpc-E500v2-SPE-1.patch'
| (../meta-fsl-ppc/recipes-test/testfloat/files/TestFloat-powerpc-E500v2
| -SPE-1.patch)
| ERROR: Error executing a python function in ../meta-fsl-ppc/recipes-test/testfloat/testfloat_2a.bb:
| CmdError: Command Error: exit status: 1 Output:
Signed-off-by: Ting Liu <b28495@freescale.com>
-rw-r--r-- | recipes-test/testfloat/testfloat_2a.bb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/recipes-test/testfloat/testfloat_2a.bb b/recipes-test/testfloat/testfloat_2a.bb index fd5a5e6..ece8c18 100644 --- a/recipes-test/testfloat/testfloat_2a.bb +++ b/recipes-test/testfloat/testfloat_2a.bb | |||
@@ -20,7 +20,13 @@ S = "${WORKDIR}/TestFloat-2a" | |||
20 | do_unpack2(){ | 20 | do_unpack2(){ |
21 | mv ${WORKDIR}/SoftFloat-2b ${S}/SoftFloat-2b | 21 | mv ${WORKDIR}/SoftFloat-2b ${S}/SoftFloat-2b |
22 | cd ${S} | 22 | cd ${S} |
23 | find -type f -exec dos2unix {} \; | 23 | if [ -n "$(which fromdos)" ];then |
24 | find -type f -exec fromdos {} \; | ||
25 | elif [ -n "$(which dos2unix)" ];then | ||
26 | find -type f -exec dos2unix {} \; | ||
27 | else | ||
28 | echo -e "\nERROR: command dos2unix or fromdos not found\n" && return 1 | ||
29 | fi | ||
24 | } | 30 | } |
25 | addtask do_unpack2 after do_unpack before do_patch | 31 | addtask do_unpack2 after do_unpack before do_patch |
26 | 32 | ||