mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
devtool: ensure recipes devtool is working on are unlocked within the eSDK
Alongside reworking the way devtool extracts source, we now need to
ensure that within the extensible SDK where task signatures are locked,
the signatures of the tasks for the recipes being worked on get unlocked
at the right time or otherwise we'll now get taskhash mismatches when
running devtool modify on a recipe that was included in the eSDK such as
the kernel (due to a separate bug). The existing mechanism for
auto-unlocking recipes was a little weak and was happening too late, so
I've reimplemented it so that:
(a) it gets triggered immediately when the recipe/append is created
(b) we avoid writing to the unlocked signatures file unnecessarily
(since it's a global configuration file) and
(c) within the eSDK configuration we whitelist SIGGEN_UNLOCKED_RECIPES
to avoid unnecessary reparses every time we perform one of the
devtool operations that does need to change this list.
Fixes [YOCTO #11883] (not the underlying cause, but this manifestation
of the issue).
(From OE-Core rev: 4e9a0be32fc30fb87d65da7cd1a4015c99533aff)
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
Richard Purdie
parent
10af6d86b3
commit
3fde63363a
|
|
@ -346,6 +346,9 @@ python copy_buildsystem () {
|
|||
# the sig computed from the metadata.
|
||||
f.write('SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n\n')
|
||||
|
||||
# We want to be able to set this without a full reparse
|
||||
f.write('BB_HASHCONFIG_WHITELIST_append = " SIGGEN_UNLOCKED_RECIPES"\n\n')
|
||||
|
||||
# Set up whitelist for run on install
|
||||
f.write('BB_SETSCENE_ENFORCE_WHITELIST = "%:* *:do_shared_workdir *:do_rm_work wic-tools:* *:do_addto_recipe_sysroot"\n\n')
|
||||
|
||||
|
|
|
|||
|
|
@ -130,25 +130,6 @@ def read_workspace():
|
|||
'recipefile': recipefile}
|
||||
logger.debug('Found recipe %s' % workspace[pn])
|
||||
|
||||
def create_unlockedsigs():
|
||||
""" This function will make unlocked-sigs.inc match the recipes in the
|
||||
workspace. This runs on every run of devtool, but it lets us ensure
|
||||
the unlocked items are in sync with the workspace. """
|
||||
|
||||
confdir = os.path.join(basepath, 'conf')
|
||||
unlockedsigs = os.path.join(confdir, 'unlocked-sigs.inc')
|
||||
bb.utils.mkdirhier(confdir)
|
||||
with open(os.path.join(confdir, 'unlocked-sigs.inc'), 'w') as f:
|
||||
f.write("# DO NOT MODIFY! YOUR CHANGES WILL BE LOST.\n" +
|
||||
"# This layer was created by the OpenEmbedded devtool" +
|
||||
" utility in order to\n" +
|
||||
"# contain recipes that are unlocked.\n")
|
||||
|
||||
f.write('SIGGEN_UNLOCKED_RECIPES += "\\\n')
|
||||
for pn in workspace:
|
||||
f.write(' ' + pn)
|
||||
f.write('"')
|
||||
|
||||
def create_workspace(args, config, basepath, workspace):
|
||||
if args.layerpath:
|
||||
workspacedir = os.path.abspath(args.layerpath)
|
||||
|
|
@ -332,7 +313,6 @@ def main():
|
|||
|
||||
if not getattr(args, 'no_workspace', False):
|
||||
read_workspace()
|
||||
create_unlockedsigs()
|
||||
|
||||
try:
|
||||
ret = args.func(args, config, basepath, workspace)
|
||||
|
|
|
|||
|
|
@ -297,3 +297,43 @@ def replace_from_file(path, old, new):
|
|||
except ValueError:
|
||||
pass
|
||||
write_file(path, "\n".join(new_contents))
|
||||
|
||||
|
||||
def update_unlockedsigs(basepath, workspace, fixed_setup, extra=None):
|
||||
""" This function will make unlocked-sigs.inc match the recipes in the
|
||||
workspace plus any extras we want unlocked. """
|
||||
|
||||
if not fixed_setup:
|
||||
# Only need to write this out within the eSDK
|
||||
return
|
||||
|
||||
if not extra:
|
||||
extra = []
|
||||
|
||||
confdir = os.path.join(basepath, 'conf')
|
||||
unlockedsigs = os.path.join(confdir, 'unlocked-sigs.inc')
|
||||
|
||||
# Get current unlocked list if any
|
||||
values = {}
|
||||
def get_unlockedsigs_varfunc(varname, origvalue, op, newlines):
|
||||
values[varname] = origvalue
|
||||
return origvalue, None, 0, True
|
||||
if os.path.exists(unlockedsigs):
|
||||
with open(unlockedsigs, 'r') as f:
|
||||
bb.utils.edit_metadata(f, ['SIGGEN_UNLOCKED_RECIPES'], get_unlockedsigs_varfunc)
|
||||
unlocked = sorted(values.get('SIGGEN_UNLOCKED_RECIPES', []))
|
||||
|
||||
# If the new list is different to the current list, write it out
|
||||
newunlocked = sorted(list(workspace.keys()) + extra)
|
||||
if unlocked != newunlocked:
|
||||
bb.utils.mkdirhier(confdir)
|
||||
with open(unlockedsigs, 'w') as f:
|
||||
f.write("# DO NOT MODIFY! YOUR CHANGES WILL BE LOST.\n" +
|
||||
"# This layer was created by the OpenEmbedded devtool" +
|
||||
" utility in order to\n" +
|
||||
"# contain recipes that are unlocked.\n")
|
||||
|
||||
f.write('SIGGEN_UNLOCKED_RECIPES += "\\\n')
|
||||
for pn in newunlocked:
|
||||
f.write(' ' + pn)
|
||||
f.write('"')
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import errno
|
|||
import glob
|
||||
import filecmp
|
||||
from collections import OrderedDict
|
||||
from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, DevtoolError
|
||||
from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, update_unlockedsigs, DevtoolError
|
||||
from devtool import parse_recipe
|
||||
|
||||
logger = logging.getLogger('devtool')
|
||||
|
|
@ -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, config, rd, tinfoil)
|
||||
initial_rev = _extract_source(srctree, args.keep_temp, args.branch, False, config, basepath, workspace, args.fixed_setup, 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, config, rd, tinfoil)
|
||||
initial_rev = _extract_source(srctree, args.keep_temp, args.branch, True, config, basepath, workspace, args.fixed_setup, rd, tinfoil)
|
||||
logger.info('Source tree %s synchronized' % srctree)
|
||||
|
||||
if initial_rev:
|
||||
|
|
@ -442,7 +442,7 @@ def sync(args, config, basepath, workspace):
|
|||
tinfoil.shutdown()
|
||||
|
||||
|
||||
def _extract_source(srctree, keep_temp, devbranch, sync, config, d, tinfoil):
|
||||
def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, workspace, fixed_setup, d, tinfoil):
|
||||
"""Extract sources of a recipe"""
|
||||
import oe.recipeutils
|
||||
import oe.patch
|
||||
|
|
@ -711,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, config, rd, tinfoil)
|
||||
initial_rev = _extract_source(srctree, args.keep_temp, args.branch, False, config, basepath, workspace, args.fixed_setup, rd, tinfoil)
|
||||
if not initial_rev:
|
||||
return 1
|
||||
logger.info('Source tree extracted to %s' % srctree)
|
||||
|
|
@ -773,6 +773,8 @@ def modify(args, config, basepath, workspace):
|
|||
for commit in commits:
|
||||
f.write('# commit: %s\n' % commit)
|
||||
|
||||
update_unlockedsigs(basepath, workspace, args.fixed_setup, [pn])
|
||||
|
||||
_add_md5(config, pn, appendfile)
|
||||
|
||||
logger.info('Recipe %s now set up to build from %s' % (pn, srctree))
|
||||
|
|
@ -1802,7 +1804,7 @@ def register_commands(subparsers, context):
|
|||
group.add_argument('--no-same-dir', help='Force build in a separate build directory', action="store_true")
|
||||
parser_modify.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout (when not using -n/--no-extract) (default "%(default)s")')
|
||||
parser_modify.add_argument('--keep-temp', help='Keep temporary directory (for debugging)', action="store_true")
|
||||
parser_modify.set_defaults(func=modify)
|
||||
parser_modify.set_defaults(func=modify, fixed_setup=context.fixed_setup)
|
||||
|
||||
parser_extract = subparsers.add_parser('extract', help='Extract the source for an existing recipe',
|
||||
description='Extracts the source for an existing recipe',
|
||||
|
|
@ -1811,7 +1813,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)
|
||||
parser_extract.set_defaults(func=extract, fixed_setup=context.fixed_setup)
|
||||
|
||||
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',
|
||||
|
|
@ -1821,7 +1823,7 @@ def register_commands(subparsers, context):
|
|||
parser_sync.add_argument('srctree', help='Path to the source tree')
|
||||
parser_sync.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout')
|
||||
parser_sync.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)')
|
||||
parser_sync.set_defaults(func=sync)
|
||||
parser_sync.set_defaults(func=sync, fixed_setup=context.fixed_setup)
|
||||
|
||||
parser_rename = subparsers.add_parser('rename', help='Rename a recipe file in the workspace',
|
||||
description='Renames the recipe file for a recipe in the workspace, changing the name or version part or both, ensuring that all references within the workspace are updated at the same time. Only works when the recipe file itself is in the workspace, e.g. after devtool add. Particularly useful when devtool add did not automatically determine the correct name.',
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ sys.path = sys.path + [devtool_path]
|
|||
|
||||
import oe.recipeutils
|
||||
from devtool import standard
|
||||
from devtool import exec_build_env_command, setup_tinfoil, DevtoolError, parse_recipe, use_external_build
|
||||
from devtool import exec_build_env_command, setup_tinfoil, DevtoolError, parse_recipe, use_external_build, update_unlockedsigs
|
||||
|
||||
logger = logging.getLogger('devtool')
|
||||
|
||||
|
|
@ -418,7 +418,7 @@ def upgrade(args, config, basepath, workspace):
|
|||
|
||||
rf = None
|
||||
try:
|
||||
rev1 = standard._extract_source(srctree, False, 'devtool-orig', False, config, rd, tinfoil)
|
||||
rev1 = standard._extract_source(srctree, False, 'devtool-orig', False, config, basepath, workspace, args.fixed_setup, 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)
|
||||
|
|
@ -432,6 +432,9 @@ def upgrade(args, config, basepath, workspace):
|
|||
af = _write_append(rf, srctree, args.same_dir, args.no_same_dir, rev2,
|
||||
copied, config.workspace_path, rd)
|
||||
standard._add_md5(config, pn, af)
|
||||
|
||||
update_unlockedsigs(basepath, workspace, [pn], args.fixed_setup)
|
||||
|
||||
logger.info('Upgraded source extracted to %s' % srctree)
|
||||
logger.info('New recipe is %s' % rf)
|
||||
finally:
|
||||
|
|
@ -457,4 +460,4 @@ def register_commands(subparsers, context):
|
|||
group.add_argument('--same-dir', '-s', help='Build in same directory as source', action="store_true")
|
||||
group.add_argument('--no-same-dir', help='Force build in a separate build directory', action="store_true")
|
||||
parser_upgrade.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)')
|
||||
parser_upgrade.set_defaults(func=upgrade)
|
||||
parser_upgrade.set_defaults(func=upgrade, fixed_setup=context.fixed_setup)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user