From: Ariel Marcovitch <arielmarcovitch@gmail.com>
To: masahiroy@kernel.org
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
Ariel Marcovitch <arielmarcovitch@gmail.com>
Subject: [PATCH 2/2] kconfig: Make comments look different than menus in .config
Date: Mon, 13 Dec 2021 12:00:43 +0200 [thread overview]
Message-ID: <20211213100043.45645-3-arielmarcovitch@gmail.com> (raw)
In-Reply-To: <20211213100043.45645-1-arielmarcovitch@gmail.com>
Currently, the same code that handles menus in the write to .config
handles comments as well. That's why comments look exactly like menus in
the .config except for the 'end of menu' comments that appear only for
menus. This makes sense because sometimes comments are used as sort of
submenus. However for the other cases, it looks kinda weird because one
might attempt to look for the 'end of menu' for comments as well and be
very confused.
Make comments look different than menus. For the following:
```kconfig
menu "Stuff"
config FOO
def_bool y
comment "Some comment"
config BAR
def_bool n
endmenu
```
The .config will look like this:
```
#
# Stuff
#
CONFIG_FOO=y
### Some comment
# CONFIG_BAR is not defined
# end of Stuff
```
Signed-off-by: Ariel Marcovitch <arielmarcovitch@gmail.com>
---
scripts/kconfig/confdata.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 9f2c22f46ee0..d3ec1ad67d92 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -880,10 +880,16 @@ int conf_write(const char *name)
if (type == P_MENU || type == P_COMMENT) {
str = menu_get_prompt(menu);
- fprintf(out, "\n"
- "#\n"
- "# %s\n"
- "#\n", str);
+
+ if (type == P_MENU)
+ fprintf(out, "\n"
+ "#\n"
+ "# %s\n"
+ "#\n", str);
+ else
+ fprintf(out, "\n"
+ "### %s\n", str);
+
need_newline = false;
}
}
--
2.25.1
next prev parent reply other threads:[~2021-12-13 10:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 10:00 [PATCH 0/2] kconfig: Improve comment blocks in the .config file Ariel Marcovitch
2021-12-13 10:00 ` [PATCH 1/2] kconfig: Show menuconfigs as menus " Ariel Marcovitch
2022-01-18 18:20 ` Masahiro Yamada
2022-02-18 18:39 ` Ariel Marcovitch
2022-02-20 2:23 ` Masahiro Yamada
2021-12-13 10:00 ` Ariel Marcovitch [this message]
2022-01-18 18:25 ` [PATCH 2/2] kconfig: Make comments look different than menus in .config Masahiro Yamada
2022-02-18 18:55 ` Ariel Marcovitch
2022-02-20 4:17 ` Masahiro Yamada
2021-12-13 11:47 ` [PATCH 0/2] kconfig: Improve comment blocks in the .config file Boris Kolpackov
2021-12-14 8:27 ` Ariel Marcovitch
2022-01-15 13:58 ` Ariel Marcovitch
2022-01-15 13:58 ` Ariel Marcovitch
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=20211213100043.45645-3-arielmarcovitch@gmail.com \
--to=arielmarcovitch@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
/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