From 70720a51b0486f169c0824598483b3fe7e5c7a64 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Thu, 7 Jun 2012 14:17:37 +0000 Subject: 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 --- recipes-test/testfloat/testfloat_2a.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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" do_unpack2(){ mv ${WORKDIR}/SoftFloat-2b ${S}/SoftFloat-2b cd ${S} - find -type f -exec dos2unix {} \; + if [ -n "$(which fromdos)" ];then + find -type f -exec fromdos {} \; + elif [ -n "$(which dos2unix)" ];then + find -type f -exec dos2unix {} \; + else + echo -e "\nERROR: command dos2unix or fromdos not found\n" && return 1 + fi } addtask do_unpack2 after do_unpack before do_patch -- cgit v1.2.3-54-g00ecf