From: Ting Liu <b28495@freescale.com>
Date: Thu, 7 Jun 2012 14:17:37 +0000 (+0000)
Subject: testfloat: fix dos2unix not found issue during do_unpack2
X-Git-Tag: 2.1~534^2~444
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8aeffe2122f38a7a6f1415e7f90480af6e50875f;p=meta-freescale.git

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

diff --git a/meta-fsl-ppc/recipes-test/testfloat/testfloat_2a.bb b/meta-fsl-ppc/recipes-test/testfloat/testfloat_2a.bb
index fd5a5e61..ece8c185 100644
--- a/meta-fsl-ppc/recipes-test/testfloat/testfloat_2a.bb
+++ b/meta-fsl-ppc/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