- 16 11月, 2016 1 次提交
-
-
由 Nicolas Pitre 提交于
The "imply" keyword is a weak version of "select" where the target config symbol can still be turned off, avoiding those pitfalls that come with the "select" keyword. This is useful e.g. with multiple drivers that want to indicate their ability to hook into a secondary subsystem while allowing the user to configure that subsystem out without also having to unset these drivers. Currently, the same effect can almost be achieved with: config DRIVER_A tristate config DRIVER_B tristate config DRIVER_C tristate config DRIVER_D tristate [...] config SUBSYSTEM_X tristate default DRIVER_A || DRIVER_B || DRIVER_C || DRIVER_D || [...] This is unwieldy to maintain especially with a large number of drivers. Furthermore, there is no easy way to restrict the choice for SUBSYSTEM_X to y or n, excluding m, when some drivers are built-in. The "select" keyword allows for excluding m, but it excludes n as well. Hence this "imply" keyword. The above becomes: config DRIVER_A tristate imply SUBSYSTEM_X config DRIVER_B tristate imply SUBSYSTEM_X [...] config SUBSYSTEM_X tristate This is much cleaner, and way more flexible than "select". SUBSYSTEM_X can still be configured out, and it can be set as a module when none of the drivers are configured in or all of them are modular. Signed-off-by: NNicolas Pitre <nico@linaro.org> Acked-by: NRichard Cochran <richardcochran@gmail.com> Acked-by: NThomas Gleixner <tglx@linutronix.de> Acked-by: NJohn Stultz <john.stultz@linaro.org> Reviewed-by: NJosh Triplett <josh@joshtriplett.org> Cc: Paul Bolle <pebolle@tiscali.nl> Cc: linux-kbuild@vger.kernel.org Cc: netdev@vger.kernel.org Cc: Michal Marek <mmarek@suse.com> Cc: Edward Cree <ecree@solarflare.com> Link: http://lkml.kernel.org/r/1478841010-28605-2-git-send-email-nicolas.pitre@linaro.orgSigned-off-by: NThomas Gleixner <tglx@linutronix.de>
-
- 11 5月, 2016 1 次提交
-
-
由 Dirk Gouders 提交于
If choices consist of choice_values of type tristate that depend on symbols set to 'm', those choice_values are not set to 'n' if the choice is changed from 'm' to 'y' (in which case only one active choice_value is allowed). Those values are also written to the config file causing modules to be built when they should not. The following config can be used to reproduce and examine the problem; with the frontend of your choice set "Choice 0" and "Choice 1" to 'm', then set "Tristate Choice" to 'y' and save the configuration: config modules boolean modules default y option modules config dependency tristate "Dependency" default m choice prompt "Tristate Choice" default choice0 config choice0 tristate "Choice 0" config choice1 tristate "Choice 1" depends on dependency endchoice This patch sets tristate choice_values' visibility that depend on symbols set to 'm' to 'n' if the corresponding choice is set to 'y'. This makes them disappear from the choice list and will also cause the choice_values' value set to 'n' in sym_calc_value() and as a result they are written as "not set" to the resulting .config file. Reported-by: NSebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: NDirk Gouders <dirk@gouders.net> Tested-by: NSebastian Andrzej Siewior <bigeasy@linutronix.de> Tested-by: NRoger Quadros <rogerq@ti.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 10 5月, 2016 1 次提交
-
-
由 Paul Bolle 提交于
If the .config parser runs into unexpected data it emits warnings like: .config:6911:warning: unexpected data Add the unexpected data itself to this warning. That makes it easier to discover what is actually going wrong: .config:6911:warning: unexpected data: CONFOG_CHARGER_TPS65217=m Signed-off-by: NPaul Bolle <pebolle@tiscali.nl> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 27 4月, 2016 2 次提交
-
-
由 Benjamin Poirier 提交于
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.comSigned-off-by: NBenjamin Poirier <bpoirier@suse.com> Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
-
由 Benjamin Poirier 提交于
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.comSigned-off-by: NBenjamin Poirier <bpoirier@suse.com> Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
-
- 26 4月, 2016 4 次提交
-
-
由 Benjamin Poirier 提交于
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.comSigned-off-by: NBenjamin Poirier <bpoirier@suse.com> Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
-
由 Benjamin Poirier 提交于
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.comSigned-off-by: NBenjamin Poirier <bpoirier@suse.com> Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
-
由 Benjamin Poirier 提交于
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.comSigned-off-by: NBenjamin Poirier <bpoirier@suse.com> Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
-
由 Benjamin Poirier 提交于
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.comTested-by: NLee, Chun-Yi <jlee@suse.com> Signed-off-by: NBenjamin Poirier <bpoirier@suse.com> Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
-
- 01 2月, 2016 2 次提交
-
-
由 Al Viro 提交于
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: NAl Viro <viro@zeniv.linux.org.uk> Fixes: cfa98f2e ("kconfig: do not override symbols already set") Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Jan Beulich 提交于
Documentation/Changes still lists this as the minimal required version, so it ought to remain usable for the time being. Fixes: d2036f30 ("scripts/kconfig/Makefile: Allow KBUILD_DEFCONFIG to be a target") Signed-off-by: NJan Beulich <jbeulich@suse.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 11 1月, 2016 1 次提交
-
-
由 Chris Bainbridge 提交于
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: NChris Bainbridge <chris.bainbridge@gmail.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 05 1月, 2016 1 次提交
-
-
由 Vegard Nossum 提交于
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: 86e187ff ("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: NVegard Nossum <vegard.nossum@oracle.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 10 12月, 2015 1 次提交
-
-
由 Markus Mayer 提交于
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: NMarkus Mayer <mmayer@broadcom.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 03 11月, 2015 2 次提交
-
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> [mmarek: I missed it in the original Qt5 patch set, which caused a crash] Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Thiago Macieira 提交于
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: NThiago Macieira <thiago.macieira@intel.com> Reported-by: NAlexey Brodkin <abrodkin@synopsys.com> Acked-by: NAlexey Brodkin <abrodkin@synopsys.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
- 21 10月, 2015 1 次提交
-
-
由 Michal Sojka 提交于
Fixes: 31847b67 ("kconfig: allow use of relations other than (in)equality") Signed-off-by: NMichal Sojka <sojkam1@fel.cvut.cz> Reviewed-by: NJan Beulich <jbeulich@suse.com> Signed-off-by: NMichal Marek <mmarek@suse.cz>
-
- 15 10月, 2015 1 次提交
-
-
由 Michael Ellerman 提交于
My recent commit d2036f30 ("scripts/kconfig/Makefile: Allow KBUILD_DEFCONFIG to be a target"), contained a bug in that when it checks if KBUILD_DEFCONFIG is a file it forgets to prepend $(srctree) to the path. This causes the build to fail when building out of tree (with O=), and when the value of KBUILD_DEFCONFIG is 'defconfig'. In that case we will fail to find the 'defconfig' file, because we look in the build directory not $(srctree), and so we will call Make again with 'defconfig' as the target. From there we loop infinitely calling 'make defconfig' again and again. The fix is simple, we need to look for the file under $(srctree). Fixes: d2036f30 ("scripts/kconfig/Makefile: Allow KBUILD_DEFCONFIG to be a target") Reported-by: NOlof Johansson <olof@lixom.net> Acked-by: NMichal Marek <mmarek@suse.com> Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
-
- 14 10月, 2015 22 次提交
-
-
由 Gabriel de Perthuis 提交于
merge_config.sh can usefully be applied to a single file. It implicitly merges with the default configuration. Signed-off-by: NGabriel de Perthuis <g2p.code@gmail.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Gabriel de Perthuis 提交于
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: NGabriel de Perthuis <g2p.code@gmail.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Thiago Macieira 提交于
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: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
ConfigItem executes parent->takeChild(0) while ConfigList executes parent->takeTopLevelItem(0) Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-
由 Boris Barbulovski 提交于
Signed-off-by: NBoris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: NThiago Macieira <thiago.macieira@intel.com> Signed-off-by: NMichal Marek <mmarek@suse.com>
-