Instead of calling devtool deploy-target which starts a bitbake server
to get some variables the previous refactoring allows to generate a
simple script which does no longer depend on variables from bitbake.
This is much faster.
---
scripts/lib/devtool/ide.py | 115 ++++++++++++++++++-------------------
1 file changed, 55 insertions(+), 60 deletions(-)
diff --git a/scripts/lib/devtool/ide.py b/scripts/lib/devtool/ide.py
index 7c7040232c4..9c724509d48 100755
--- a/scripts/lib/devtool/ide.py
+++ b/scripts/lib/devtool/ide.py
@@ -9,6 +9,7 @@
import os
import stat
+import sys
import logging
import json
import re
@@ -360,15 +361,19 @@ class RecipeModified:
self.bbappend = None
# recipe variables from d.getVar
self.b = None
+ self.base_libdir = None
self.bpn = None
self.d = None
self.fakerootcmd = None
self.fakerootenv = None
+ self.libdir = None
+ self.max_process = None
self.package_arch = None
self.path = None
self.recipe_sysroot = None
self.recipe_sysroot_native = None
self.staging_incdir = None
+ self.strip_cmd = None
self.target_arch = None
self.workdir = None
# replicate bitbake build environment
@@ -387,11 +392,6 @@ class RecipeModified:
self.meson_cross_file = None
# vscode
self.dot_code_dir = None
- # TODO: remove calling devtool
- self.bb_env_passthrough_additions = None
- self.bbpath = None
- self.bitbakepath = None
- self.topdir = None
def initialize(self, config, workspace, tinfoil):
recipe_d = parse_recipe(
@@ -413,10 +413,14 @@ class RecipeModified:
shutil.rmtree(self.temp_dir)
self.b = recipe_d.getVar('B')
+ self.base_libdir = recipe_d.getVar('base_libdir')
self.bpn = recipe_d.getVar('BPN')
self.d = recipe_d.getVar('D')
self.fakerootcmd = recipe_d.getVar('FAKEROOTCMD')
self.fakerootenv = recipe_d.getVar('FAKEROOTENV')
+ self.libdir = recipe_d.getVar('libdir'),
+ self.max_process = int(recipe_d.getVar(
+ "BB_NUMBER_THREADS") or os.cpu_count() or 1)
self.package_arch = recipe_d.getVar('PACKAGE_ARCH')
self.path = recipe_d.getVar('PATH')
self.recipe_sysroot = os.path.realpath(
@@ -425,15 +429,10 @@ class RecipeModified:
recipe_d.getVar('RECIPE_SYSROOT_NATIVE'))
self.staging_incdir = os.path.realpath(
recipe_d.getVar('STAGING_INCDIR'))
+ self.strip_cmd = recipe_d.getVar('STRIP')
self.target_arch = recipe_d.getVar('TARGET_ARCH')
self.workdir = os.path.realpath(recipe_d.getVar('WORKDIR'))
- self.bb_env_passthrough_additions = recipe_d.getVar(
- 'BB_ENV_PASSTHROUGH_ADDITIONS')
- self.bbpath = recipe_d.getVar('BBPATH')
- self.bitbakepath = recipe_d.getVar('BITBAKEPATH')
- self.topdir = recipe_d.getVar('TOPDIR')
-
self.__init_exported_variables(recipe_d)
if bb.data.inherits_class('cmake', recipe_d):
@@ -971,6 +970,38 @@ class RecipeModified:
cmd_lines.append(install_cmd)
return self.write_script(cmd_lines, 'bb_run_do_install')
+ def gen_deploy_target_script(self, args):
+ """Generate a quicker (works without tinfoil) variant of devtool
target-deploy"""
+ cmd_lines = ['#!/usr/bin/env python3']
+ cmd_lines.append('import sys')
+ cmd_lines.append('devtool_sys_path = %s' % str(sys.path))
+ cmd_lines.append('devtool_sys_path.reverse()')
+ cmd_lines.append('for p in devtool_sys_path:')
+ cmd_lines.append(' if p not in sys.path:')
+ cmd_lines.append(' sys.path.insert(0, p)')
+ cmd_lines.append('from devtool.deploy import deploy_cached')
+ args_filter = ['debug', 'dry_run', 'key', 'no_check_space',
'no_host_check',
+ 'no_preserve', 'port', 'recipename', 'show_status',
'ssh_exec', 'strip', 'target']
+ filtered_args_dict = {key: value for key, value in vars(
+ args).items() if key in args_filter}
+ cmd_lines.append('filtered_args_dict = %s' % str(filtered_args_dict))
+ cmd_lines.append('class Dict2Class(object):')
+ cmd_lines.append(' def __init__(self, my_dict):')
+ cmd_lines.append(' for key in my_dict:')
+ cmd_lines.append(' setattr(self, key, my_dict[key])')
+ cmd_lines.append('filtered_args = Dict2Class(filtered_args_dict)')
+ cmd_lines.append('deploy_cached("%s", "%s", "%s", "%s", "%s", "%s",
%d, "%s", "%s", filtered_args)' %
+ (self.d, self.workdir, self.path, self.strip_cmd,
+ self.libdir, self.base_libdir, self.max_process,
+ self.fakerootcmd, self.fakerootenv))
+ return self.write_script(cmd_lines, 'deploy_target')
+
+ def gen_install_deploy_script(self, args):
+ cmd_lines = ['#!/bin/sh']
+ cmd_lines.append(self.gen_fakeroot_install_script())
+ cmd_lines.append(self.gen_deploy_target_script(args))
+ return self.write_script(cmd_lines, 'install_and_deploy')
+
def write_script(self, cmd_lines, script_name):
bb.utils.mkdirhier(self.temp_dir)
script_file = os.path.join(self.temp_dir, script_name)
@@ -981,61 +1012,15 @@ class RecipeModified:
return script_file
def vscode_tasks(self, args, gdb_cross):
- run_do_install = self.gen_fakeroot_install_script()
- pythonpath_new = os.path.realpath(
- os.path.join(self.bitbakepath, '../lib'))
- try:
- pythonpath = os.environ['PYTONPATH'].split(':')
- if pythonpath_new not in pythonpath:
- pythonpath = pythonpath_new + ":" + pythonpath
- except KeyError:
- pythonpath = pythonpath_new
- install_label = "do_install %s" % self.bpn
- deploy_label = "devtool deploy-target %s" % self.bpn
- bb_env = {
- # "BBPATH": self.bbpath,
- "PYTHONPATH": pythonpath,
- "BUILDDIR": self.topdir,
- # Use e.g. Python from host, not python-native
- "PATH": os.environ['PATH'],
- "BB_ENV_PASSTHROUGH_ADDITIONS": self.bb_env_passthrough_additions
- }
- bb_options = {
- "cwd": self.topdir
- }
+ run_install_deploy = self.gen_install_deploy_script(args)
tasks_dict = {
"version": "2.0.0",
"tasks": [
{
- "label": install_label,
- "type": "shell",
- "command": run_do_install,
- "problemMatcher": []
- },
- {
- "label": deploy_label,
+ "label": "install && deploy-target %s" % self.bpn,
"type": "shell",
- "command": "devtool", # TODO: Generate a self contained
script which does what devtool target-deploy does but without connection to the
bitbake server
- "args": ["--bbpath", self.bbpath, "deploy-target",
self.bpn, args.target, "--strip", "--no-host-check"],
- "linux": {
- "options": {
- "env": bb_env
- }},
- "options": bb_options,
+ "command": run_install_deploy,
"problemMatcher": []
- },
- {
- "label": "install && deploy-target %s" % self.bpn,
- "dependsOrder": "sequence",
- "dependsOn": [
- install_label,
- deploy_label
- ],
- "problemMatcher": [],
- "group": {
- "kind": "build",
- "isDefault": True
- }
}
]
}
@@ -1183,6 +1168,16 @@ def register_commands(subparsers, context):
'--skip-bitbake', help='Generate IDE configuration but skip calling
bibtake to update the SDK.', action='store_true')
parser_ide.add_argument(
'-k', '--bitbake-k', help='Pass -k parameter to bitbake',
action='store_true')
+ parser_ide.add_argument(
+ '--no-strip', help='Do not strip executables prior to deploy',
dest='strip', action='store_false')
+ parser_ide.add_argument(
+ '-n', '--dry-run', help='List files to be undeployed only',
action='store_true')
+ parser_ide.add_argument(
+ '-s', '--show-status', help='Show progress/status output',
action='store_true')
+ parser_ide.add_argument(
+ '-p', '--no-preserve', help='Do not preserve existing files',
action='store_true')
+ parser_ide.add_argument(
+ '--no-check-space', help='Do not check for available space before
deploying', action='store_true')
parser_ide.add_argument(
'--debug-build-config', help='Use debug build flags, for example set
CMAKE_BUILD_TYPE=Debug', action='store_true')
parser_ide.set_defaults(func=ide_setup)
--
2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#186738):
https://lists.openembedded.org/g/openembedded-core/message/186738
Mute This Topic: https://lists.openembedded.org/mt/100965624/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
