Merge tag 'char-misc-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH: "Here's the "big" char and misc driver update for 4.9-rc1. Lots of little things here, all over the driver tree for subsystems that flow through me. Nothing major that I can discern, full details are in the shortlog. All have been in the linux-next tree with no reported issues" * tag 'char-misc-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (144 commits) drivers/misc/hpilo: Changes to support new security states in iLO5 FW at25: fix debug and error messaging misc/genwqe: ensure zero initialization vme: fake: remove unexpected unlock in fake_master_set() vme: fake: mark symbols static where possible spmi: pmic-arb: Return an error code if sanity check fails Drivers: hv: get rid of id in struct vmbus_channel Drivers: hv: make VMBus bus ids persistent mcb: Add a dma_device to mcb_device mcb: Enable PCI bus mastering by default mei: stop the stall timer worker if not needed clk: probe common clock drivers earlier vme: fake: fix build for 64-bit dma_addr_t ttyprintk: Neaten and simplify printing mei: me: add kaby point device ids coresight: tmc: mark symbols static where possible coresight: perf: deal with error condition properly Drivers: hv: hv_util: Avoid dynamic allocation in time synch fpga manager: Add hardware dependency to Zynq driver Drivers: hv: utils: Support TimeSync version 4.0 protocol samples. ...
This commit is contained in:
Linus Torvalds
+164
-154
@@ -1,98 +1,99 @@
|
||||
#!/usr/bin/env python2
|
||||
#!/usr/bin/env python3
|
||||
|
||||
"""Find Kconfig symbols that are referenced but not defined."""
|
||||
|
||||
# (c) 2014-2015 Valentin Rothberg <valentinrothberg@gmail.com>
|
||||
# (c) 2014-2016 Valentin Rothberg <valentinrothberg@gmail.com>
|
||||
# (c) 2014 Stefan Hengelein <stefan.hengelein@fau.de>
|
||||
#
|
||||
# Licensed under the terms of the GNU GPL License version 2
|
||||
|
||||
|
||||
import argparse
|
||||
import difflib
|
||||
import os
|
||||
import re
|
||||
import signal
|
||||
import subprocess
|
||||
import sys
|
||||
from multiprocessing import Pool, cpu_count
|
||||
from optparse import OptionParser
|
||||
from subprocess import Popen, PIPE, STDOUT
|
||||
|
||||
|
||||
# regex expressions
|
||||
OPERATORS = r"&|\(|\)|\||\!"
|
||||
FEATURE = r"(?:\w*[A-Z0-9]\w*){2,}"
|
||||
DEF = r"^\s*(?:menu){,1}config\s+(" + FEATURE + r")\s*"
|
||||
EXPR = r"(?:" + OPERATORS + r"|\s|" + FEATURE + r")+"
|
||||
SYMBOL = r"(?:\w*[A-Z0-9]\w*){2,}"
|
||||
DEF = r"^\s*(?:menu){,1}config\s+(" + SYMBOL + r")\s*"
|
||||
EXPR = r"(?:" + OPERATORS + r"|\s|" + SYMBOL + r")+"
|
||||
DEFAULT = r"default\s+.*?(?:if\s.+){,1}"
|
||||
STMT = r"^\s*(?:if|select|depends\s+on|(?:" + DEFAULT + r"))\s+" + EXPR
|
||||
SOURCE_FEATURE = r"(?:\W|\b)+[D]{,1}CONFIG_(" + FEATURE + r")"
|
||||
SOURCE_SYMBOL = r"(?:\W|\b)+[D]{,1}CONFIG_(" + SYMBOL + r")"
|
||||
|
||||
# regex objects
|
||||
REGEX_FILE_KCONFIG = re.compile(r".*Kconfig[\.\w+\-]*$")
|
||||
REGEX_FEATURE = re.compile(r'(?!\B)' + FEATURE + r'(?!\B)')
|
||||
REGEX_SOURCE_FEATURE = re.compile(SOURCE_FEATURE)
|
||||
REGEX_SYMBOL = re.compile(r'(?!\B)' + SYMBOL + r'(?!\B)')
|
||||
REGEX_SOURCE_SYMBOL = re.compile(SOURCE_SYMBOL)
|
||||
REGEX_KCONFIG_DEF = re.compile(DEF)
|
||||
REGEX_KCONFIG_EXPR = re.compile(EXPR)
|
||||
REGEX_KCONFIG_STMT = re.compile(STMT)
|
||||
REGEX_KCONFIG_HELP = re.compile(r"^\s+(help|---help---)\s*$")
|
||||
REGEX_FILTER_FEATURES = re.compile(r"[A-Za-z0-9]$")
|
||||
REGEX_FILTER_SYMBOLS = re.compile(r"[A-Za-z0-9]$")
|
||||
REGEX_NUMERIC = re.compile(r"0[xX][0-9a-fA-F]+|[0-9]+")
|
||||
REGEX_QUOTES = re.compile("(\"(.*?)\")")
|
||||
|
||||
|
||||
def parse_options():
|
||||
"""The user interface of this module."""
|
||||
usage = "%prog [options]\n\n" \
|
||||
"Run this tool to detect Kconfig symbols that are referenced but " \
|
||||
"not defined in\nKconfig. The output of this tool has the " \
|
||||
"format \'Undefined symbol\\tFile list\'\n\n" \
|
||||
"If no option is specified, %prog will default to check your\n" \
|
||||
"current tree. Please note that specifying commits will " \
|
||||
"\'git reset --hard\'\nyour current tree! You may save " \
|
||||
"uncommitted changes to avoid losing data."
|
||||
usage = "Run this tool to detect Kconfig symbols that are referenced but " \
|
||||
"not defined in Kconfig. If no option is specified, " \
|
||||
"checkkconfigsymbols defaults to check your current tree. " \
|
||||
"Please note that specifying commits will 'git reset --hard\' " \
|
||||
"your current tree! You may save uncommitted changes to avoid " \
|
||||
"losing data."
|
||||
|
||||
parser = OptionParser(usage=usage)
|
||||
parser = argparse.ArgumentParser(description=usage)
|
||||
|
||||
parser.add_option('-c', '--commit', dest='commit', action='store',
|
||||
default="",
|
||||
help="Check if the specified commit (hash) introduces "
|
||||
"undefined Kconfig symbols.")
|
||||
parser.add_argument('-c', '--commit', dest='commit', action='store',
|
||||
default="",
|
||||
help="check if the specified commit (hash) introduces "
|
||||
"undefined Kconfig symbols")
|
||||
|
||||
parser.add_option('-d', '--diff', dest='diff', action='store',
|
||||
default="",
|
||||
help="Diff undefined symbols between two commits. The "
|
||||
"input format bases on Git log's "
|
||||
"\'commmit1..commit2\'.")
|
||||
parser.add_argument('-d', '--diff', dest='diff', action='store',
|
||||
default="",
|
||||
help="diff undefined symbols between two commits "
|
||||
"(e.g., -d commmit1..commit2)")
|
||||
|
||||
parser.add_option('-f', '--find', dest='find', action='store_true',
|
||||
default=False,
|
||||
help="Find and show commits that may cause symbols to be "
|
||||
"missing. Required to run with --diff.")
|
||||
parser.add_argument('-f', '--find', dest='find', action='store_true',
|
||||
default=False,
|
||||
help="find and show commits that may cause symbols to be "
|
||||
"missing (required to run with --diff)")
|
||||
|
||||
parser.add_option('-i', '--ignore', dest='ignore', action='store',
|
||||
default="",
|
||||
help="Ignore files matching this pattern. Note that "
|
||||
"the pattern needs to be a Python regex. To "
|
||||
"ignore defconfigs, specify -i '.*defconfig'.")
|
||||
parser.add_argument('-i', '--ignore', dest='ignore', action='store',
|
||||
default="",
|
||||
help="ignore files matching this Python regex "
|
||||
"(e.g., -i '.*defconfig')")
|
||||
|
||||
parser.add_option('-s', '--sim', dest='sim', action='store', default="",
|
||||
help="Print a list of maximum 10 string-similar symbols.")
|
||||
parser.add_argument('-s', '--sim', dest='sim', action='store', default="",
|
||||
help="print a list of max. 10 string-similar symbols")
|
||||
|
||||
parser.add_option('', '--force', dest='force', action='store_true',
|
||||
default=False,
|
||||
help="Reset current Git tree even when it's dirty.")
|
||||
parser.add_argument('--force', dest='force', action='store_true',
|
||||
default=False,
|
||||
help="reset current Git tree even when it's dirty")
|
||||
|
||||
(opts, _) = parser.parse_args()
|
||||
parser.add_argument('--no-color', dest='color', action='store_false',
|
||||
default=True,
|
||||
help="don't print colored output (default when not "
|
||||
"outputting to a terminal)")
|
||||
|
||||
if opts.commit and opts.diff:
|
||||
args = parser.parse_args()
|
||||
|
||||
if args.commit and args.diff:
|
||||
sys.exit("Please specify only one option at once.")
|
||||
|
||||
if opts.diff and not re.match(r"^[\w\-\.]+\.\.[\w\-\.]+$", opts.diff):
|
||||
if args.diff and not re.match(r"^[\w\-\.]+\.\.[\w\-\.]+$", args.diff):
|
||||
sys.exit("Please specify valid input in the following format: "
|
||||
"\'commit1..commit2\'")
|
||||
|
||||
if opts.commit or opts.diff:
|
||||
if not opts.force and tree_is_dirty():
|
||||
if args.commit or args.diff:
|
||||
if not args.force and tree_is_dirty():
|
||||
sys.exit("The current Git tree is dirty (see 'git status'). "
|
||||
"Running this script may\ndelete important data since it "
|
||||
"calls 'git reset --hard' for some performance\nreasons. "
|
||||
@@ -100,138 +101,148 @@ def parse_options():
|
||||
"'--force' if you\nwant to ignore this warning and "
|
||||
"continue.")
|
||||
|
||||
if opts.commit:
|
||||
opts.find = False
|
||||
if args.commit:
|
||||
args.find = False
|
||||
|
||||
if opts.ignore:
|
||||
if args.ignore:
|
||||
try:
|
||||
re.match(opts.ignore, "this/is/just/a/test.c")
|
||||
re.match(args.ignore, "this/is/just/a/test.c")
|
||||
except:
|
||||
sys.exit("Please specify a valid Python regex.")
|
||||
|
||||
return opts
|
||||
return args
|
||||
|
||||
|
||||
def main():
|
||||
"""Main function of this module."""
|
||||
opts = parse_options()
|
||||
args = parse_options()
|
||||
|
||||
if opts.sim and not opts.commit and not opts.diff:
|
||||
sims = find_sims(opts.sim, opts.ignore)
|
||||
global COLOR
|
||||
COLOR = args.color and sys.stdout.isatty()
|
||||
|
||||
if args.sim and not args.commit and not args.diff:
|
||||
sims = find_sims(args.sim, args.ignore)
|
||||
if sims:
|
||||
print "%s: %s" % (yel("Similar symbols"), ', '.join(sims))
|
||||
print("%s: %s" % (yel("Similar symbols"), ', '.join(sims)))
|
||||
else:
|
||||
print "%s: no similar symbols found" % yel("Similar symbols")
|
||||
print("%s: no similar symbols found" % yel("Similar symbols"))
|
||||
sys.exit(0)
|
||||
|
||||
# dictionary of (un)defined symbols
|
||||
defined = {}
|
||||
undefined = {}
|
||||
|
||||
if opts.commit or opts.diff:
|
||||
if args.commit or args.diff:
|
||||
head = get_head()
|
||||
|
||||
# get commit range
|
||||
commit_a = None
|
||||
commit_b = None
|
||||
if opts.commit:
|
||||
commit_a = opts.commit + "~"
|
||||
commit_b = opts.commit
|
||||
elif opts.diff:
|
||||
split = opts.diff.split("..")
|
||||
if args.commit:
|
||||
commit_a = args.commit + "~"
|
||||
commit_b = args.commit
|
||||
elif args.diff:
|
||||
split = args.diff.split("..")
|
||||
commit_a = split[0]
|
||||
commit_b = split[1]
|
||||
undefined_a = {}
|
||||
undefined_b = {}
|
||||
|
||||
# get undefined items before the commit
|
||||
execute("git reset --hard %s" % commit_a)
|
||||
undefined_a, _ = check_symbols(opts.ignore)
|
||||
reset(commit_a)
|
||||
undefined_a, _ = check_symbols(args.ignore)
|
||||
|
||||
# get undefined items for the commit
|
||||
execute("git reset --hard %s" % commit_b)
|
||||
undefined_b, defined = check_symbols(opts.ignore)
|
||||
reset(commit_b)
|
||||
undefined_b, defined = check_symbols(args.ignore)
|
||||
|
||||
# report cases that are present for the commit but not before
|
||||
for feature in sorted(undefined_b):
|
||||
# feature has not been undefined before
|
||||
if not feature in undefined_a:
|
||||
files = sorted(undefined_b.get(feature))
|
||||
undefined[feature] = files
|
||||
# check if there are new files that reference the undefined feature
|
||||
for symbol in sorted(undefined_b):
|
||||
# symbol has not been undefined before
|
||||
if symbol not in undefined_a:
|
||||
files = sorted(undefined_b.get(symbol))
|
||||
undefined[symbol] = files
|
||||
# check if there are new files that reference the undefined symbol
|
||||
else:
|
||||
files = sorted(undefined_b.get(feature) -
|
||||
undefined_a.get(feature))
|
||||
files = sorted(undefined_b.get(symbol) -
|
||||
undefined_a.get(symbol))
|
||||
if files:
|
||||
undefined[feature] = files
|
||||
undefined[symbol] = files
|
||||
|
||||
# reset to head
|
||||
execute("git reset --hard %s" % head)
|
||||
reset(head)
|
||||
|
||||
# default to check the entire tree
|
||||
else:
|
||||
undefined, defined = check_symbols(opts.ignore)
|
||||
undefined, defined = check_symbols(args.ignore)
|
||||
|
||||
# now print the output
|
||||
for feature in sorted(undefined):
|
||||
print red(feature)
|
||||
for symbol in sorted(undefined):
|
||||
print(red(symbol))
|
||||
|
||||
files = sorted(undefined.get(feature))
|
||||
print "%s: %s" % (yel("Referencing files"), ", ".join(files))
|
||||
files = sorted(undefined.get(symbol))
|
||||
print("%s: %s" % (yel("Referencing files"), ", ".join(files)))
|
||||
|
||||
sims = find_sims(feature, opts.ignore, defined)
|
||||
sims = find_sims(symbol, args.ignore, defined)
|
||||
sims_out = yel("Similar symbols")
|
||||
if sims:
|
||||
print "%s: %s" % (sims_out, ', '.join(sims))
|
||||
print("%s: %s" % (sims_out, ', '.join(sims)))
|
||||
else:
|
||||
print "%s: %s" % (sims_out, "no similar symbols found")
|
||||
print("%s: %s" % (sims_out, "no similar symbols found"))
|
||||
|
||||
if opts.find:
|
||||
print "%s:" % yel("Commits changing symbol")
|
||||
commits = find_commits(feature, opts.diff)
|
||||
if args.find:
|
||||
print("%s:" % yel("Commits changing symbol"))
|
||||
commits = find_commits(symbol, args.diff)
|
||||
if commits:
|
||||
for commit in commits:
|
||||
commit = commit.split(" ", 1)
|
||||
print "\t- %s (\"%s\")" % (yel(commit[0]), commit[1])
|
||||
print("\t- %s (\"%s\")" % (yel(commit[0]), commit[1]))
|
||||
else:
|
||||
print "\t- no commit found"
|
||||
print # new line
|
||||
print("\t- no commit found")
|
||||
print() # new line
|
||||
|
||||
|
||||
def reset(commit):
|
||||
"""Reset current git tree to %commit."""
|
||||
execute(["git", "reset", "--hard", commit])
|
||||
|
||||
|
||||
def yel(string):
|
||||
"""
|
||||
Color %string yellow.
|
||||
"""
|
||||
return "\033[33m%s\033[0m" % string
|
||||
return "\033[33m%s\033[0m" % string if COLOR else string
|
||||
|
||||
|
||||
def red(string):
|
||||
"""
|
||||
Color %string red.
|
||||
"""
|
||||
return "\033[31m%s\033[0m" % string
|
||||
return "\033[31m%s\033[0m" % string if COLOR else string
|
||||
|
||||
|
||||
def execute(cmd):
|
||||
"""Execute %cmd and return stdout. Exit in case of error."""
|
||||
pop = Popen(cmd, stdout=PIPE, stderr=STDOUT, shell=True)
|
||||
(stdout, _) = pop.communicate() # wait until finished
|
||||
if pop.returncode != 0:
|
||||
sys.exit(stdout)
|
||||
try:
|
||||
stdout = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=False)
|
||||
stdout = stdout.decode(errors='replace')
|
||||
except subprocess.CalledProcessError as fail:
|
||||
exit(fail)
|
||||
return stdout
|
||||
|
||||
|
||||
def find_commits(symbol, diff):
|
||||
"""Find commits changing %symbol in the given range of %diff."""
|
||||
commits = execute("git log --pretty=oneline --abbrev-commit -G %s %s"
|
||||
% (symbol, diff))
|
||||
commits = execute(["git", "log", "--pretty=oneline",
|
||||
"--abbrev-commit", "-G",
|
||||
symbol, diff])
|
||||
return [x for x in commits.split("\n") if x]
|
||||
|
||||
|
||||
def tree_is_dirty():
|
||||
"""Return true if the current working tree is dirty (i.e., if any file has
|
||||
been added, deleted, modified, renamed or copied but not committed)."""
|
||||
stdout = execute("git status --porcelain")
|
||||
stdout = execute(["git", "status", "--porcelain"])
|
||||
for line in stdout:
|
||||
if re.findall(r"[URMADC]{1}", line[:2]):
|
||||
return True
|
||||
@@ -240,13 +251,13 @@ def tree_is_dirty():
|
||||
|
||||
def get_head():
|
||||
"""Return commit hash of current HEAD."""
|
||||
stdout = execute("git rev-parse HEAD")
|
||||
stdout = execute(["git", "rev-parse", "HEAD"])
|
||||
return stdout.strip('\n')
|
||||
|
||||
|
||||
def partition(lst, size):
|
||||
"""Partition list @lst into eveni-sized lists of size @size."""
|
||||
return [lst[i::size] for i in xrange(size)]
|
||||
return [lst[i::size] for i in range(size)]
|
||||
|
||||
|
||||
def init_worker():
|
||||
@@ -254,7 +265,7 @@ def init_worker():
|
||||
signal.signal(signal.SIGINT, signal.SIG_IGN)
|
||||
|
||||
|
||||
def find_sims(symbol, ignore, defined = []):
|
||||
def find_sims(symbol, ignore, defined=[]):
|
||||
"""Return a list of max. ten Kconfig symbols that are string-similar to
|
||||
@symbol."""
|
||||
if defined:
|
||||
@@ -279,7 +290,7 @@ def find_sims(symbol, ignore, defined = []):
|
||||
def get_files():
|
||||
"""Return a list of all files in the current git directory."""
|
||||
# use 'git ls-files' to get the worklist
|
||||
stdout = execute("git ls-files")
|
||||
stdout = execute(["git", "ls-files"])
|
||||
if len(stdout) > 0 and stdout[-1] == "\n":
|
||||
stdout = stdout[:-1]
|
||||
|
||||
@@ -311,8 +322,8 @@ def check_symbols_helper(pool, ignore):
|
||||
check_symbols() in order to properly terminate running worker processes."""
|
||||
source_files = []
|
||||
kconfig_files = []
|
||||
defined_features = []
|
||||
referenced_features = dict() # {file: [features]}
|
||||
defined_symbols = []
|
||||
referenced_symbols = dict() # {file: [symbols]}
|
||||
|
||||
for gitfile in get_files():
|
||||
if REGEX_FILE_KCONFIG.match(gitfile):
|
||||
@@ -326,76 +337,75 @@ def check_symbols_helper(pool, ignore):
|
||||
# parse source files
|
||||
arglist = partition(source_files, cpu_count())
|
||||
for res in pool.map(parse_source_files, arglist):
|
||||
referenced_features.update(res)
|
||||
|
||||
referenced_symbols.update(res)
|
||||
|
||||
# parse kconfig files
|
||||
arglist = []
|
||||
for part in partition(kconfig_files, cpu_count()):
|
||||
arglist.append((part, ignore))
|
||||
for res in pool.map(parse_kconfig_files, arglist):
|
||||
defined_features.extend(res[0])
|
||||
referenced_features.update(res[1])
|
||||
defined_features = set(defined_features)
|
||||
defined_symbols.extend(res[0])
|
||||
referenced_symbols.update(res[1])
|
||||
defined_symbols = set(defined_symbols)
|
||||
|
||||
# inverse mapping of referenced_features to dict(feature: [files])
|
||||
# inverse mapping of referenced_symbols to dict(symbol: [files])
|
||||
inv_map = dict()
|
||||
for _file, features in referenced_features.iteritems():
|
||||
for feature in features:
|
||||
inv_map[feature] = inv_map.get(feature, set())
|
||||
inv_map[feature].add(_file)
|
||||
referenced_features = inv_map
|
||||
for _file, symbols in referenced_symbols.items():
|
||||
for symbol in symbols:
|
||||
inv_map[symbol] = inv_map.get(symbol, set())
|
||||
inv_map[symbol].add(_file)
|
||||
referenced_symbols = inv_map
|
||||
|
||||
undefined = {} # {feature: [files]}
|
||||
for feature in sorted(referenced_features):
|
||||
undefined = {} # {symbol: [files]}
|
||||
for symbol in sorted(referenced_symbols):
|
||||
# filter some false positives
|
||||
if feature == "FOO" or feature == "BAR" or \
|
||||
feature == "FOO_BAR" or feature == "XXX":
|
||||
if symbol == "FOO" or symbol == "BAR" or \
|
||||
symbol == "FOO_BAR" or symbol == "XXX":
|
||||
continue
|
||||
if feature not in defined_features:
|
||||
if feature.endswith("_MODULE"):
|
||||
if symbol not in defined_symbols:
|
||||
if symbol.endswith("_MODULE"):
|
||||
# avoid false positives for kernel modules
|
||||
if feature[:-len("_MODULE")] in defined_features:
|
||||
if symbol[:-len("_MODULE")] in defined_symbols:
|
||||
continue
|
||||
undefined[feature] = referenced_features.get(feature)
|
||||
return undefined, defined_features
|
||||
undefined[symbol] = referenced_symbols.get(symbol)
|
||||
return undefined, defined_symbols
|
||||
|
||||
|
||||
def parse_source_files(source_files):
|
||||
"""Parse each source file in @source_files and return dictionary with source
|
||||
files as keys and lists of references Kconfig symbols as values."""
|
||||
referenced_features = dict()
|
||||
referenced_symbols = dict()
|
||||
for sfile in source_files:
|
||||
referenced_features[sfile] = parse_source_file(sfile)
|
||||
return referenced_features
|
||||
referenced_symbols[sfile] = parse_source_file(sfile)
|
||||
return referenced_symbols
|
||||
|
||||
|
||||
def parse_source_file(sfile):
|
||||
"""Parse @sfile and return a list of referenced Kconfig features."""
|
||||
"""Parse @sfile and return a list of referenced Kconfig symbols."""
|
||||
lines = []
|
||||
references = []
|
||||
|
||||
if not os.path.exists(sfile):
|
||||
return references
|
||||
|
||||
with open(sfile, "r") as stream:
|
||||
with open(sfile, "r", encoding='utf-8', errors='replace') as stream:
|
||||
lines = stream.readlines()
|
||||
|
||||
for line in lines:
|
||||
if not "CONFIG_" in line:
|
||||
if "CONFIG_" not in line:
|
||||
continue
|
||||
features = REGEX_SOURCE_FEATURE.findall(line)
|
||||
for feature in features:
|
||||
if not REGEX_FILTER_FEATURES.search(feature):
|
||||
symbols = REGEX_SOURCE_SYMBOL.findall(line)
|
||||
for symbol in symbols:
|
||||
if not REGEX_FILTER_SYMBOLS.search(symbol):
|
||||
continue
|
||||
references.append(feature)
|
||||
references.append(symbol)
|
||||
|
||||
return references
|
||||
|
||||
|
||||
def get_features_in_line(line):
|
||||
"""Return mentioned Kconfig features in @line."""
|
||||
return REGEX_FEATURE.findall(line)
|
||||
def get_symbols_in_line(line):
|
||||
"""Return mentioned Kconfig symbols in @line."""
|
||||
return REGEX_SYMBOL.findall(line)
|
||||
|
||||
|
||||
def parse_kconfig_files(args):
|
||||
@@ -404,21 +414,21 @@ def parse_kconfig_files(args):
|
||||
pattern."""
|
||||
kconfig_files = args[0]
|
||||
ignore = args[1]
|
||||
defined_features = []
|
||||
referenced_features = dict()
|
||||
defined_symbols = []
|
||||
referenced_symbols = dict()
|
||||
|
||||
for kfile in kconfig_files:
|
||||
defined, references = parse_kconfig_file(kfile)
|
||||
defined_features.extend(defined)
|
||||
defined_symbols.extend(defined)
|
||||
if ignore and re.match(ignore, kfile):
|
||||
# do not collect references for files that match the ignore pattern
|
||||
continue
|
||||
referenced_features[kfile] = references
|
||||
return (defined_features, referenced_features)
|
||||
referenced_symbols[kfile] = references
|
||||
return (defined_symbols, referenced_symbols)
|
||||
|
||||
|
||||
def parse_kconfig_file(kfile):
|
||||
"""Parse @kfile and update feature definitions and references."""
|
||||
"""Parse @kfile and update symbol definitions and references."""
|
||||
lines = []
|
||||
defined = []
|
||||
references = []
|
||||
@@ -427,7 +437,7 @@ def parse_kconfig_file(kfile):
|
||||
if not os.path.exists(kfile):
|
||||
return defined, references
|
||||
|
||||
with open(kfile, "r") as stream:
|
||||
with open(kfile, "r", encoding='utf-8', errors='replace') as stream:
|
||||
lines = stream.readlines()
|
||||
|
||||
for i in range(len(lines)):
|
||||
@@ -436,8 +446,8 @@ def parse_kconfig_file(kfile):
|
||||
line = line.split("#")[0] # ignore comments
|
||||
|
||||
if REGEX_KCONFIG_DEF.match(line):
|
||||
feature_def = REGEX_KCONFIG_DEF.findall(line)
|
||||
defined.append(feature_def[0])
|
||||
symbol_def = REGEX_KCONFIG_DEF.findall(line)
|
||||
defined.append(symbol_def[0])
|
||||
skip = False
|
||||
elif REGEX_KCONFIG_HELP.match(line):
|
||||
skip = True
|
||||
@@ -446,18 +456,18 @@ def parse_kconfig_file(kfile):
|
||||
pass
|
||||
elif REGEX_KCONFIG_STMT.match(line):
|
||||
line = REGEX_QUOTES.sub("", line)
|
||||
features = get_features_in_line(line)
|
||||
symbols = get_symbols_in_line(line)
|
||||
# multi-line statements
|
||||
while line.endswith("\\"):
|
||||
i += 1
|
||||
line = lines[i]
|
||||
line = line.strip('\n')
|
||||
features.extend(get_features_in_line(line))
|
||||
for feature in set(features):
|
||||
if REGEX_NUMERIC.match(feature):
|
||||
symbols.extend(get_symbols_in_line(line))
|
||||
for symbol in set(symbols):
|
||||
if REGEX_NUMERIC.match(symbol):
|
||||
# ignore numeric values
|
||||
continue
|
||||
references.append(feature)
|
||||
references.append(symbol)
|
||||
|
||||
return defined, references
|
||||
|
||||
|
||||
+75
-179
@@ -1,193 +1,89 @@
|
||||
#!/bin/sh
|
||||
#!/bin/awk -f
|
||||
# Before running this script please ensure that your PATH is
|
||||
# typical as you use for compilation/installation. I use
|
||||
# /bin /sbin /usr/bin /usr/sbin /usr/local/bin, but it may
|
||||
# differ on your system.
|
||||
#
|
||||
echo 'If some fields are empty or look unusual you may have an old version.'
|
||||
echo 'Compare to the current minimal requirements in Documentation/Changes.'
|
||||
echo ' '
|
||||
|
||||
uname -a
|
||||
echo ' '
|
||||
BEGIN {
|
||||
usage = "If some fields are empty or look unusual you may have an old version.\n"
|
||||
usage = usage "Compare to the current minimal requirements in Documentation/Changes.\n"
|
||||
print usage
|
||||
|
||||
gcc -dumpversion 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("GNU C\t\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
system("uname -a")
|
||||
printf("\n")
|
||||
|
||||
make --version 2>&1 |
|
||||
awk '/GNU Make/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("GNU Make\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
printversion("GNU C", version("gcc -dumpversion 2>&1"))
|
||||
printversion("GNU Make", version("make --version 2>&1"))
|
||||
printversion("Binutils", version("ld -v 2>&1"))
|
||||
printversion("Util-linux", version("mount --version 2>&1"))
|
||||
printversion("Mount", version("mount --version 2>&1"))
|
||||
printversion("Module-init-tools", version("depmod -V 2>&1"))
|
||||
printversion("E2fsprogs", version("tune2fs 2>&1"))
|
||||
printversion("Jfsutils", version("fsck.jfs -V 2>&1"))
|
||||
printversion("Reiserfsprogs", version("reiserfsck -V 2>&1"))
|
||||
printversion("Reiser4fsprogs", version("fsck.reiser4 -V 2>&1"))
|
||||
printversion("Xfsprogs", version("xfs_db -V 2>&1"))
|
||||
printversion("Pcmciautils", version("pccardctl -V 2>&1"))
|
||||
printversion("Pcmcia-cs", version("cardmgr -V 2>&1"))
|
||||
printversion("Quota-tools", version("quota -V 2>&1"))
|
||||
printversion("PPP", version("pppd --version 2>&1"))
|
||||
printversion("Isdn4k-utils", version("isdnctrl 2>&1"))
|
||||
printversion("Nfs-utils", version("showmount --version 2>&1"))
|
||||
|
||||
ld -v 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Binutils\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
mount --version 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
$0 = substr($0,RSTART,RLENGTH)
|
||||
printf("Util-linux\t\t%s\nMount\t\t\t%s\n",$0,$0)
|
||||
}'
|
||||
|
||||
depmod -V 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Module-init-tools\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
tune2fs 2>&1 |
|
||||
awk '/^tune2fs/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("E2fsprogs\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
fsck.jfs -V 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Jfsutils\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
reiserfsck -V 2>&1 |
|
||||
awk '/^reiserfsck/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Reiserfsprogs\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
fsck.reiser4 -V 2>&1 | grep ^fsck.reiser4 | awk \
|
||||
'NR==1{print "reiser4progs ", $2}'
|
||||
|
||||
xfs_db -V 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Xfsprogs\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
pccardctl -V 2>&1 |
|
||||
awk '/pcmciautils/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Pcmciautils\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
cardmgr -V 2>&1| grep version | awk \
|
||||
'NR==1{print "pcmcia-cs ", $3}'
|
||||
|
||||
quota -V 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Quota-tools\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
pppd --version 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("PPP\t\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
isdnctrl 2>&1 | grep version | awk \
|
||||
'NR==1{print "isdn4k-utils ", $NF}'
|
||||
|
||||
showmount --version 2>&1 | grep nfs-utils | awk \
|
||||
'NR==1{print "nfs-utils ", $NF}'
|
||||
|
||||
test -r /proc/self/maps &&
|
||||
sed '
|
||||
/.*libc-\(.*\)\.so$/!d
|
||||
s//Linux C Library\t\t\1/
|
||||
q
|
||||
' /proc/self/maps
|
||||
|
||||
ldd --version 2>&1 |
|
||||
awk '/^ldd/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Dynamic linker (ldd)\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
libcpp=`ldconfig -p 2>/dev/null |
|
||||
awk '/(libg|stdc)[+]+\.so/ {
|
||||
print $NF
|
||||
exit
|
||||
if (system("test -r /proc/self/maps") == 0) {
|
||||
while (getline <"/proc/self/maps" > 0) {
|
||||
n = split($0, procmaps, "/")
|
||||
if (/libc.*so$/ && match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
|
||||
ver = substr(procmaps[n], RSTART, RLENGTH)
|
||||
printversion("Linux C Library", ver)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
'`
|
||||
test -r "$libcpp" &&
|
||||
ls -l $libcpp |
|
||||
sed '
|
||||
s!.*so\.!!
|
||||
s!^!Linux C++ Library\t!
|
||||
'
|
||||
ps --version 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Procps\t\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
ifconfig --version 2>&1 |
|
||||
awk '/tools/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Net-tools\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
printversion("Dynamic linker (ldd)", version("ldd --version 2>&1"))
|
||||
|
||||
loadkeys -V 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
$0 = substr($0,RSTART,RLENGTH)
|
||||
printf("Kbd\t\t\t%s\nConsole-tools\t\t%s\n",$0,$0)
|
||||
}'
|
||||
while ("ldconfig -p 2>/dev/null" | getline > 0) {
|
||||
if (/(libg|stdc)[+]+\.so/) {
|
||||
libcpp = $NF
|
||||
break
|
||||
}
|
||||
}
|
||||
if (system("test -r " libcpp) == 0)
|
||||
printversion("Linux C++ Library", version("readlink " libcpp))
|
||||
|
||||
oprofiled --version 2>&1 | awk \
|
||||
'(NR==1 && ($2 == "oprofile")) {print "oprofile ", $3}'
|
||||
printversion("Procps", version("ps --version 2>&1"))
|
||||
printversion("Net-tools", version("ifconfig --version 2>&1"))
|
||||
printversion("Kbd", version("loadkeys -V 2>&1"))
|
||||
printversion("Console-tools", version("loadkeys -V 2>&1"))
|
||||
printversion("Oprofile", version("oprofiled --version 2>&1"))
|
||||
printversion("Sh-utils", version("expr --v 2>&1"))
|
||||
printversion("Udev", version("udevadm --version 2>&1"))
|
||||
printversion("Wireless-tools", version("iwconfig --version 2>&1"))
|
||||
|
||||
expr --v 2>&1 |
|
||||
awk '/^expr/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Sh-utils\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
udevadm --version 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Udev\t\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
iwconfig --version 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Wireless-tools\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
test -e /proc/modules &&
|
||||
sort /proc/modules |
|
||||
sed '
|
||||
s/ .*//
|
||||
H
|
||||
${
|
||||
g
|
||||
s/^\n/Modules Loaded\t\t/
|
||||
y/\n/ /
|
||||
q
|
||||
if (system("test -r /proc/modules") == 0) {
|
||||
while ("sort /proc/modules" | getline > 0) {
|
||||
mods = mods sep $1
|
||||
sep = " "
|
||||
}
|
||||
printversion("Modules Loaded", mods)
|
||||
}
|
||||
}
|
||||
|
||||
function version(cmd, ver) {
|
||||
while (cmd | getline > 0) {
|
||||
if (!/ver_linux/ && match($0, /[0-9]+([.]?[0-9]+)+/)) {
|
||||
ver = substr($0, RSTART, RLENGTH)
|
||||
break
|
||||
}
|
||||
}
|
||||
close(cmd)
|
||||
return ver
|
||||
}
|
||||
|
||||
function printversion(name, value, ofmt) {
|
||||
if (value != "") {
|
||||
ofmt = "%-20s\t%s\n"
|
||||
printf(ofmt, name, value)
|
||||
}
|
||||
}
|
||||
d
|
||||
'
|
||||
|
||||
Reference in New Issue
Block a user