GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 17:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Browse source 
Pull kconfig changes from Michal Marek:
 "kconfig in v3.7 is going to
   - initialize ncurses only once in menuconfig
   - be able to jump to a search result in menuconfig
   - change the misnomer oldnoconfig to a more meaningful name
     olddefconfig, keeping the old name as alias"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: replace 'oldnoconfig' with 'olddefconfig', and keep the old name as an alias
  menuconfig: Assign jump keys per-page instead of globally
  menuconfig: Do not open code textbox scroll up/down
  menuconfig: Add jump keys to search results
  menuconfig: Extend dialog_textbox so that it can return to a scrolled position
  menuconfig: Extend dialog_textbox so that it can exit on arbitrary keypresses
  menuconfig: Remove superfluous conditionnal
  kconfig: document oldnoconfig to what it really does in conf.c
  kconfig/mconf.c: revision of curses initialization.
This commit is contained in:
Linus Torvalds 2012-10-12 10:28:52 +09:00
commit 35e9a274fd
11 changed files with 296 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tools/testing/ktest/ktest.pl
View file

@ -1873,10 +1873,10 @@ sub make_oldconfig {
apply_min_config;
}
if (!run_command "$make oldnoconfig") {
# Perhaps oldnoconfig doesn't exist in this version of the kernel
if (!run_command "$make olddefconfig") {
# Perhaps olddefconfig doesn't exist in this version of the kernel
# try a yes '' | oldconfig
doprint "oldnoconfig failed, trying yes '' | make oldconfig\n";
doprint "olddefconfig failed, trying yes '' | make oldconfig\n";
run_command "yes '' | $make oldconfig" or
dodie "failed make config oldconfig";
}
@ -1929,7 +1929,7 @@ sub build {
# old config can ask questions
if ($type eq "oldconfig") {
$type = "oldnoconfig";
$type = "olddefconfig";
# allow for empty configs
run_command "touch $output_config";
@ -1959,7 +1959,7 @@ sub build {
load_force_config($minconfig);
}
if ($type ne "oldnoconfig") {
if ($type ne "olddefconfig") {
run_command "$make $type" or
dodie "failed make config";
}
@ -2458,8 +2458,7 @@ my %config_set;
# config_off holds the set of configs that the bad config had disabled.
# We need to record them and set them in the .config when running
# oldnoconfig, because oldnoconfig does not turn off new symbols, but
# instead just keeps the defaults.
# olddefconfig, because olddefconfig keeps the defaults.
my %config_off;
# config_off_tmp holds a set of configs to turn off for now
@ -3250,7 +3249,7 @@ sub test_this_config {
}
# Remove this config from the list of configs
# do a make oldnoconfig and then read the resulting
# do a make olddefconfig and then read the resulting
# .config to make sure it is missing the config that
# we had before
my %configs = %min_configs;