Skip to contentSkip to conversation

kconfig: Terminate menu blocks with a newline in the generated config

PATCH Superseded Alexander Popov 3 participants 4 messages Apr 19, 2019 – Apr 24, 2019

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kconfig: Terminate menu blocks with a newline in the generated config

Currently menu blocks start with a pretty header but end with nothing in the generated config. So next config options stick together with the options from the menu block.

Let's terminate menu blocks with a newline in the generated config.

---
 scripts/kconfig/confdata.c | 2 ++
 1 file changed, 2 insertions(+)
scripts/kconfig/confdata.c +2 -0
index 08ba146..1459153 100644
@@ -888,6 +888,8 @@ int conf_write(const char *name)
 		if (menu->next)
 			menu = menu->next;
 		else while ((menu = menu->parent)) {
+			if (!menu->sym && menu_is_visible(menu))
+				fprintf(out, "\n");
 			if (menu->next) {
 				menu = menu->next;
 				break;
Signature · 1 line
2.7.4
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Alexander Popov

Currently menu blocks start with a pretty header but end with nothing in the generated config. So next config options stick together with the options from the menu block.

Let's terminate menu blocks with a newline in the generated config.

Seems fine to improve readability at a few bytes size increase.

-Kees

Quoted 20 lines
---
 scripts/kconfig/confdata.c | 2 ++
 1 file changed, 2 insertions(+)
scripts/kconfig/confdata.c +2 -1
index 08ba146..1459153 100644
@@ -888,6 +888,8 @@ int conf_write(const char *name)
                if (menu->next)
                        menu = menu->next;
                else while ((menu = menu->parent)) {
+                       if (!menu->sym && menu_is_visible(menu))
+                               fprintf(out, "\n");
                        if (menu->next) {
                                menu = menu->next;
                                break;
--

2.7.4

Signature · 1 line
Kees Cook
#2 lore raw
In reply to Alexander Popov
Quoted 8 lines · Alexander Popov

Currently menu blocks start with a pretty header but end with nothing in the generated config. So next config options stick together with the options from the menu block.

Let's terminate menu blocks with a newline in the generated config.

The .config file is a flat list of CONFIG options. It does not represent menu structures at all.

I tested "make allyesconfig"
and the resulted outcome looks cheesy.

[1] Two blank lines in a row

---------->8-----------------
CONFIG_EFI_EARLYCON=y
CONFIG_IMX_SCU=y
CONFIG_IMX_SCU_PD=y

#
# Tegra firmware driver
#

CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
CONFIG_HAVE_KVM_IRQFD=y
--------->8------------------------

[2] Some blank lines appended at the end of file

----------->8-------------
CONFIG_CPA_DEBUG=y
CONFIG_OPTIMIZE_INLINING=y
CONFIG_DEBUG_ENTRY=y
CONFIG_DEBUG_NMI_SELFTEST=y
CONFIG_X86_DEBUG_FPU=y
CONFIG_PUNIT_ATOM_DEBUG=y
CONFIG_UNWINDER_ORC=y
# CONFIG_UNWINDER_FRAME_POINTER is not set

---------->8-----------------

The readability of the .config could be improved somehow, but this patch is not the right one.

Signature · 2 lines
Best Regards
Masahiro Yamada
#3 lore raw
Quoted 6 lines · Masahiro Yamada
Quoted 5 lines · Alexander Popov

Currently menu blocks start with a pretty header but end with nothing in the generated config. So next config options stick together with the options from the menu block.

Quoted 6 lines
Quoted 3 lines

Let's terminate menu blocks with a newline in the generated config.

The readability of the .config could be improved somehow, but this patch is not the right one.

Masahiro, thanks for having a look.
I've just sent v2 which does this task much better.

Best regards,
Alexander