diff options
author | André Draszik <andre.draszik@linaro.org> | 2013-07-30 12:56:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-31 06:59:59 +0100 |
commit | d45486eb1c41daeaa3947750b89cb83f59712548 (patch) | |
tree | 9f79c984ced2dbb9591ecf6a2ed93a4392f4dd14 /bitbake/lib | |
parent | 5472bdc2f0119c538d39bfe1531690bccc18ede1 (diff) | |
download | poky-d45486eb1c41daeaa3947750b89cb83f59712548.tar.gz |
bitbake: fetch2: fix unpack of .xz files
If a file ends with .xz, it currently gets overwritten during unpack:
The decompress command for .xz files is:
'xz -dc %s > %s' % (file, efile)
and as efile == file, we end up overwriting file (the source).
Fix this by adding .xz to the list of suffixes that that need to
be removed from a file name for an extract command, leaving the
bare file name. Now, for a given file foo.xz,
file == foo.xz and efile == foo, similar to how .gz .bz2 and .Z
files are treated.
(Bitbake rev: 2cd2d0a48e12ab4358fb967eaf7a56c17993f48d)
Signed-off-by: André Draszik <andre.draszik@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 6211cd7f5d..451d104f67 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -1157,7 +1157,7 @@ class FetchMethod(object): | |||
1157 | (file, urldata.parm.get('unpack'))) | 1157 | (file, urldata.parm.get('unpack'))) |
1158 | 1158 | ||
1159 | dots = file.split(".") | 1159 | dots = file.split(".") |
1160 | if dots[-1] in ['gz', 'bz2', 'Z']: | 1160 | if dots[-1] in ['gz', 'bz2', 'Z', 'xz']: |
1161 | efile = os.path.join(rootdir, os.path.basename('.'.join(dots[0:-1]))) | 1161 | efile = os.path.join(rootdir, os.path.basename('.'.join(dots[0:-1]))) |
1162 | else: | 1162 | else: |
1163 | efile = file | 1163 | efile = file |