summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
Commit message (Collapse)AuthorAgeFilesLines
* localmodconfig: Fix whitespace repeat count after "tristate"Benjamin Poirier2016-04-271-1/+1
| | | | | | | | | | | | | | | | | Also recognize standalone "prompt". Before this patch we incorrectly identified some symbols as not having a prompt and potentially needing to be selected by something else. Note that this patch could theoretically change the resulting .config, causing it to have fewer symbols turned on. However, given the current set of Kconfig files, this situation does not occur because the symbols newly added to %prompts are absent from %selects. Link: http://lkml.kernel.org/r/1461696998-3953-1-git-send-email-bpoirier@suse.com Signed-off-by: Benjamin Poirier <bpoirier@suse.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* localmodconfig: Reset certificate pathsBenjamin Poirier2016-04-261-0/+34
| | | | | | | | | | | | | | | | | When using `make localmodconfig` and friends, if the input config comes from a kernel that was built in a different environment (for example, the canonical case of using localmodconfig to trim a distribution kernel config) the key files for module signature checking will not be available and should be regenerated or omitted. Otherwise, the user will be faced with annoying errors when trying to build with the generated .config: make[1]: *** No rule to make target 'keyring.crt', needed by 'certs/x509_certificate_list'. Stop. Makefile:1576: recipe for target 'certs/' failed Link: http://lkml.kernel.org/r/1461696721-3001-1-git-send-email-bpoirier@suse.com Signed-off-by: Benjamin Poirier <bpoirier@suse.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* localmodconfig: Add missing $ to reference a variableBenjamin Poirier2016-04-261-1/+1
| | | | | | | | | | | | | That is clearly what the original intention was. This does not change the output .config but it prevents some useless processing. ! eq "m" is changed to the simpler eq "y"; symbols with values other than m|y are not included in %orig_configs. Link: http://lkml.kernel.org/r/1460333193-16361-3-git-send-email-bpoirier@suse.com Signed-off-by: Benjamin Poirier <bpoirier@suse.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* localmodconfig: Fix parsing of "help" textBenjamin Poirier2016-04-261-1/+1
| | | | | | | | | | | | | Help text may start with "help" or "---help---". This patch fixes read_kconfig() to recognize the second variant. This removes useless junk from %depends and %selects. That junk is due to help text that contains the words "selects" and "depends". Link: http://lkml.kernel.org/r/1460333193-16361-2-git-send-email-bpoirier@suse.com Signed-off-by: Benjamin Poirier <bpoirier@suse.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* localmodconfig: Recognize more keywords that end a menu entryBenjamin Poirier2016-04-261-2/+2
| | | | | | | | | | | | Based on the list in Documentation/kbuild/kconfig-language.txt This removes junk from %depends because parsing of a menu entry spilled over to another menu entry. Link: http://lkml.kernel.org/r/1460333193-16361-1-git-send-email-bpoirier@suse.com Signed-off-by: Benjamin Poirier <bpoirier@suse.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* localmodconfig: Fix parsing of Kconfig "source" statementsBenjamin Poirier2016-04-261-1/+1
| | | | | | | | | | | | | | The parameter of Kconfig "source" statements does not need to be quoted. The current regex causes many kconfig files to be skipped and hence, dependencies to be missed. Also fix the whitespace repeat count. Link: http://lkml.kernel.org/r/1459619722-13695-1-git-send-email-bpoirier@suse.com Tested-by: Lee, Chun-Yi <jlee@suse.com> Signed-off-by: Benjamin Poirier <bpoirier@suse.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
* unbreak allmodconfig KCONFIG_ALLCONFIG=...Al Viro2016-02-011-5/+7
| | | | | | | | | | | | | | | | | | | | Prior to 3.13 make allmodconfig KCONFIG_ALLCONFIG=/dev/null used to be equivalent to make allmodconfig; these days it hardwires MODULES to n. In fact, any KCONFIG_ALLCONFIG that doesn't set MODULES explicitly is treated as if it set it to n. Regression had been introduced by commit cfa98f ("kconfig: do not override symbols already set"); what happens is that conf_read_simple() does sym_calc_value(modules_sym) on exit, which leaves SYMBOL_VALID set and has conf_set_all_new_symbols() skip modules_sym. It's pretty easy to fix - simply move that call of sym_calc_value() into the callers, except for the ones in KCONFIG_ALLCONFIG handling. Objections? Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Fixes: cfa98f2e0ae9 ("kconfig: do not override symbols already set") Signed-off-by: Michal Marek <mmarek@suse.com>
* scripts/kconfig: allow building with make 3.80 againJan Beulich2016-02-011-1/+3
| | | | | | | | | | Documentation/Changes still lists this as the minimal required version, so it ought to remain usable for the time being. Fixes: d2036f30cf ("scripts/kconfig/Makefile: Allow KBUILD_DEFCONFIG to be a target") Signed-off-by: Jan Beulich <jbeulich@suse.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Michal Marek <mmarek@suse.com>
* kconfig: fix qconf segfault by deleting heap objectsChris Bainbridge2016-01-111-0/+2
| | | | | | | | | | On Debian stable (qt-4.8.6) 'make xconfig' intermittently fails due to qconf segfaulting at exit time in QXcbEventReader. The cause of this is destructors on the heap objects never being called, so fix this by properly deleting the heap objects before exit. Signed-off-by: Chris Bainbridge <chris.bainbridge@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.com>
* kconfig: return 'false' instead of 'no' in bool functionVegard Nossum2016-01-051-1/+1
| | | | | | | | | | | | | | menu_is_visible() is a bool function and should use boolean return values. "no" is a tristate value which happens to also have a value of 0, but we should nevertheless use the right symbol for it. This is a very minor cleanup with no semantic change. Fixes: 86e187ff9 ("kconfig: add an option to determine a menu's visibility") Cc: Arnaud Lacombe <lacombar@gmail.com> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com> Signed-off-by: Michal Marek <mmarek@suse.com>
* kconfig: allow kconfig to handle longer path namesMarkus Mayer2015-12-101-3/+4
| | | | | | | | | | | The current (arbitrary) limit of 128 characters for path names has proven too short for Android builds, as longer path names are used there. Change conf.c, so it can handle path lengths up to PATH_MAX characters. Signed-off-by: Markus Mayer <mmayer@broadcom.com> Signed-off-by: Michal Marek <mmarek@suse.com>
* Merge branch 'kconfig' of ↵Linus Torvalds2015-11-116-436/+480
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild Pull kconfig updates from Michal Marek: - 'make xconfig' ported to Qt5, dropping support for Qt3 - merge_config.sh supports a single-input-file mode and also respects $KCONFIG_CONFIG - Fix for incorrect display of >= and > in dependency expressions * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: (44 commits) Add current selection check. Use pkg-config to find Qt 4 and 5 instead of direct qmake kconfig: Fix copy&paste error kconfig/merge_config.sh: Accept a single file kconfig/merge_config.sh: Support KCONFIG_CONFIG Update the buildsystem for KConfig finding Qt Port xconfig to Qt5 - Update copyright. Port xconfig to Qt5 - Fix goParent issue. Port xconfig to Qt5 - on Back clicked, deselect old item. Port xconfig to Qt5 - Add(back) one click checkbox toggle. Port xconfig to Qt5 - Add(back) lineedit editing. Port xconfig to Qt5 - Remove some commented code. Port xconfig to Qt5 - Source format. Port xconfig to Qt5 - Add horizontal scrollbar, and scroll per pixel. Port xconfig to Qt5 - Change ConfigItem constructor parent type. Port xconfig to Qt5 - Disable ConfigList soring Port xconfig to Qt5 - Remove ConfigList::updateMenuList template. Port xconfig to Qt5 - Add ConfigList::mode to initializer list. Port xconfig to Qt5 - Add ConfigItem::nextItem to initializer list. Port xconfig to Qt5 - Tree widget set column titles. ...
| * Add current selection check.Boris Barbulovski2015-11-021-0/+7
| | | | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> [mmarek: I missed it in the original Qt5 patch set, which caused a crash] Signed-off-by: Michal Marek <mmarek@suse.com>
| * Use pkg-config to find Qt 4 and 5 instead of direct qmakeThiago Macieira2015-11-021-24/+13Star
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt Project recommendation is that there should always be a "qmake" binary and it should never be renamed. If it's necessary to handle multiple Qt versions, the Qt Project recommends using qtchooser. Unfortunately, some distros do not follow the recommendation, so we would need to check qmake-qt4, qmake-qt5, etc. So, instead, let's try pkg-config. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Reported-by: Alexey Brodkin <abrodkin@synopsys.com> Acked-by: Alexey Brodkin <abrodkin@synopsys.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * kconfig: Fix copy&paste errorMichal Sojka2015-10-201-1/+1
| | | | | | | | | | | | | | Fixes: 31847b67bec0 ("kconfig: allow use of relations other than (in)equality") Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz> Reviewed-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * kconfig/merge_config.sh: Accept a single fileGabriel de Perthuis2015-10-141-1/+1
| | | | | | | | | | | | | | | | merge_config.sh can usefully be applied to a single file. It implicitly merges with the default configuration. Signed-off-by: Gabriel de Perthuis <g2p.code@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * kconfig/merge_config.sh: Support KCONFIG_CONFIGGabriel de Perthuis2015-10-141-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All make targets support $KCONFIG_CONFIG because they run scripts/kconf. Make sure merge_config.sh accesses the correct file in all cases. Previously this script broke in two different code paths, one for targets like kvmconfig (which use merge_config.sh -m then call a target that respects KCONFIG_CONFIG) and one for direct use of the script without -m, which called make rules that edit KCONFIG_CONFIG but verified a different file. Signed-off-by: Gabriel de Perthuis <g2p.code@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Update the buildsystem for KConfig finding QtThiago Macieira2015-10-141-45/+28Star
| | | | | | | | | | | | | | | | | | | | | | | | The buildsystem will now only search for Qt 4 and Qt 5. Support for Qt 2 and 3 was dropped in the previous commits (Qt 3 was EOL'ed in 2010 or so...). For Qt 5, to be future-proof with the future direction notice appearing in the 5.5 release, C++11 support is automatically enabled. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Update copyright.Boris Barbulovski2015-10-141-1/+3
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Fix goParent issue.Boris Barbulovski2015-10-141-1/+1
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - on Back clicked, deselect old item.Boris Barbulovski2015-10-141-1/+3
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Add(back) one click checkbox toggle.Boris Barbulovski2015-10-141-1/+17
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Add(back) lineedit editing.Boris Barbulovski2015-10-141-0/+1
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Remove some commented code.Boris Barbulovski2015-10-141-4/+0Star
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Source format.Boris Barbulovski2015-10-141-3/+3
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Add horizontal scrollbar, and scroll per pixel.Boris Barbulovski2015-10-141-0/+5
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Change ConfigItem constructor parent type.Boris Barbulovski2015-10-141-2/+2
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Disable ConfigList soringBoris Barbulovski2015-10-141-1/+1
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Remove ConfigList::updateMenuList template.Boris Barbulovski2015-10-142-4/+73
| | | | | | | | | | | | | | | | | | | | | | | | ConfigItem executes parent->takeChild(0) while ConfigList executes parent->takeTopLevelItem(0) Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Add ConfigList::mode to initializer list.Boris Barbulovski2015-10-141-1/+1
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Add ConfigItem::nextItem to initializer list.Boris Barbulovski2015-10-141-3/+3
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Tree widget set column titles.Boris Barbulovski2015-10-141-0/+2
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Quick workaround to bypass app crash at startup.Boris Barbulovski2015-10-141-3/+0Star
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Set ConfigView object name.Boris Barbulovski2015-10-141-0/+1
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Use correct signal names.Boris Barbulovski2015-10-141-2/+2
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Remove Qt3Support from Makefile.Boris Barbulovski2015-10-141-2/+2
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Put back some of the old implementation(part 2).Boris Barbulovski2015-10-142-26/+807
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Put back some of the old implementation.Boris Barbulovski2015-10-142-18/+216
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Introduce Qt4/5 version of ConfigList and ConfigItemBoris Barbulovski2015-10-142-9/+63
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - update signalsBoris Barbulovski2015-10-141-36/+15Star
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Fix the code so it compiles with Qt5Boris Barbulovski2015-10-142-100/+108
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Remove custom ListView classes.Boris Barbulovski2015-10-142-1066/+15Star
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Make single/split/full actions checkable.Boris Barbulovski2015-10-142-3/+30
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Update QAction checkableBoris Barbulovski2015-10-141-22/+22
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Fix layout margin.Boris Barbulovski2015-10-141-0/+1
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Fix layoutBoris Barbulovski2015-10-141-0/+5
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Replace Q3VBox with QWidgetBoris Barbulovski2015-10-142-3/+2Star
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Remove unused #include <q3dragobject.h>Boris Barbulovski2015-10-141-1/+0Star
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Use QMenuBoris Barbulovski2015-10-142-11/+11
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
| * Port xconfig to Qt5 - Use QTextBrowserBoris Barbulovski2015-10-142-10/+10
| | | | | | | | | | | | Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-06 00:40:15 +0200