[PATCH 0/3] scripts/tags.sh: adopt some linux kernel commits

[PATCH 0/3] scripts/tags.sh: adopt some linux kernel commits

[Antony Pavlov]

Antony Pavlov (3):
  scripts/tags.sh: drop __TestClearPage*() helpers
  tags: Do not try to index defconfigs
  tags: Process Kconfig files in a single pass

 scripts/tags.sh | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/3] scripts/tags.sh: drop __TestClearPage*() helpers

[Antony Pavlov]

This is an adoption of the linux kernel commit

| commit 685eaade56c66c806dbe8102f12e2926cf4ec870
| Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
| Date:   Fri Jan 15 16:52:10 2016 -0800
|
|     page-flags: drop __TestClearPage*() helpers
|
|     Nobody uses them.
|
|     Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
|     Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|     Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 scripts/tags.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/tags.sh b/scripts/tags.sh
index 79fdafb0d..c3ce5f945 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -153,7 +153,6 @@ exuberant()
 	--regex-c++='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/'	\
 	--regex-c++='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/'	\
 	--regex-c++='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
-	--regex-c++='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
 	--regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'		\
 	--regex-c='/PCI_OP_READ\(([a-z]*[a-z]).*[1-4]\)/pci_bus_read_config_\1/' \
 	--regex-c='/PCI_OP_WRITE\(([a-z]*[a-z]).*[1-4]\)/pci_bus_write_config_\1/'
@@ -198,7 +197,6 @@ emacs()
 	--regex='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/'	\
 	--regex='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/' \
 	--regex='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
-	--regex='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
 	--regex='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'		\
 	--regex='/PCI_OP_READ\(([a-z]*[a-z]).*[1-4]\)/pci_bus_read_config_\1/' \
 	--regex='/PCI_OP_WRITE\(([a-z]*[a-z]).*[1-4]\)/pci_bus_write_config_\1/'
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/3] tags: Do not try to index defconfigs

[Antony Pavlov]

This is an adoption of the linux kernel commit

| commit ab9ca615f5f4053417cba464015bf2d7334a2371
| Author: Michal Marek <mmarek@suse.com>
| Date:   Thu Oct 15 11:14:02 2015 +0200
|
|     tags: Do not try to index defconfigs
|
|     The defconfig files are in predictable locations, so there is no need to
|     index them. Plus, the script was only looking for files named
|     'defconfig', which only works on a few architectures nowadays.
|
|     Signed-off-by: Michal Marek <mmarek@suse.com>

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 scripts/tags.sh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/scripts/tags.sh b/scripts/tags.sh
index c3ce5f945..22a5cc4bf 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -103,11 +103,6 @@ all_kconfigs()
 	find_other_sources 'Kconfig*'
 }
 
-all_defconfigs()
-{
-	find_sources $ALLSOURCE_ARCHS "defconfig"
-}
-
 docscope()
 {
 	(echo \-k; echo \-q; all_sources) > cscope.files
@@ -164,10 +159,6 @@ exuberant()
 	all_kconfigs | xargs $1 -a                              \
 	--langdef=kconfig --language-force=kconfig              \
 	--regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/CONFIG_\2/'
-
-	all_defconfigs | xargs -r $1 -a                         \
-	--langdef=dotconfig --language-force=dotconfig          \
-	--regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'
 }
 
 emacs()
@@ -206,9 +197,6 @@ emacs()
 
 	all_kconfigs | xargs $1 -a                              \
 	--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/CONFIG_\3/'
-
-	all_defconfigs | xargs -r $1 -a                         \
-	--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'
 }
 
 xtags()
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/3] tags: Process Kconfig files in a single pass

[Antony Pavlov]

This is an adoption of the linux kernel commit

| commit a281b8569e9eb4beb1651c92145271555ba05f0c
| Author: Michal Marek <mmarek@suse.com>
| Date:   Wed Oct 14 11:17:13 2015 +0200
|
|     tags: Process Kconfig files in a single pass
|
|     Signed-off-by: Michal Marek <mmarek@suse.com>

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 scripts/tags.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/scripts/tags.sh b/scripts/tags.sh
index 22a5cc4bf..8ae44642a 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -154,10 +154,7 @@ exuberant()
 
 	all_kconfigs | xargs $1 -a                              \
 	--langdef=kconfig --language-force=kconfig              \
-	--regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/\2/'
-
-	all_kconfigs | xargs $1 -a                              \
-	--langdef=kconfig --language-force=kconfig              \
+	--regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/\2/' \
 	--regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/CONFIG_\2/'
 }
 
@@ -193,9 +190,7 @@ emacs()
 	--regex='/PCI_OP_WRITE\(([a-z]*[a-z]).*[1-4]\)/pci_bus_write_config_\1/'
 
 	all_kconfigs | xargs $1 -a                              \
-	--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'
-
-	all_kconfigs | xargs $1 -a                              \
+	--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/' \
 	--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/CONFIG_\3/'
 }
 
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/3] scripts/tags.sh: adopt some linux kernel commits

[Sascha Hauer]

On Tue, Mar 21, 2017 at 01:55:28PM +0300, Antony Pavlov wrote:
> Antony Pavlov (3):
>   scripts/tags.sh: drop __TestClearPage*() helpers
>   tags: Do not try to index defconfigs
>   tags: Process Kconfig files in a single pass
> 
>  scripts/tags.sh | 23 ++---------------------
>  1 file changed, 2 insertions(+), 21 deletions(-)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox