[oe-commits] Leon Woestenberg : lzma.inc: Remove dependency on dos2unix host command, using sed.

git version control git at git.openembedded.org
Wed Nov 18 19:09:44 UTC 2009


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 2ffe3fac1613ba96dda04e84691b74850ed2af08
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2ffe3fac1613ba96dda04e84691b74850ed2af08

Author: Leon Woestenberg <leon at sidebranch.com>
Date:   Wed Nov 18 20:08:48 2009 +0100

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

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

---

 recipes/lzma/lzma.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/lzma/lzma.inc b/recipes/lzma/lzma.inc
index fc40c93..bffbeb2 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() {





More information about the Openembedded-commits mailing list