mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

recipetool: create: eliminate second fetch for packages

Browse Source 
When dealing with package files (.rpm, .ipk etc.) we need to unpack them
ourselves to get the metadata, which is thrown away when the fetcher
unpacks them. However, since we've already fetched the file once, I'm
not sure as to why I thought I needed to fetch it again - we can just
get the local path and then unpack it directly.

(From OE-Core rev: be45e9b17e9dbc8c2594d3a939be377ab0720a7c)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2017-07-20 16:48:10 +02:00
committed by Richard Purdie
parent 047d37633b
commit 7d474e27bc
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/lib/recipetool/create.py
View File

@@ -478,20 +478,11 @@ def create_recipe(args):
bb.process.run('git submodule update --init --recursive', cwd=srctree)
if is_package(fetchuri):
tmpfdir = tempfile.mkdtemp(prefix='recipetool-')
try:
pkgfile = None
localdata = bb.data.createCopy(tinfoil.config_data)
pkgfile = bb.fetch2.localpath(fetchuri, localdata)
if pkgfile:
tmpfdir = tempfile.mkdtemp(prefix='recipetool-')
try:
fileuri = fetchuri + ';unpack=0'
scriptutils.fetch_uri(tinfoil.config_data, fileuri, tmpfdir, srcrev)
for root, _, files in os.walk(tmpfdir):
for f in files:
pkgfile = os.path.join(root, f)
break
except bb.fetch2.BBFetchException as e:
logger.warn('Second fetch to get metadata failed: %s' % str(e).rstrip())
if pkgfile:
if pkgfile.endswith(('.deb', '.ipk')):
stdout, _ = bb.process.run('ar x %s' % pkgfile, cwd=tmpfdir)
stdout, _ = bb.process.run('tar xf control.tar.gz', cwd=tmpfdir)
@@ -501,8 +492,8 @@ def create_recipe(args):
stdout, _ = bb.process.run('rpm -qp --xml %s > pkginfo.xml' % pkgfile, cwd=tmpfdir)
values = convert_rpm_xml(os.path.join(tmpfdir, 'pkginfo.xml'))
extravalues.update(values)
finally:
shutil.rmtree(tmpfdir)
finally:
shutil.rmtree(tmpfdir)
else:
# Assume we're pointing to an existing source tree
if args.extract_to: