@@ -5,7 +5,7 @@ Example usage: \
1. bitbake-config-build enable-fragment core/yocto/devtool-ide-sdk \
bitbake-config-build enable-fragment core/yocto/root-login-with-empty-password \
2. The recipe (my-recipe in this case) must be in IMAGE_INSTALL. \
- 3. Devtool modify --debug-build my-recipe \
+ 3. Devtool modify --debug-optimize my-recipe \
4. devtool ide-sdk my-recipe core-image-full-cmdline --target root@192.168.7.2' \
5. runqemu snapshot \
6. code $BUILDDIR/workspace/sources/my-recipe \
@@ -2590,7 +2590,7 @@ class DevtoolIdeSdkTests(DevtoolBase):
self.track_for_cleanup(tempdir)
self.add_command_to_tearDown('bitbake -c clean %s' % recipe_name)
- result = runCmd('devtool modify %s -x %s --debug-build' % (recipe_name, tempdir), output_log=self._cmd_logger)
+ result = runCmd('devtool modify %s -x %s --debug-optimize' % (recipe_name, tempdir), output_log=self._cmd_logger)
self.assertExists(os.path.join(tempdir, build_file),
'Extracted source could not be found')
self.assertExists(os.path.join(self.workspacedir, 'conf',
@@ -398,7 +398,7 @@ class RecipeModified:
self.bitbakepath = None
self.bpn = None
self.d = None
- self.debug_build = None
+ self.debug_optimize = None
self.reverse_debug_prefix_map = {}
self.fakerootcmd = None
self.fakerootenv = None
@@ -469,7 +469,7 @@ class RecipeModified:
self.bpn = recipe_d.getVar('BPN')
self.cxx = recipe_d.getVar('CXX')
self.d = recipe_d.getVar('D')
- self.debug_build = recipe_d.getVar('DEBUG_BUILD')
+ self.debug_optimize = recipe_d.getVar('DEBUG_OPTIMIZE')
self.fakerootcmd = recipe_d.getVar('FAKEROOTCMD')
self.fakerootenv = recipe_d.getVar('FAKEROOTENV')
self.libdir = recipe_d.getVar('libdir')
@@ -1178,11 +1178,11 @@ def ide_setup(args, config, basepath, workspace):
ide.setup_modified_recipe(
args, recipe_image, recipe_modified)
- if recipe_modified.debug_build != '1':
+ if recipe_modified.debug_optimize != '1':
logger.warn(
'Recipe %s is compiled with release build configuration. '
- 'You might want to add DEBUG_BUILD = "1" to %s. '
- 'Note that devtool modify --debug-build can do this automatically.',
+ 'You might want to add DEBUG_OPTIMIZE = "1" to %s. '
+ 'Note that devtool modify --debug-optimize can do this automatically.',
recipe_modified.name, recipe_modified.bbappend)
else:
raise DevtoolError("Must not end up here.")
@@ -970,9 +970,9 @@ def modify(args, config, basepath, workspace):
if branch == args.branch:
continue
f.write('# patches_%s: %s\n' % (branch, ','.join(branch_patches[branch])))
- if args.debug_build:
+ if args.debug_optimize:
f.write('\n# Optimize for debugging. Use e.g. -Og instead of -O2\n')
- f.write('DEBUG_BUILD = "1"\n')
+ f.write('DEBUG_OPTIMIZE = "1"\n')
f.write('\n# Keep the paths to the source files for remote debugging\n')
f.write('# DEBUG_PREFIX_MAP = ""\n')
f.write('# WARN_QA:remove = "buildpaths"\n')
@@ -2325,7 +2325,7 @@ def register_commands(subparsers, context):
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('--no-overrides', '-O', action="store_true", help='Do not create branches for other override configurations')
parser_modify.add_argument('--keep-temp', help='Keep temporary directory (for debugging)', action="store_true")
- parser_modify.add_argument('--debug-build', action="store_true", help='Add DEBUG_BUILD = "1" to the modified recipe')
+ parser_modify.add_argument('--debug-optimize', action="store_true", help='Add DEBUG_OPTIMIZE = "1" to the modified recipe')
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',
Due to we rework debug friendly optimization, rename DEBUG_BUILD to DEBUG_OPTIMIZE. Then: - s/DEBUG_BUILD/DEBUG_OPTIMIZE/g - s/debug-build/debug-optimize/g - s/debug_build/debug_optimize/g Note, for specific recipe, we do not use OE_FRAGMENTS += "core/yocto/debug-optimize" in recipe Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- meta/conf/fragments/yocto/devtool-ide-sdk.conf | 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- scripts/lib/devtool/ide_sdk.py | 10 +++++----- scripts/lib/devtool/standard.py | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-)