From c15e4c9f17cd0bf6bfcc7c18a5f034d360d670ac Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 26 Aug 2015 17:13:46 +0300 Subject: [PATCH] devtool: run kernel dependencies The kernel package needs "kern-tools-native" in order for it's do_kernel_metadata. Thus, devtool extract for kernel in a pristine environment fails. With the current bb.tinfoil implementation it is not possible to run arbitrary bitbake commands - e.g. run "bitbake kern-tools-native -c populate_sysroot" in our case. This patch implements an ugly workaround for that problem, basically by hardcoding this dependency and running the required bitbake task(s) before tinfoil is initialized. [YOCTO #6658] Signed-off-by: Markus Lehtonen --- scripts/lib/devtool/standard.py | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 3725d87..7456fc8 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -197,7 +197,7 @@ def extract(args, config, basepath, workspace): """Entry point for the devtool 'extract' subcommand""" import bb - tinfoil = setup_tinfoil() + tinfoil = _prep_extract_operation(config, basepath, args.recipename) rd = _parse_recipe(config, tinfoil, args.recipename, True) if not rd: @@ -237,6 +237,24 @@ class BbTaskExecutor(object): self.executed.append(func) +def _prep_extract_operation(config, basepath, recipename): + """HACK: Ugly workaround for making sure that requirements are met when + trying to extract a package. Returns the tinfoil instance to be used.""" + tinfoil = setup_tinfoil() + rd = _parse_recipe(config, tinfoil, recipename, True) + + if bb.data.inherits_class('kernel-yocto', rd): + tinfoil.shutdown() + try: + stdout, _ = exec_build_env_command(config.init_path, basepath, + 'bitbake kern-tools-native') + tinfoil = setup_tinfoil() + except bb.process.ExecutionError as err: + raise DevtoolError("Failed to build kern-tools-native:\n%s" % + err.stdout) + return tinfoil + + def _extract_source(srctree, keep_temp, devbranch, d): """Extract sources of a recipe""" import bb.event @@ -422,8 +440,10 @@ def modify(args, config, basepath, workspace): raise DevtoolError("directory %s does not exist or not a directory " "(specify -x to extract source from recipe)" % args.srctree) - - tinfoil = setup_tinfoil() + if args.extract: + tinfoil = _prep_extract_operation(config, basepath, args.recipename) + else: + tinfoil = setup_tinfoil() rd = _parse_recipe(config, tinfoil, args.recipename, True) if not rd: -- 2.1.4