diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-05-05 16:20:07 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-05-06 19:11:04 +0200 |
| commit | 0a524686d91f5d77a95acb2d1878b80ff4a12fa6 (patch) | |
| tree | eec7dbc9359aaa2c92feeff13cc515aeb923e727 /util | |
| parent | dcc9fe243031092c432c282c75ee11477bc56e05 (diff) | |
Fix Kconfig option list generator
The Kconfig option list generator was broken by two different changes
to the project in the last few years:
- the switch to git from svn
- allowing wild card includes in Kconfig
Change-Id: I6bc5024a04958e9718d2e3a3a3bb6d69d4277eb6
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10115
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/optionlist/Makefile | 6 | ||||
| -rwxr-xr-x | util/optionlist/kconfig2wiki | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/util/optionlist/Makefile b/util/optionlist/Makefile index 8e78c9a004..592d28647e 100644 --- a/util/optionlist/Makefile +++ b/util/optionlist/Makefile @@ -15,12 +15,10 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # - -SVNVERSION := $(shell LC_ALL=C svnversion -cn ../.. | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/" | grep "[0-9]" || LC_ALL=C svn info . | grep ^Revision | sed "s/.*[[:blank:]]\+\([0-9]*\)[^0-9]*/\1/" | grep "[0-9]" || echo unknown) +VERSION := $(shell git describe --dirty --always || git describe) all: - cd ../..; util/optionlist/kconfig2wiki src/Kconfig $(SVNVERSION) > util/optionlist/Options.wiki + cd ../..; util/optionlist/kconfig2wiki src/Kconfig $(VERSION) > util/optionlist/Options.wiki clean: rm -rf Options.wiki - diff --git a/util/optionlist/kconfig2wiki b/util/optionlist/kconfig2wiki index b73afa5f51..4265d37b41 100755 --- a/util/optionlist/kconfig2wiki +++ b/util/optionlist/kconfig2wiki @@ -21,6 +21,8 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # +import glob + helplen = 0 extra_chapters = 0 @@ -105,7 +107,8 @@ def readfile(filename): sys.stdout.write("\n") elif words[0] == "source": fn=zapquotes(words[1]) - readfile(fn) + for name in glob.glob(fn): + readfile(name) elif words[0] in ("default","depends", "select", "if", "endif", "#"): pass #else: sys.stderr.write("unknown: %s\n" % i) if helplen: sys.stdout.write("||\n") |