From: Leon Woestenberg <leon@sidebranch.com>
Date: Wed, 18 Nov 2009 19:08:48 +0000 (+0100)
Subject: lzma.inc: Remove dependency on dos2unix host command, using sed.
X-Git-Tag: Release-2010-05/1~1648^2~125
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ffe3fac1613ba96dda04e84691b74850ed2af08;p=openembedded.git

lzma.inc: Remove dependency on dos2unix host command, using sed.

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
---

diff --git a/recipes/lzma/lzma.inc b/recipes/lzma/lzma.inc
index fc40c9313b..bffbeb2d3b 100644
--- a/recipes/lzma/lzma.inc
+++ b/recipes/lzma/lzma.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compress
 HOMEPAGE = "http://www.7-zip.org/"
 LICENSE = "LGPL"
 DEPENDS = "zlib"
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@bb.data.getVar('PV',d,1).replace('.','')}.tar.bz2 \
            file://001-large_files.patch;patch=1 \
@@ -17,8 +17,8 @@ EXTRA_OEMAKE = "-f makefile.gcc"
 CFLAGS += "-c -I${S}"
 
 do_unpack_append() {
-        # It has few files with wrong encoding
-        os.system("find ${S} -type f -print0 | xargs -0 dos2unix")
+        # Replace MS-DOS line-endings with Unix style line-endings
+        os.system("find ${S} -type f -print0 | xargs -0 sed 's/\r$//' -i")
 }
 
 do_compile() {