mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 03:32:12 +02:00
devtool: rework source extraction so that dependencies are handled
Since it was first implemented, devtool's source extraction (as used by the devtool modify, extract and upgrade subcommands) ignored other recipe dependencies - so for example if you ran devtool modify on a recipe that fetches from svn or is compressed using xz then it would fail if those dependencies hadn't been built first. Now that we can execute tasks in the normal way (i.e. tinfoil.build_targets()) then we can rework it to use that. This is slightly tricky in that the source extraction needs to insert some logic in between tasks; luckily we can use a helper class that conditionally adds prefuncs to make that possible. Some side-effects / aspects of this change worth noting: * Operations are a little slower because we have to go through the task dependency graph generation and other startup processing. There's not really any way to avoid this though. * devtool extract didn't used to require a workspace, now it does because it needs to create a temporary bbappend for the recipe. (As with other commands the workspace be created on the fly if it doesn't already exist.) * I want any existing sysroot files and stamps to be left alone during extraction since we are running the tasks off to the side, and especially devtool extract should be able to be used without touching these. However, this was hampered by the automatic removal process in sstate.bbclass triggered by bb.event.ReachableStamps when the task signatures change, thus I had to introduce a way to disable this removal on a per-recipe basis (we still want it to function for any dependencies that we aren't working on). To implement this I elected to use a file written to tmp/sstate-control which gets deleted automatically after reading so that there's less chance of stale files affecting future sessions. I could have used a variable but this would have needed to be whitelisted and I'd have to have poked its value in using the setVariable command. Fixes [YOCTO #11198]. (From OE-Core rev: 830dbd66992cbb9e731b48d56fddf8f220349666) 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
committed by
Richard Purdie
Richard Purdie
parent
4842db00b7
commit
10af6d86b3
@@ -407,7 +407,7 @@ def extract(args, config, basepath, workspace):
|
||||
return 1
|
||||
|
||||
srctree = os.path.abspath(args.srctree)
|
||||
initial_rev = _extract_source(srctree, args.keep_temp, args.branch, False, rd, tinfoil)
|
||||
initial_rev = _extract_source(srctree, args.keep_temp, args.branch, False, config, rd, tinfoil)
|
||||
logger.info('Source tree extracted to %s' % srctree)
|
||||
|
||||
if initial_rev:
|
||||
@@ -431,7 +431,7 @@ def sync(args, config, basepath, workspace):
|
||||
return 1
|
||||
|
||||
srctree = os.path.abspath(args.srctree)
|
||||
initial_rev = _extract_source(srctree, args.keep_temp, args.branch, True, rd, tinfoil)
|
||||
initial_rev = _extract_source(srctree, args.keep_temp, args.branch, True, config, rd, tinfoil)
|
||||
logger.info('Source tree %s synchronized' % srctree)
|
||||
|
||||
if initial_rev:
|
||||
@@ -442,9 +442,10 @@ def sync(args, config, basepath, workspace):
|
||||
tinfoil.shutdown()
|
||||
|
||||
|
||||
def _extract_source(srctree, keep_temp, devbranch, sync, d, tinfoil):
|
||||
def _extract_source(srctree, keep_temp, devbranch, sync, config, d, tinfoil):
|
||||
"""Extract sources of a recipe"""
|
||||
import oe.recipeutils
|
||||
import oe.patch
|
||||
|
||||
pn = d.getVar('PN')
|
||||
|
||||
@@ -466,15 +467,18 @@ def _extract_source(srctree, keep_temp, devbranch, sync, d, tinfoil):
|
||||
raise DevtoolError("The %s recipe has do_unpack disabled, unable to "
|
||||
"extract source" % pn, 4)
|
||||
|
||||
if bb.data.inherits_class('kernel-yocto', d):
|
||||
tinfoil.build_targets('kern-tools-native')
|
||||
|
||||
if not sync:
|
||||
# Prepare for shutil.move later on
|
||||
bb.utils.mkdirhier(srctree)
|
||||
os.rmdir(srctree)
|
||||
|
||||
initial_rev = None
|
||||
|
||||
appendexisted = False
|
||||
recipefile = d.getVar('FILE')
|
||||
appendfile = recipe_to_append(recipefile, config)
|
||||
is_kernel_yocto = bb.data.inherits_class('kernel-yocto', d)
|
||||
|
||||
# We need to redirect WORKDIR, STAMPS_DIR etc. under a temporary
|
||||
# directory so that:
|
||||
# (a) we pick up all files that get unpacked to the WORKDIR, and
|
||||
@@ -493,147 +497,56 @@ def _extract_source(srctree, keep_temp, devbranch, sync, d, tinfoil):
|
||||
try:
|
||||
tinfoil.logger.setLevel(logging.WARNING)
|
||||
|
||||
crd = d.createCopy()
|
||||
# Make a subdir so we guard against WORKDIR==S
|
||||
workdir = os.path.join(tempdir, 'workdir')
|
||||
crd.setVar('WORKDIR', workdir)
|
||||
if not crd.getVar('S').startswith(workdir):
|
||||
# Usually a shared workdir recipe (kernel, gcc)
|
||||
# Try to set a reasonable default
|
||||
if bb.data.inherits_class('kernel', d):
|
||||
crd.setVar('S', '${WORKDIR}/source')
|
||||
# FIXME this results in a cache reload under control of tinfoil, which is fine
|
||||
# except we don't get the knotty progress bar
|
||||
|
||||
if os.path.exists(appendfile):
|
||||
appendbackup = os.path.join(tempdir, os.path.basename(appendfile) + '.bak')
|
||||
shutil.copyfile(appendfile, appendbackup)
|
||||
else:
|
||||
appendbackup = None
|
||||
bb.utils.mkdirhier(os.path.dirname(appendfile))
|
||||
logger.debug('writing append file %s' % appendfile)
|
||||
with open(appendfile, 'a') as f:
|
||||
f.write('###--- _extract_source\n')
|
||||
f.write('DEVTOOL_TEMPDIR = "%s"\n' % tempdir)
|
||||
f.write('DEVTOOL_DEVBRANCH = "%s"\n' % devbranch)
|
||||
if not is_kernel_yocto:
|
||||
f.write('PATCHTOOL = "git"\n')
|
||||
f.write('PATCH_COMMIT_FUNCTIONS = "1"\n')
|
||||
f.write('inherit devtool-source\n')
|
||||
f.write('###--- _extract_source\n')
|
||||
|
||||
update_unlockedsigs(basepath, workspace, fixed_setup, [pn])
|
||||
|
||||
sstate_manifests = d.getVar('SSTATE_MANIFESTS')
|
||||
bb.utils.mkdirhier(sstate_manifests)
|
||||
preservestampfile = os.path.join(sstate_manifests, 'preserve-stamps')
|
||||
with open(preservestampfile, 'w') as f:
|
||||
f.write(d.getVar('STAMP'))
|
||||
try:
|
||||
if bb.data.inherits_class('kernel-yocto', d):
|
||||
# We need to generate the kernel config
|
||||
task = 'do_configure'
|
||||
else:
|
||||
crd.setVar('S', '${WORKDIR}/%s' % os.path.basename(d.getVar('S')))
|
||||
if bb.data.inherits_class('kernel', d):
|
||||
# We don't want to move the source to STAGING_KERNEL_DIR here
|
||||
crd.setVar('STAGING_KERNEL_DIR', '${S}')
|
||||
task = 'do_patch'
|
||||
|
||||
is_kernel_yocto = bb.data.inherits_class('kernel-yocto', d)
|
||||
if not is_kernel_yocto:
|
||||
crd.setVar('PATCHTOOL', 'git')
|
||||
crd.setVar('PATCH_COMMIT_FUNCTIONS', '1')
|
||||
# Run the fetch + unpack tasks
|
||||
res = tinfoil.build_targets(pn,
|
||||
task,
|
||||
handle_events=True)
|
||||
finally:
|
||||
if os.path.exists(preservestampfile):
|
||||
os.remove(preservestampfile)
|
||||
|
||||
# Apply our changes to the datastore to the server's datastore
|
||||
for key in crd.localkeys():
|
||||
tinfoil.config_data.setVar('%s_pn-%s' % (key, pn), crd.getVar(key, False))
|
||||
if not res:
|
||||
raise DevtoolError('Extracting source for %s failed' % pn)
|
||||
|
||||
tinfoil.config_data.setVar('STAMPS_DIR', os.path.join(tempdir, 'stamps'))
|
||||
tinfoil.config_data.setVar('T', os.path.join(tempdir, 'temp'))
|
||||
tinfoil.config_data.setVar('BUILDCFG_FUNCS', '')
|
||||
tinfoil.config_data.setVar('BUILDCFG_HEADER', '')
|
||||
tinfoil.config_data.setVar('BB_HASH_IGNORE_MISMATCH', '1')
|
||||
|
||||
tinfoil.set_event_mask(['bb.event.BuildStarted',
|
||||
'bb.event.BuildCompleted',
|
||||
'logging.LogRecord',
|
||||
'bb.command.CommandCompleted',
|
||||
'bb.command.CommandFailed',
|
||||
'bb.cooker.CookerExit',
|
||||
'bb.build.TaskStarted',
|
||||
'bb.build.TaskSucceeded',
|
||||
'bb.build.TaskFailed',
|
||||
'bb.build.TaskFailedSilent'])
|
||||
|
||||
def runtask(target, task):
|
||||
error = False
|
||||
if tinfoil.build_file(target, task):
|
||||
while True:
|
||||
event = tinfoil.wait_event(0.25)
|
||||
if event:
|
||||
if isinstance(event, bb.command.CommandCompleted):
|
||||
break
|
||||
elif isinstance(event, bb.cooker.CookerExit):
|
||||
# The server is going away, so drop the connection
|
||||
tinfoil.server_connection = None
|
||||
break
|
||||
elif isinstance(event, bb.command.CommandFailed):
|
||||
raise DevtoolError('Task do_%s failed: %s' % (task, event.error))
|
||||
elif isinstance(event, bb.build.TaskFailed):
|
||||
raise DevtoolError('Task do_%s failed' % task)
|
||||
elif isinstance(event, bb.build.TaskStarted):
|
||||
logger.info('Executing %s...' % event._task)
|
||||
elif isinstance(event, logging.LogRecord):
|
||||
if event.levelno <= logging.INFO:
|
||||
continue
|
||||
if event.levelno >= logging.ERROR:
|
||||
error = True
|
||||
logger.handle(event)
|
||||
if error:
|
||||
raise DevtoolError('An error occurred during do_%s, exiting' % task)
|
||||
|
||||
# we need virtual:native:/path/to/recipe if it's a BBCLASSEXTEND
|
||||
fn = tinfoil.get_recipe_file(pn)
|
||||
runtask(fn, 'unpack')
|
||||
|
||||
if bb.data.inherits_class('kernel-yocto', d):
|
||||
# Extra step for kernel to populate the source directory
|
||||
runtask(fn, 'kernel_checkout')
|
||||
|
||||
srcsubdir = crd.getVar('S')
|
||||
|
||||
# Move local source files into separate subdir
|
||||
recipe_patches = [os.path.basename(patch) for patch in
|
||||
oe.recipeutils.get_recipe_patches(crd)]
|
||||
local_files = oe.recipeutils.get_recipe_local_files(crd)
|
||||
|
||||
# Ignore local files with subdir={BP}
|
||||
srcabspath = os.path.abspath(srcsubdir)
|
||||
local_files = [fname for fname in local_files if
|
||||
os.path.exists(os.path.join(workdir, fname)) and
|
||||
(srcabspath == workdir or not
|
||||
os.path.join(workdir, fname).startswith(srcabspath +
|
||||
os.sep))]
|
||||
if local_files:
|
||||
for fname in local_files:
|
||||
_move_file(os.path.join(workdir, fname),
|
||||
os.path.join(tempdir, 'oe-local-files', fname))
|
||||
with open(os.path.join(tempdir, 'oe-local-files', '.gitignore'),
|
||||
'w') as f:
|
||||
f.write('# Ignore local files, by default. Remove this file '
|
||||
'if you want to commit the directory to Git\n*\n')
|
||||
|
||||
if srcsubdir == workdir:
|
||||
# Find non-patch non-local sources that were "unpacked" to srctree
|
||||
# directory
|
||||
src_files = [fname for fname in _ls_tree(workdir) if
|
||||
os.path.basename(fname) not in recipe_patches]
|
||||
# Force separate S so that patch files can be left out from srctree
|
||||
srcsubdir = tempfile.mkdtemp(dir=workdir)
|
||||
tinfoil.config_data.setVar('S_task-patch', srcsubdir)
|
||||
# Move source files to S
|
||||
for path in src_files:
|
||||
_move_file(os.path.join(workdir, path),
|
||||
os.path.join(srcsubdir, path))
|
||||
elif os.path.dirname(srcsubdir) != workdir:
|
||||
# Handle if S is set to a subdirectory of the source
|
||||
srcsubdir = os.path.join(workdir, os.path.relpath(srcsubdir, workdir).split(os.sep)[0])
|
||||
|
||||
scriptutils.git_convert_standalone_clone(srcsubdir)
|
||||
|
||||
# Make sure that srcsubdir exists
|
||||
bb.utils.mkdirhier(srcsubdir)
|
||||
if not os.path.exists(srcsubdir) or not os.listdir(srcsubdir):
|
||||
logger.warning("no source unpacked to S, either the %s recipe "
|
||||
"doesn't use any source or the correct source "
|
||||
"directory could not be determined" % pn)
|
||||
|
||||
setup_git_repo(srcsubdir, crd.getVar('PV'), devbranch, d=d)
|
||||
|
||||
(stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srcsubdir)
|
||||
initial_rev = stdout.rstrip()
|
||||
|
||||
logger.info('Patching...')
|
||||
runtask(fn, 'patch')
|
||||
|
||||
bb.process.run('git tag -f devtool-patched', cwd=srcsubdir)
|
||||
|
||||
kconfig = None
|
||||
if bb.data.inherits_class('kernel-yocto', d):
|
||||
# Store generate and store kernel config
|
||||
logger.info('Generating kernel config')
|
||||
runtask(fn, 'configure')
|
||||
kconfig = os.path.join(crd.getVar('B'), '.config')
|
||||
with open(os.path.join(tempdir, 'initial_rev'), 'r') as f:
|
||||
initial_rev = f.read()
|
||||
|
||||
with open(os.path.join(tempdir, 'srcsubdir'), 'r') as f:
|
||||
srcsubdir = f.read()
|
||||
|
||||
tempdir_localdir = os.path.join(tempdir, 'oe-local-files')
|
||||
srctree_localdir = os.path.join(srctree, 'oe-local-files')
|
||||
@@ -687,11 +600,15 @@ def _extract_source(srctree, keep_temp, devbranch, sync, d, tinfoil):
|
||||
oe.patch.GitApplyTree.gitCommandUserOptions(useroptions, d=d)
|
||||
bb.process.run('git %s commit -a -m "Committing local file symlinks\n\n%s"' % (' '.join(useroptions), oe.patch.GitApplyTree.ignore_commit_prefix), cwd=srctree)
|
||||
|
||||
if kconfig:
|
||||
if is_kernel_yocto:
|
||||
logger.info('Copying kernel config to srctree')
|
||||
shutil.copy2(kconfig, srctree)
|
||||
shutil.copy2(os.path.join(tempdir, '.config'), srctree)
|
||||
|
||||
finally:
|
||||
if appendbackup:
|
||||
shutil.copyfile(appendbackup, appendfile)
|
||||
elif os.path.exists(appendfile):
|
||||
os.remove(appendfile)
|
||||
if keep_temp:
|
||||
logger.info('Preserving temporary directory %s' % tempdir)
|
||||
else:
|
||||
@@ -794,7 +711,7 @@ def modify(args, config, basepath, workspace):
|
||||
initial_rev = None
|
||||
commits = []
|
||||
if not args.no_extract:
|
||||
initial_rev = _extract_source(srctree, args.keep_temp, args.branch, False, rd, tinfoil)
|
||||
initial_rev = _extract_source(srctree, args.keep_temp, args.branch, False, config, rd, tinfoil)
|
||||
if not initial_rev:
|
||||
return 1
|
||||
logger.info('Source tree extracted to %s' % srctree)
|
||||
@@ -1894,7 +1811,7 @@ def register_commands(subparsers, context):
|
||||
parser_extract.add_argument('srctree', help='Path to where to extract the source tree')
|
||||
parser_extract.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout (default "%(default)s")')
|
||||
parser_extract.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)')
|
||||
parser_extract.set_defaults(func=extract, no_workspace=True)
|
||||
parser_extract.set_defaults(func=extract)
|
||||
|
||||
parser_sync = subparsers.add_parser('sync', help='Synchronize the source tree for an existing recipe',
|
||||
description='Synchronize the previously extracted source tree for an existing recipe',
|
||||
|
||||
@@ -418,7 +418,7 @@ def upgrade(args, config, basepath, workspace):
|
||||
|
||||
rf = None
|
||||
try:
|
||||
rev1 = standard._extract_source(srctree, False, 'devtool-orig', False, rd, tinfoil)
|
||||
rev1 = standard._extract_source(srctree, False, 'devtool-orig', False, config, rd, tinfoil)
|
||||
rev2, md5, sha256, srcbranch = _extract_new_source(args.version, srctree, args.no_patch,
|
||||
args.srcrev, args.srcbranch, args.branch, args.keep_temp,
|
||||
tinfoil, rd)
|
||||
|
||||
Reference in New Issue
Block a user