sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

scriptutils: fix fetch_uri() to work with RSS 

Since recipe-specific sysroots were implemented, devtool add and devtool
upgrade operations that fetch from a URL that requires native sysroot
dependencies will fail to work as there is no recipe-specific sysroot
set up for them during fetching. An example was any URL pointing to a
tarball compressed with xz, e.g. devtool upgrade on gnutls.

The most expedient way to fix this is to set up a dummy recipe-specific
sysroot to use for the fetch/unpack operations. We do this in the same
manner as bitbake -b does, so we're just taking all of the sysroot
components available and creating a sysroot from those rather than
ensuring the correct dependencies are there - this means that we're
still going to have problems if e.g. xz-native hasn't been built yet,
but that issue will be trickier to solve and is tracked separately.

Fixes [YOCTO #11474].

(From OE-Core master rev: 559151e783759af78b5cdd76cdbb9ce325a391e6)

(From OE-Core rev: 9e7905c7bada1bafda661fc4a6177afeef0f5015)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2017-05-29 14:01:56 +12:00 committed by Richard Purdie
parent 31389f8b00
commit 645467e03f
1 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
scripts/lib/scriptutils.py
View File

@ -21,6 +21,8 @@ import logging
import glob
import argparse
import subprocess
import tempfile
import shutil
def logger_create(name, stream=None):
logger = logging.getLogger(name)
@ -78,32 +80,47 @@ def git_convert_standalone_clone(repodir):
def fetch_uri(d, uri, destdir, srcrev=None):
"""Fetch a URI to a local directory"""
import bb.data
bb.utils.mkdirhier(destdir)
localdata = bb.data.createCopy(d)
localdata.setVar('BB_STRICT_CHECKSUM', '')
localdata.setVar('SRCREV', srcrev)
ret = (None, None)
olddir = os.getcwd()
import bb
tmpparent = d.getVar('BASE_WORKDIR')
bb.utils.mkdirhier(tmpparent)
tmpworkdir = tempfile.mkdtemp(dir=tmpparent)
try:
fetcher = bb.fetch2.Fetch([uri], localdata)
for u in fetcher.ud:
ud = fetcher.ud[u]
ud.ignore_checksums = True
fetcher.download()
for u in fetcher.ud:
ud = fetcher.ud[u]
if ud.localpath.rstrip(os.sep) == localdata.getVar('DL_DIR').rstrip(os.sep):
raise Exception('Local path is download directory - please check that the URI "%s" is correct' % uri)
fetcher.unpack(destdir)
for u in fetcher.ud:
ud = fetcher.ud[u]
if ud.method.recommends_checksum(ud):
md5value = bb.utils.md5_file(ud.localpath)
sha256value = bb.utils.sha256_file(ud.localpath)
ret = (md5value, sha256value)
bb.utils.mkdirhier(destdir)
localdata = bb.data.createCopy(d)
# Set some values to allow extend_recipe_sysroot to work here we're we are not running from a task
localdata.setVar('WORKDIR', tmpworkdir)
localdata.setVar('BB_RUNTASK', 'do_fetch')
localdata.setVar('PN', 'dummy')
localdata.setVar('BB_LIMITEDDEPS', '1')
bb.build.exec_func("extend_recipe_sysroot", localdata)
# Set some values for the benefit of the fetcher code
localdata.setVar('BB_STRICT_CHECKSUM', '')
localdata.setVar('SRCREV', srcrev)
ret = (None, None)
olddir = os.getcwd()
try:
fetcher = bb.fetch2.Fetch([uri], localdata)
for u in fetcher.ud:
ud = fetcher.ud[u]
ud.ignore_checksums = True
fetcher.download()
for u in fetcher.ud:
ud = fetcher.ud[u]
if ud.localpath.rstrip(os.sep) == localdata.getVar('DL_DIR').rstrip(os.sep):
raise Exception('Local path is download directory - please check that the URI "%s" is correct' % uri)
fetcher.unpack(destdir)
for u in fetcher.ud:
ud = fetcher.ud[u]
if ud.method.recommends_checksum(ud):
md5value = bb.utils.md5_file(ud.localpath)
sha256value = bb.utils.sha256_file(ud.localpath)
ret = (md5value, sha256value)
finally:
os.chdir(olddir)
finally:
os.chdir(olddir)
shutil.rmtree(tmpworkdir)
return ret
def run_editor(fn):