summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paulg@kernel.org>2025-10-02 12:09:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-10-04 15:16:03 +0100
commitbb1b005780c41a545fa08e2a5703b97b87ade0a7 (patch)
treed6dee57bf10ecd17b922c0f0c1a98b3b6410ba49
parent6c422e911f41ec865ba235100443aa15566f76af (diff)
downloadpoky-bb1b005780c41a545fa08e2a5703b97b87ade0a7.tar.gz
bitbake: bitbake-setup: clarify that default answer to prompts is no
It is common practice to put the default choice in upper case for yes/no interactive prompts, so that when people just hit enter, they know what they are getting. An example that linux users are probably familiar with is "sensors-detect" from the "lm-sensors" package. Unify all the prompts to be the same and indicate that the default answer from hitting enter is a no with an upper case N. No functional changes. (Bitbake rev: c7b1a34a25a386426218d63d2aeba0e7c6ecf5b0) Signed-off-by: Paul Gortmaker <paulg@kernel.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/bitbake-setup6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/bin/bitbake-setup b/bitbake/bin/bitbake-setup
index de83d780bf..bb466d85b4 100755
--- a/bitbake/bin/bitbake-setup
+++ b/bitbake/bin/bitbake-setup
@@ -418,7 +418,7 @@ def init_config(settings, args, d):
418 418
419 print("Initializing a build in\n {}".format(builddir)) 419 print("Initializing a build in\n {}".format(builddir))
420 if not args.non_interactive: 420 if not args.non_interactive:
421 y_or_n = input('Continue? y/n: ') 421 y_or_n = input('Continue? (y/N): ')
422 if y_or_n != 'y': 422 if y_or_n != 'y':
423 exit() 423 exit()
424 print() 424 print()
@@ -623,7 +623,7 @@ def write_settings(top_dir, force_replace, non_interactive=True):
623 print('A new settings file will be created in\n {}\n'.format(settings_path)) 623 print('A new settings file will be created in\n {}\n'.format(settings_path))
624 print('A common site.conf file will be created, please edit or replace before running builds\n {}\n'.format(siteconfpath)) 624 print('A common site.conf file will be created, please edit or replace before running builds\n {}\n'.format(siteconfpath))
625 if not non_interactive: 625 if not non_interactive:
626 y_or_n = input('Bitbake-setup will be configured with the above settings in {}, y/n: '.format(top_dir)) 626 y_or_n = input('Bitbake-setup will be configured with the above settings in {}, (y/N): '.format(top_dir))
627 if y_or_n != 'y': 627 if y_or_n != 'y':
628 print("\nYou can run 'bitbake-setup install-settings' to edit them before setting up builds") 628 print("\nYou can run 'bitbake-setup install-settings' to edit them before setting up builds")
629 exit() 629 exit()
@@ -669,7 +669,7 @@ def write_global_settings(settings_path, force_replace, non_interactive=True):
669 print('Top directory prefix (where all top level directories are created) set to\n {}\n'.format(settings['default']['top-dir-prefix'])) 669 print('Top directory prefix (where all top level directories are created) set to\n {}\n'.format(settings['default']['top-dir-prefix']))
670 print('Top directory name (this is added to the top directory prefix to form a top directory where builds are set up) set to\n {}\n'.format(settings['default']['top-dir-name'])) 670 print('Top directory name (this is added to the top directory prefix to form a top directory where builds are set up) set to\n {}\n'.format(settings['default']['top-dir-name']))
671 if not non_interactive: 671 if not non_interactive:
672 y_or_n = input('Write out the global settings as specified above (y/n)? ') 672 y_or_n = input('Write out the global settings as specified above (y/N)? ')
673 if y_or_n != 'y': 673 if y_or_n != 'y':
674 print("\nYou can run 'bitbake-setup install-global-settings' to edit them before setting up builds") 674 print("\nYou can run 'bitbake-setup install-global-settings' to edit them before setting up builds")
675 exit() 675 exit()