From: Dirk Gouders <dirk@gouders.net>
To: Michal Marek <mmarek@suse.cz>
Cc: kbuild-all@01.org, Roger Quadros <rogerq@ti.com>,
Ruslan Bilovol <ruslan.bilovol@gmail.com>,
Bin Liu <binmlist@gmail.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
linux-kbuild@vger.kernel.org,
USB list <linux-usb@vger.kernel.org>,
Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH v5] kconfig/symbol.c: handle choice_values that depend on 'm' symbols
Date: Fri, 29 Apr 2016 10:24:52 +0200 [thread overview]
Message-ID: <ghinz04yaz.fsf@lena.gouders.net> (raw)
In-Reply-To: <201604201924.7peNMcCF%fengguang.wu@intel.com> (kbuild test robot's message of "Wed, 20 Apr 2016 19:04:42 +0800")
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: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Dirk Gouders <dirk@gouders.net>
Tested-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
v5: This patch should handle tristate choice-values, only.
I assumed that only tristate choice-values can have visibility 'm',
which was wrong: tristate dependencies can result in 'm'
visibility.
So, add an explicit test if a symbol is of type tristate.
I am a bit unsure how to handle Tested-By credits when patches change
substantially and left the credits untouched but new test reports
are welcome.
---
scripts/kconfig/symbol.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 25cf0c2..2432298 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -209,12 +209,26 @@ static void sym_set_all_changed(void)
static void sym_calc_visibility(struct symbol *sym)
{
struct property *prop;
+ struct symbol *choice_sym = NULL;
tristate tri;
/* any prompt visible? */
tri = no;
+
+ if (sym_is_choice_value(sym))
+ choice_sym = prop_get_symbol(sym_get_choice_prop(sym));
+
for_all_prompts(sym, prop) {
prop->visible.tri = expr_calc_value(prop->visible.expr);
+ /*
+ * Tristate choice_values with visibility 'mod' are
+ * not visible if the corresponding choice's value is
+ * 'yes'.
+ */
+ if (choice_sym && sym->type == S_TRISTATE &&
+ prop->visible.tri == mod && choice_sym->curr.tri == yes)
+ prop->visible.tri = no;
+
tri = EXPR_OR(tri, prop->visible.tri);
}
if (tri == mod && (sym->type != S_TRISTATE || modules_val == no))
--
2.8.1
next prev parent reply other threads:[~2016-04-29 8:31 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-23 10:51 choice =y selection becomes lost after having multiple entries =m with depends on Sebastian Andrzej Siewior
2013-10-23 11:23 ` Yann E. MORIN
2013-10-23 11:28 ` Sebastian Andrzej Siewior
2013-10-24 15:30 ` Dirk Gouders
2013-10-24 16:19 ` Sebastian Andrzej Siewior
2013-10-24 16:50 ` Dirk Gouders
2013-10-30 10:00 ` Dirk Gouders
2013-10-30 10:30 ` Daniele Forsi
2013-10-30 10:41 ` Dirk Gouders
2013-10-30 14:26 ` Dirk Gouders
2013-10-31 10:20 ` Sebastian Andrzej Siewior
2013-10-31 21:49 ` Yann E. MORIN
2013-11-01 8:45 ` Dirk Gouders
2013-10-31 23:39 ` [PATCH v3] kconfig/symbol.c: handle choice_values that depend on 'm' symbols Dirk Gouders
2013-11-04 17:27 ` Sebastian Andrzej Siewior
2013-11-04 20:46 ` Yann E. MORIN
2013-11-05 8:45 ` Sebastian Andrzej Siewior
2013-11-05 23:04 ` Yann E. MORIN
2013-11-06 14:43 ` Dirk Gouders
2013-11-06 18:59 ` Yann E. MORIN
2013-11-07 14:02 ` Dirk Gouders
2013-11-07 14:05 ` [PATCH v4] " Dirk Gouders
2013-11-18 18:08 ` Yann E. MORIN
2013-12-20 12:46 ` Sebastian Andrzej Siewior
2014-08-13 15:35 ` Bin Liu
2014-08-14 6:52 ` Dirk Gouders
2014-08-14 13:54 ` Bin Liu
2014-08-15 7:37 ` Dirk Gouders
2014-08-15 7:43 ` Sebastian Andrzej Siewior
2016-03-30 22:08 ` Bin Liu
2016-03-30 22:16 ` Ruslan Bilovol
2016-03-31 7:13 ` Roger Quadros
2016-03-31 9:38 ` Dirk Gouders
2016-03-31 9:53 ` Dirk Gouders
2016-04-20 10:19 ` [RESEND PATCH " Dirk Gouders
2016-04-20 11:04 ` kbuild test robot
2016-04-20 13:14 ` Dirk Gouders
2016-04-29 8:24 ` Dirk Gouders [this message]
2016-05-02 8:43 ` [PATCH v5] " Roger Quadros
2016-05-10 19:15 ` Michal Marek
2016-04-20 12:12 ` [RESEND PATCH v4] " kbuild test robot
2013-11-08 9:46 ` [PATCH v3] " Dirk Gouders
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ghinz04yaz.fsf@lena.gouders.net \
--to=dirk@gouders.net \
--cc=bigeasy@linutronix.de \
--cc=binmlist@gmail.com \
--cc=kbuild-all@01.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=rogerq@ti.com \
--cc=ruslan.bilovol@gmail.com \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).