diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-17 07:26:16 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-17 07:26:16 +0200 |
| commit | fc85d46525b4cdd92941f33d199ef5640273261b (patch) | |
| tree | ef55fdbd633239d2a3ee1036f2d94f8f36014705 /0001-Back-out-Kconfig.patch | |
| parent | 23a26ccc240ce16fd566a92fc4a741f859edbd65 (diff) | |
| parent | 7d9c2edc800d977525ab1f8931d44ac3c2b14b8d (diff) | |
| download | kernel-4.17.0-0.rc1.git0.1.vanilla.knurd.1.fc28.tar.gz kernel-4.17.0-0.rc1.git0.1.vanilla.knurd.1.fc28.tar.xz kernel-4.17.0-0.rc1.git0.1.vanilla.knurd.1.fc28.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc1.git0.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc1.git0.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc1.git0.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc1.git0.1.vanilla.knurd.1.fc26
Diffstat (limited to '0001-Back-out-Kconfig.patch')
| -rw-r--r-- | 0001-Back-out-Kconfig.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/0001-Back-out-Kconfig.patch b/0001-Back-out-Kconfig.patch new file mode 100644 index 000000000..a7e3d3b4e --- /dev/null +++ b/0001-Back-out-Kconfig.patch @@ -0,0 +1,37 @@ +From c49af822e6713efff10f2911ce12e5cebcd028b5 Mon Sep 17 00:00:00 2001 +From: Fedora Kernel Team <kernel-team@fedoraproject.org> +Date: Mon, 16 Apr 2018 10:19:18 -0500 +Subject: [PATCH] Back out Kconfig + +--- + scripts/kconfig/conf.c | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c +index 283eeed..4e08121 100644 +--- a/scripts/kconfig/conf.c ++++ b/scripts/kconfig/conf.c +@@ -422,18 +422,8 @@ static void check_conf(struct menu *menu) + if (sym_is_changable(sym) || + (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { + if (input_mode == listnewconfig) { +- if (sym->name) { +- const char *str; +- +- if (sym->type == S_STRING) { +- str = sym_get_string_value(sym); +- str = sym_escape_string_value(str); +- printf("%s%s=%s\n", CONFIG_, sym->name, str); +- free((void *)str); +- } else { +- str = sym_get_string_value(sym); +- printf("%s%s=%s\n", CONFIG_, sym->name, str); +- } ++ if (sym->name && !sym_is_choice_value(sym)) { ++ printf("%s%s\n", CONFIG_, sym->name); + } + } else { + if (!conf_cnt++) +-- +2.14.3 + |