summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
Commit message (Collapse)AuthorAgeFilesLines
* menuconfig: print more info for symbol without promptsWengmeiling2013-04-301-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When we search a config symbol, if it has no prompt the position of this symbol in the Kconfig file and it's dependencies are not printed. This can be inconvenient, especially when it's set to n and we want to find out why. the following is an example: before: Symbol: GENERIC_SMP_IDLE_THREAD [=y] Type : boolean Selected by: X86 [=y] after: Symbol: GENERIC_SMP_IDLE_THREAD [=y] Type : boolean Defined at arch/Kconfig:213 Selected by: X86 [=y] Signed-off-by: Weng Meiling <wengmeiling.weng@huawei.com> Signed-off-by: Libo Chen <libo.chen@huawei.com> Cc: Michal Marek <mmarek@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* localmodconfig: Process source kconfig files as they are foundSteven Rostedt2013-04-291-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bug was reported that caused localmodconfig to not keep all the dependencies of ATH9K. This was caused by the kconfig file: In drivers/net/wireless/ath/Kconfig: --- if ATH_CARDS config ATH_DEBUG bool "Atheros wireless debugging" ---help--- Say Y, if you want to debug atheros wireless drivers. Right now only ath9k makes use of this. source "drivers/net/wireless/ath/ath5k/Kconfig" source "drivers/net/wireless/ath/ath9k/Kconfig" source "drivers/net/wireless/ath/carl9170/Kconfig" source "drivers/net/wireless/ath/ath6kl/Kconfig" source "drivers/net/wireless/ath/ar5523/Kconfig" source "drivers/net/wireless/ath/wil6210/Kconfig" endif --- The current way kconfig works, it processes new source files after the first file is completed. It creates an array of new source config files and when the one file is finished, it continues with the next file. Unfortunately, this means that it loses the fact that the source file is within an "if" statement, and this means that each of these source file's configs will not have the proper dependencies set. As ATH9K requires ATH_CARDS set, the localmodconfig did not see that dependency, and did not enable ATH_CARDS. When the oldconfig was run, it forced ATH9K to be disabled. Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1304291022320.9234@oneiric Cc: stable@vger.kernel.org # 3.8+ Reported-by: Robert P. J. Day <rpjday@crashcourse.ca> Tested-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* localmodconfig: Add debug prints for dependencies of module configsSteven Rostedt2013-04-291-0/+9
| | | | | | | | | | | | When a config for a module is added to the list to save in the final config file, add a print to show what dependencies are used. This is useful to debug when a config is disabled by the make oldconfig after localmodconfig is finished. This print only appears if the environment variable LOCALMODCONFIG_DEBUG is defined. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* Merge branch 'kbuild/rc-fixes' into kbuild/kconfigMichal Marek2013-02-256-15/+106
|\ | | | | | | | | There is one kconfig fix in the rc-fixes branch that I forgot to submit for 3.8, so let's add it to the kconfig branch for 3.9-rc1.
| * kconfig:lxdialog: remove duplicate codeWang YanQing2012-12-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | dialog.h has two line the same below: extern char dialog_input_result[]; This patch remove one of them. Signed-off-by: Wang YanQing <udknight@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
| * menuconfig: Replace CIRCLEQ by list_head-style lists.Benjamin Poirier2012-10-255-14/+106
| | | | | | | | | | | | | | | | | | | | | | | | sys/queue.h and CIRCLEQ in particular have proven to cause portability problems (reported on Debian Sarge, Cygwin and FreeBSD) Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Benjamin Poirier <bpoirier@suse.de> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | kbuild: Fix missing '\n' for NEW symbols in yes "" | make oldconfig >conf.newBen Hutchings2013-02-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to Documentation/kbuild/kconfig.txt, the commands: yes "" | make oldconfig >conf.new grep "(NEW)" conf.new should list the new config symbols with their default values. However, currently there is no line break after each new symbol. When kconfig is interactive the user will type a new-line at this point, but when non-interactive kconfig must print it. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Reference: http://bugs.debian.org/636029 [regid23@nt1.in: Adjusted Ben's work to apply cleanly to this tree] Reported-and-tested-by: Regid Ichira <regid23@nt1.in> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | kconfig: nconf: rewrite labels of function keys lineRoland Eggner2013-02-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | >From: Roland Eggner <edvx1@systemanalysen.net> More reasonable labels of function keys line. Rename labels and keep menu width, as required for fitting on COLUMNS=80 terminals: • s/Insts/Help 2/ • s/Config/ShowAll/ Signed-off-by: Roland Eggner <edvx1@systemanalysen.net> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* | kconfig: nconf: rewrite help textsRoland Eggner2013-02-091-164/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | >From: Roland Eggner <edvx1@systemanalysen.net> Rewrite all help texts. During several years lazy (incomplete) updates have left behind a rather thick layer of dust. Intentions: (1) Global help called by <F1> should document all _currently_ implemented keybindings. (2) Different help texts called by <F3> resp. <F8><F1> should be consistent with (1) and with implementation: • on plain menu entry • in radiolist window • in input windows for text, decimal or hexadecimal values • in filename selection windows <F6> <F7> • SymSearch specific help called by <F8> followed by <F1> (3) More reasonable window titles: Rename window title s/README/Global help/ Rename variable s/nconf_readme/nconf_global_help/ Rename window title s/Instructions/Short help/ (4) Consider which hints are most useful for first-time-users. Signed-off-by: Roland Eggner <edvx1@systemanalysen.net> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> [yann.morin.1998@free.fr: a few additional fixes] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* | kconfig: fix a compiliation error when using make xconfigTiana Rakotovao Andriamahefa2013-01-301-0/+1
| | | | | | | | | | | | | | | | | | When using make xconfig, the following compilation error appears : /usr/include/qt3/qvaluelist.h:427:13: error: ‘ptrdiff_t’ does not name a type Including stddef.h in scripts/kconfig/qconf.cc permits to avoid this error. Signed-off-by: Tiana Rakotovao Andriamahefa <rkmahefa@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | nconf: function keys line, change background color for better readabilityRoland Eggner2013-01-241-1/+1
| | | | | | | | | | | | | | | | | | • In function keys line descriptions black on darkblue are almost impossible to read. Change colors to black on brown. Signed-off-by: Roland Eggner <edvx1@systemanalysen.net> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* | menuconfig: Get rid of the top-level entries for "Load an Alternate/Save an ↵Wang YanQing2013-01-161-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Alternate" Now we have Load/Save buttons to do the Load/Save in the convenient place, so we can drop the top-level entries. Signed-off-by: Wang YanQing <udknight@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* | menuconfig: Add Save/Load buttonsWang YanQing2013-01-162-14/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If menuconfig have Save/Load button like alternative .config editors, xconfig, nconfig, etc.We will have a obvious benefit when use menuconfig just like when we use others, we can Save/Load our .config quickly and conveniently. This patch add the Save/Load button for menuconfig. [remove trailing space while at it for below line: "*) Formerly when I used Page Down and Page Up, the cursor would be set" ] Changes: V1-V2: 1:use PATH_MAX instead of hard code suggested by Yann E. MORIN 2:drop the spurious empty-line removal suggested by Yann E. MORIN V2-V3: 1:ajust buttons position well centered reported by Yann E. MORIN Signed-off-by: Wang YanQing <udknight@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* | menuconfig:inputbox: support navigate input positionWang YanQing2012-12-251-29/+92
| | | | | | | | | | | | | | | | | | This patch add support navigate input position *inside* the input field with LEFT/RIGHT, so it is possible to modify the text in place. Signed-off-by: Wang YanQing <udknight@gmail.com> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* | scripts/kconfig: ensure we use proper CONFIG_ prefixYann E. MORIN2012-12-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | Now that we get the CONFIG_ prefix from the environment, we must ensure we use the proper prefix in case the user has it set in the environment. Simply unexport CONFIG_ to fallback to our hard-coded default. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | merge_config.sh: Add option to specify output dirZhangfei Gao2012-12-091-4/+16
| | | | | | | | | | | | | | | | | | | | | | Provide a -O option to specify dir to put generated .config Then merge_config.sh does not need to be copied to target dir, for easy re-usage in other script Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org> Tested-by: Jon Medhurst (Tixy) <tixy@linaro.org> Acked-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | kconfig: Regenerate lexerMichal Marek2012-11-201-4/+4
| | | | | | | | | | | | | | Apply changes from commit 177acf78 (kconfig: Fix malloc handling in conf tools) to the _shipped file. Signed-off-by: Michal Marek <mmarek@suse.cz>
* | kconfig: Fix malloc handling in conf toolsAlan Cox2012-11-206-19/+40
| | | | | | | | | | | | | | (and get them out of the noise in the audit work) Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | kconfig: get CONFIG_ prefix from the environmentYann E. MORIN2012-11-203-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Currently, the CONFIG_ prefix is hard-coded in the kconfig frontends executables. This means that two projects that use kconfig with different prefixes can not share the same kconfig frontends. Instead of hard-coding the prefix in the frontends, get it from the environment, and revert back to hard-coded value if not found. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | kconfig: add a function to get the CONFIG_ prefixYann E. MORIN2012-11-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we get the CONFIG_ prefix via the CONFIG_ macro, which means the CONFIG_ prefix is hard-coded at compile time. This goes against having a run-time defined CONFIG_ prefix. Add a function that returns the CONFIG_ prefix to use (but keep the current hard-coded behavior, to be changed in a later patch). To avoid touching all the code that uses the CONFIG_ macro, we just undef it, and define it to be a call to the function. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | kconfig: remove CONFIG_ from string constantsYann E. MORIN2012-11-202-4/+17
| | | | | | | | | | | | | | | | | | | | | | Having the CONFIG_ prefix in string constants gets in the way of using a run-time-defined CONFIG_ prefix. Fix that by using temp growable strings (gstr) in which we printf the text. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | menuconfig: fix extended colors ncurses supportKrzysztof Mazur2012-11-201-0/+1
|/ | | | | | | | | | | | | | | | | The ncurses library allows for extended colors. The support for extended colors support depends on wide-character support. ncurses headers enable extended colors (NCURSES_EXT_COLORS) only when wide-character support is enabled (NCURSES_WIDECHAR). The "make menuconfig" uses wide-character ncursesw library, which can be compiled with wide-character support, but does not define NCURSES_WIDECHAR and it's using headers without wide-character (and extended colors) support. This fixes problems with colors on systems with enabled extended colors (like PLD Linux). Without this patch "make menuconfig" is hard to use. Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net> Signed-off-by: Michal Marek <mmarek@suse.cz>
* Merge branch 'kconfig' of ↵Linus Torvalds2012-10-1210-130/+289
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 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.
| * kconfig: replace 'oldnoconfig' with 'olddefconfig', and keep the old name as ↵Adam Lee2012-09-272-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an alias As 67d34a6a391369269a2e5dba8a5f42cc4cd50231 said, 'oldnoconfig' doesn't set new symbols to 'n', but instead sets it to their default values. So, this patch replaces 'oldnoconfig' with 'olddefconfig', stop making people confused, and keep the old name 'oldnoconfig' as an alias, because people already are dependent on its behavior with the counter-intuitive name. Signed-off-by: Adam Lee <adam8157@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * menuconfig: Assign jump keys per-page instead of globallyBenjamin Poirier2012-09-276-73/+149
| | | | | | | | | | | | | | | | | | At the moment, keys 1-9 are assigned to the first 9 search results. This patch makes them assigned to the first 9 results per-page instead. We are much less likely to run out of keys that way. Signed-off-by: Benjamin Poirier <bpoirier@suse.de> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * menuconfig: Do not open code textbox scroll up/downBenjamin Poirier2012-09-271-44/+11
| | | | | | | | | | | | | | | | | | | | | | | | We don't need to explicitely use ncurses' scroll(). ncurses performs vertical-motion optimization at wrefresh() time. Using strace I confirmed that with the following patch curses still sends only the new line of text to the terminal when scrolling up/down one line at a time. Signed-off-by: Benjamin Poirier <bpoirier@suse.de> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * menuconfig: Add jump keys to search resultsBenjamin Poirier2012-09-275-35/+94
| | | | | | | | | | | | | | | | | | | | | | makes it possible to jump directly to the menu for a configuration entry after having searched for it with '/'. If this menu is not currently accessible we jump to the nearest accessible parent instead. After exiting this menu, the user is returned to the search results where he may jump further in or elsewhere. Signed-off-by: Benjamin Poirier <bpoirier@suse.de> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * menuconfig: Extend dialog_textbox so that it can return to a scrolled positionBenjamin Poirier2012-09-273-6/+28
| | | | | | | | | | | | | | | | We can now display other UI elements (menus) "on top" of a textbox and then seemingly come back to it in the same state it was left. Signed-off-by: Benjamin Poirier <bpoirier@suse.de> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * menuconfig: Extend dialog_textbox so that it can exit on arbitrary keypressesBenjamin Poirier2012-09-273-13/+33
| | | | | | | | | | | | | | | | The caller will be able to perform actions based on hotkeys in the displayed text. Signed-off-by: Benjamin Poirier <bpoirier@suse.de> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * menuconfig: Remove superfluous conditionnalBenjamin Poirier2012-09-271-5/+3
| | | | | | | | | | | | | | | | | | Because end_reached is set to 0 before the loop, the test "!end_reached" is always true and can be removed. This structure was perhaps copied from the similar one in back_lines(). Signed-off-by: Benjamin Poirier <bpoirier@suse.de> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * kconfig: document oldnoconfig to what it really does in conf.cAdam Lee2012-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As 67d34a6a391369269a2e5dba8a5f42cc4cd50231 said, the make target 'oldnoconfig' is a misnomer. It doesn't set new symbols to 'n', but instead sets it to their default values. This patch fixes the document in conf.c, and will submit another patch to replace 'oldnoconfig' to 'olddefconfig' Signed-off-by: Adam Lee <adam8157@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * kconfig/mconf.c: revision of curses initialization.Dirk Gouders2012-08-303-4/+8
| | | | | | | | | | | | | | | | | | | | Since commit d0e1e09568 initscr() is called twice in mconf. Do it only in init_dialog() in util.c and there also save the cursor position for the signal handler in mconf.c. Signed-off-by: Dirk Gouders <gouders@et.bocholt.fh-gelsenkirchen.de> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | Merge branch 'rc-fixes' of ↵Linus Torvalds2012-10-082-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild Pull kbuild fixes from Michal Marek: "Here are two fixes I intended to send after v3.6-rc7, but failed to do so. So please pull them for v3.7-rc1 and they will be picked up by stable. The first one fixes gcc -x <language> syntax in various build-time tests, which icecream and possible other gcc wrappers did not understand (and yes, icecream is going to be fixed as well). The second one fixes make tar-pkg so that unpacking the tarball does not replace the /lib -> /usr/lib symlink on recent Fedora releases." * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: Fix gcc -x syntax kbuild: Do not package /boot and /lib in make tar-pkg
| * | kbuild: Fix gcc -x syntaxJean Delvare2012-10-032-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct syntax for gcc -x is "gcc -x assembler", not "gcc -xassembler". Even though the latter happens to work, the former is what is documented in the manual page and thus what gcc wrappers such as icecream do expect. This isn't a cosmetic change. The missing space prevents icecream from recognizing compilation tasks it can't handle, leading to silent kernel miscompilations. Besides me, credits go to Michael Matz and Dirk Mueller for investigating the miscompilation issue and tracking it down to this incorrect -x parameter syntax. Signed-off-by: Jean Delvare <jdelvare@suse.de> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: stable@vger.kernel.org Cc: Bernhard Walle <bernhard@bwalle.de> Cc: Michal Marek <mmarek@suse.cz> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | localmodconfig: Fix localyesconfig to set to 'y' not 'm'Yuta Ando2012-10-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kbuild target 'localyesconfig' has been same as 'localmodconfig' since the commit 50bce3e "kconfig/streamline_config.pl: merge local{mod,yes}config". The commit expects this script generates different configure depending on target, but it was not yet implemented. So I added code that sets to 'yes' when target is 'localyesconfig'. Link: http://lkml.kernel.org/r/1349101470-12243-1-git-send-email-yuta.and@gmail.com Cc: stable@vger.kernel.org # v3.2 Cc: linux-kbuild@vger.kernel.org Signed-off-by: Yuta Ando <yuta.and@gmail.com> Signed-off-by: Steven Rostedt <rostedt@rostedt.homelinux.com>
* | localmodconfig: Use my variable for loop in streamline_config.plBill Pemberton2012-08-161-1/+1
| | | | | | | | | | | | | | | | perlcritic complains about $kconfig being reused in the foreach loop at the end of read_kconfig. Change it to a my variable. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* | localmodconfig: Use 3 parameter open in streamline_config.plBill Pemberton2012-08-161-16/+14
| | | | | | | | | | | | | | | | Convert remaining open calls to use the perl's preferred 3 parameter open. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* | localmodconfig: Rework find_config in streamline_config.plBill Pemberton2012-08-161-8/+6
| | | | | | | | | | | | | | | | | | Change find_config function to read_config. It now finds the config, reads the config into an array, and returns the array. This makes it a little cleaner and changes the open to use perl's 3 option open. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* | localmodconfig: Set default value for ksource in streamline_config.plBill Pemberton2012-08-161-1/+1
|/ | | | | | | | | | Running streamline_config.pl as it's shown it in the comment header, you will get a warning about $ksource being uninitialized. This is because $ksource is set to ARGV[0], but the examples don't require any arguments. Fix by setting ksource to . if no ARGV[0] is given. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* Merge tag 'localmodconfig-v3.6' of ↵Linus Torvalds2012-07-301-17/+158
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig Pull localmodconfig updates from Steven Rostedt: "Improve localmodconfig to remove even more unused module configs. These changes drastically improve the amount of module configs removed from a config file. It also adds some debug that I can have users easily enable if things do not work for them." * tag 'localmodconfig-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig: localmodconfig: Add debug environment variable LOCALMODCONFIG_DEBUG localmodconfig: Check if configs are already set for selects localmodconfig: Read in orig config file to avoid extra processing localmodconfig: Comments and cleanup for streamline_config.pl
| * localmodconfig: Add debug environment variable LOCALMODCONFIG_DEBUGSteven Rostedt2012-06-191-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | If the environment variable LOCALMODCONFIG_DEBUG is set, then debug output will appear in the make localmodconfig. This will simplify debugging what people get with their output, as I can just tell people to do: LOCALMODCONFIG_DEBUG=1 make localmodconfig 2>out.txt and have them send me the out.txt. I'll be able to see why things are not working as they think it should be. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| * localmodconfig: Check if configs are already set for selectsSteven Rostedt2012-06-191-11/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some cases that a required module does not have a prompt and needs to have another module enabled that selects it to be set. As localmodconfig is conservative and tries to make the minimum config without breaking the user's kernel, or keeping the user from using devices that were loaded when the lsmod was done, all modules that select this module will also be enabled. If you needed module A, but module A did not have a prompt but needed module B to be selected, localmodconfig would make sure B was still enabled. If not only B selected A, but C, D, E, F, and G also selected A, then all of those would also be included, as well as the modules they depend on. This ballooned the number of configs that localmodconfig would keep. The fix here is to process the depends first, and then record those configs that did not have a prompt and needed to be selected. After the depends are done, check what configs are needed to select the configs in the list, and if a config that selects it is already set, then we don't need to do anything else. If no config that selects the config is set, then just pick one and try again. This change brought down the number of selected modules from 290 to 67! Both before and after were run against a config that had 3095 modules enabled. Tested-by: John David Yost <johnyost@ptd.net> # AlleyTrotter Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| * localmodconfig: Read in orig config file to avoid extra processingSteven Rostedt2012-06-191-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read in the entire config file. If there's a config that we depend on that happens to be in the core set (not a module) then we do not need to process it as a module. Currently, we follow the entire depend and selects even if they are enabled as core and not modules. By checking to make sure that we only look at modules we can drop the count a little. From one of my tests, localmodconfig went from taking 3095 set modules down to 356 before this patch, and down to 290 modules after the change. Tested-by: John David Yost <johnyost@ptd.net> # AlleyTrotter Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| * localmodconfig: Comments and cleanup for streamline_config.plSteven Rostedt2012-06-191-4/+9
| | | | | | | | | | | | | | | | | | Added some more comments and cleaned up part of the the code to use a named variable instead of one of the special $1 perl variables. No functional changes. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* | kconfig: Document oldnoconfig to what it really doesSteven Rostedt2012-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The make target 'oldnoconfig' is a misnomer. It doesn't set new symbols to 'n', but instead sets it to their default values. Unfortunately, assuming that it actually did this, broke ktest in some of its tests. For example, the tests to create a minimum config and even a config bisect, depends on removing various configs and using oldnoconfig to get rid of other configs that may have depended on it. But because some configs that it was trying to disable, were in fact default enabled, this caused those configs to re-enable and corrupt the test. I thought about fixing oldnoconfig, but I'm afraid that people are already dependent on its current behavior. Instead, I'm just updating the documentation to state that it sets the new symbols to their default values and not to 'n'. Ideally, this would be called, 'olddefconfig' and we have an 'oldnoconfig' that actually disables the new symbols. But it's useless for me now. If it changed, ktest would need to be consistent between each version, and that would be to difficult to detect. I'll handle this issue with ktest with other means. Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | nconf: add u, d command keys in scroll windowsBenjamin Poirier2012-07-262-6/+8
| | | | | | | | | | | | | | | | | | They function just like they do in less(1). Also correct some discrepancy between the help text and the code wrt function keys. Signed-off-by: Benjamin Poirier <bpoirier@suse.de> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | menuconfig: add u, d, q command keys in text boxesBenjamin Poirier2012-07-262-3/+6
| | | | | | | | | | | | | | They function just like they do in less(1). Signed-off-by: Benjamin Poirier <bpoirier@suse.de> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | kconfig: Print errors to stderr in the MakefileMichal Marek2012-07-131-14/+14
| | | | | | | | Signed-off-by: Michal Marek <mmarek@suse.cz>
* | kconfig: allow long lines in config fileCody Schafer2012-07-131-2/+59
| | | | | | | | | | | | | | | | | | | | | | For some config options (CONFIG_EXTRA_FIRMWARE, for example), the length of a config file line can exceed the 1024 byte buffer. Switch from fgets to compat_getline to fix. compat_getline is an internally implimented getline work-alike for portability purposes. Signed-off-by: Cody Schafer <cody@linux.vnet.ibm.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | kconfig: remove lkc_defs.h from .gitignore and dontdiffPaul Bolle2012-07-131-1/+0
| | | | | | | | | | | | | | | | | | Commit 5a6f8d2bd9e3392569ed6f29ea4d7210652f929b ("kconfig: nuke LKC_DIRECT_LINK cruft") removed all traces of lkc_defs.h from the tree. Remove its entries in dontdiff and kconfig's .gitignore file too. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Michal Marek <mmarek@suse.cz>
OpenPOWER on IntegriCloud