summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2025-10-27 15:16:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-11-03 17:43:31 +0000
commit18c39854ef6bc70d2bd456bf4dd778873617e92a (patch)
treeb354974335e7adb43dd6fd743507654ae630d983
parent1effe323573881d167442d20fe9792c5cf79a575 (diff)
downloadpoky-18c39854ef6bc70d2bd456bf4dd778873617e92a.tar.gz
bitbake: bitbake-setup: correctly define --global argument for settings management
--global was defined twice (for settings command as a whole, and specifically for set/unset sub-commands), which caused 'settings --global set ...' to be allowed, and at the same time not have any effect. 'settings set --global' is the only valid form after this change. (Bitbake rev: 2f14cf68f6c653b6da90180a99a22c58855b0cef) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Tested-by: Antonin Godard <antonin.godard@bootlin.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/bitbake-setup2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake-setup b/bitbake/bin/bitbake-setup
index 38bb8099fd..a0426005ff 100755
--- a/bitbake/bin/bitbake-setup
+++ b/bitbake/bin/bitbake-setup
@@ -785,7 +785,7 @@ def main():
785 parser_settings_arg_global = argparse.ArgumentParser(add_help=False) 785 parser_settings_arg_global = argparse.ArgumentParser(add_help=False)
786 parser_settings_arg_global.add_argument('--global', action='store_true', help="Modify the setting in a global settings file, rather than one specific to a top directory") 786 parser_settings_arg_global.add_argument('--global', action='store_true', help="Modify the setting in a global settings file, rather than one specific to a top directory")
787 787
788 parser_settings = subparsers.add_parser('settings', parents=[parser_settings_arg_global], 788 parser_settings = subparsers.add_parser('settings',
789 help='List current settings, or set or unset a setting in a settings file (e.g. the default prefix and name of the top directory, the location of build configuration registry, downloads directory and other settings specific to a top directory)') 789 help='List current settings, or set or unset a setting in a settings file (e.g. the default prefix and name of the top directory, the location of build configuration registry, downloads directory and other settings specific to a top directory)')
790 parser_settings.set_defaults(func=settings_func) 790 parser_settings.set_defaults(func=settings_func)
791 791