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 <[email protected]> --- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- scripts/lib/devtool/ide_sdk.py | 10 +++++----- scripts/lib/devtool/standard.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index cf5ac6e9d7..fc7f119063 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -2563,7 +2563,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)) + result = runCmd('devtool modify %s -x %s --debug-optimize' % (recipe_name, tempdir)) self.assertExists(os.path.join(tempdir, build_file), 'Extracted source could not be found') self.assertExists(os.path.join(self.workspacedir, 'conf', diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py index 87a4c13ec5..06e2a6f9d8 100755 --- a/scripts/lib/devtool/ide_sdk.py +++ b/scripts/lib/devtool/ide_sdk.py @@ -289,7 +289,7 @@ class RecipeModified: self.bitbakepath = None self.bpn = None self.d = None - self.debug_build = None + self.debug_optimize = None self.fakerootcmd = None self.fakerootenv = None self.libdir = None @@ -351,7 +351,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') @@ -917,11 +917,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.") diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 1fd5947c41..a7685401e9 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -970,8 +970,8 @@ 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: - f.write('\nDEBUG_BUILD = "1"\n') + if args.debug_optimize: + f.write('\nDEBUG_OPTIMIZE = "1"\n') update_unlockedsigs(basepath, workspace, args.fixed_setup, [pn]) @@ -2320,7 +2320,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', -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#228880): https://lists.openembedded.org/g/openembedded-core/message/228880 Mute This Topic: https://lists.openembedded.org/mt/117101124/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
