diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-02-28 17:36:41 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-28 17:36:41 +0000 |
| commit | efb20b9d53419497d6b8bc6afe2df6b8670478ed (patch) | |
| tree | 9fb4e25f5c7ef72cf68639836cae184e433cdae3 /classes/base.bbclass | |
| parent | 83105ad9e6045639a7c4a4a95f78dd8685588baf (diff) | |
base.bbclass: Handle crlf with DOS ZIP file, courtesy Raymond Danks
Diffstat (limited to 'classes/base.bbclass')
| -rw-r--r-- | classes/base.bbclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 9b87828594..21feaab6e6 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -371,7 +371,11 @@ def oe_unpack_file(file, data, url = None): elif file.endswith('.bz2'): cmd = 'bzip2 -dc %s > %s' % (file, efile) elif file.endswith('.zip'): - cmd = 'unzip -q %s' % file + cmd = 'unzip -q' + (type, host, path, user, pswd, parm) = bb.decodeurl(url) + if 'dos' in parm: + cmd = '%s -a' % cmd + cmd = '%s %s' % (cmd, file) elif os.path.isdir(file): filesdir = os.path.realpath(bb.data.getVar("FILESDIR", data, 1)) destdir = "." @@ -449,7 +453,7 @@ python base_do_patch() { if not "patch" in parm: continue - bb.fetch.init([url], d) + bb.fetch.init([url],d) url = bb.encodeurl((type, host, path, user, pswd, [])) local = os.path.join('/', bb.fetch.localpath(url, d)) |