summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2014-10-26 16:09:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-28 14:58:26 +0000
commitf5b9b389c0322da4222fdf1d7e1267a2804a73f7 (patch)
treebe64c747fc5b8f5d6e0239db86975cdb7073c71c /bitbake/lib/bb
parentdacc4ce59e48129a1a1e5316e10780f7358e29ef (diff)
downloadpoky-f5b9b389c0322da4222fdf1d7e1267a2804a73f7.tar.gz
bitbake: fetch2: add .lz compression support
See http://www.nongnu.org/lzip/lzip.html for details on the compression format. (Bitbake rev: 9027b1273b5405c7269b013604ab417771b5eafe) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index c0a4763a8b..3696e242e9 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1198,7 +1198,7 @@ class FetchMethod(object):
1198 (file, urldata.parm.get('unpack'))) 1198 (file, urldata.parm.get('unpack')))
1199 1199
1200 dots = file.split(".") 1200 dots = file.split(".")
1201 if dots[-1] in ['gz', 'bz2', 'Z', 'xz']: 1201 if dots[-1] in ['gz', 'bz2', 'Z', 'xz', 'lz']:
1202 efile = os.path.join(rootdir, os.path.basename('.'.join(dots[0:-1]))) 1202 efile = os.path.join(rootdir, os.path.basename('.'.join(dots[0:-1])))
1203 else: 1203 else:
1204 efile = file 1204 efile = file
@@ -1219,6 +1219,10 @@ class FetchMethod(object):
1219 cmd = 'xz -dc %s | tar x --no-same-owner -f -' % file 1219 cmd = 'xz -dc %s | tar x --no-same-owner -f -' % file
1220 elif file.endswith('.xz'): 1220 elif file.endswith('.xz'):
1221 cmd = 'xz -dc %s > %s' % (file, efile) 1221 cmd = 'xz -dc %s > %s' % (file, efile)
1222 elif file.endswith('.tar.lz'):
1223 cmd = 'lzip -dc %s | tar x --no-same-owner -f -' % file
1224 elif file.endswith('.lz'):
1225 cmd = 'lzip -dc %s > %s' % (file, efile)
1222 elif file.endswith('.zip') or file.endswith('.jar'): 1226 elif file.endswith('.zip') or file.endswith('.jar'):
1223 try: 1227 try:
1224 dos = bb.utils.to_boolean(urldata.parm.get('dos'), False) 1228 dos = bb.utils.to_boolean(urldata.parm.get('dos'), False)