Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-14 11:55:46 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-14 11:55:47 +0100
commit9444514e6c16c383abe13da144bc783dee7d38ef (patch)
treefaf184a15cce3cc585f702a3561548eba916bcf6
parent673c6f7e36d64c347f27d310958b4a10393d58ec (diff)
kconfig: fix line numbers for if-entries in menu tree
(bsc#1051510).
-rw-r--r--patches.fixes/kconfig-fix-line-numbers-for-if-entries-in-menu-tree.patch71
-rw-r--r--series.conf1
2 files changed, 72 insertions, 0 deletions
diff --git a/patches.fixes/kconfig-fix-line-numbers-for-if-entries-in-menu-tree.patch b/patches.fixes/kconfig-fix-line-numbers-for-if-entries-in-menu-tree.patch
new file mode 100644
index 0000000000..c71f706b8c
--- /dev/null
+++ b/patches.fixes/kconfig-fix-line-numbers-for-if-entries-in-menu-tree.patch
@@ -0,0 +1,71 @@
+From b2d00d7c61c84edd150310af3f556f8a3c6e2e67 Mon Sep 17 00:00:00 2001
+From: Dirk Gouders <dirk@gouders.net>
+Date: Thu, 21 Jun 2018 15:30:54 +0200
+Subject: [PATCH] kconfig: fix line numbers for if-entries in menu tree
+Git-commit: b2d00d7c61c84edd150310af3f556f8a3c6e2e67
+Patch-mainline: v4.18-rc3
+References: bsc#1051510
+
+The line numers for if-entries in the menu tree are off by one or more
+lines which is confusing when debugging for correctness of unrelated changes.
+
+According to the git log, commit a02f0570ae201c49 (kconfig: improve
+error handling in the parser) was the last one that changed that part
+of the parser and replaced
+
+ "if_entry: T_IF expr T_EOL"
+by
+ "if_entry: T_IF expr nl"
+
+but the commit message does not state why this has been done.
+
+When reverting that part of the commit, only the line numers are
+corrected (checked with cdebug = DEBUG_PARSE in zconf.y), otherwise
+the menu tree remains unchanged (checked with zconfdump() enabled in
+conf.c).
+
+An example for the corrected line numbers:
+
+drivers/soc/Kconfig:15:source drivers/soc/tegra/Kconfig
+drivers/soc/tegra/Kconfig:4:if
+drivers/soc/tegra/Kconfig:6:if
+
+changes to:
+
+drivers/soc/Kconfig:15:source drivers/soc/tegra/Kconfig
+drivers/soc/tegra/Kconfig:1:if
+drivers/soc/tegra/Kconfig:4:if
+
+Signed-off-by: Dirk Gouders <dirk@gouders.net>
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ scripts/kconfig/zconf.y | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
+index 6f9b0aa32a82..ed84d4a8e288 100644
+--- a/scripts/kconfig/zconf.y
++++ b/scripts/kconfig/zconf.y
+@@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE];
+ static struct menu *current_menu, *current_entry;
+
+ %}
+-%expect 32
++%expect 31
+
+ %union
+ {
+@@ -337,7 +337,7 @@ choice_block:
+
+ /* if entry */
+
+-if_entry: T_IF expr nl
++if_entry: T_IF expr T_EOL
+ {
+ printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
+ menu_add_entry(NULL);
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index ab10e36b08..b03627619e 100644
--- a/series.conf
+++ b/series.conf
@@ -17287,6 +17287,7 @@
patches.suse/0001-block-Fix-cloning-of-requests-with-a-special-payload.patch
patches.suse/0001-drbd-Fix-drbd_request_prepare-discard-handling.patch
patches.arch/x86-efi-fix-efi_call_phys_epilog-with-config_x86_5level-y
+ patches.fixes/kconfig-fix-line-numbers-for-if-entries-in-menu-tree.patch
patches.fixes/ARM-davinci-board-da850-evm-fix-WP-pin-polarity-for-.patch
patches.drivers/usb-dwc3-pci-add-support-for-Intel-IceLake.patch
patches.drivers/usb-dwc2-gadget-Fix-issue-in-dwc2_gadget_start_isoc.patch