From c7a661f59d9885b20319a5074f602716a9f603a1 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 29 Jul 2013 19:22:57 -0700 Subject: [PATCH] backports: enable kconfig language on dependencies file Certain complex features that are backported may be be limitted to a certain target build configuration. An example can be if a backported feature is not yet backported with support for lockdep. In order to avoid build failures with these types of restrictions allow for specifying build configuration dependencies on backported upstream kconfig symbols other than just kernel versioning contstraints. This adds support for specifying upstream kconfig constaints other than kernel versioning by adding kconfig language extensions on the dependencies file. This will update the copied over upstream Kconfig file for the symbol specified with the kconfig constraints specified. Signed-off-by: Luis R. Rodriguez --- gentree.py | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/gentree.py b/gentree.py index b6c98e806882..c480c98be681 100755 --- a/gentree.py +++ b/gentree.py @@ -41,20 +41,35 @@ def read_dependencies(depfilename): """ Read a (the) dependency file and return the list of dependencies as a dictionary, mapping a Kconfig symbol - to a list of kernel version dependencies. While reading - ignore blank/commented lines. + to a list of kernel version dependencies. + + If a backported feature that an upstream backported driver + depends on had kconfig limitations (ie, debugging feature not + available) a built constaint restriction can be expressed + by using a kconfig expression. The kconfig expressions can + be specified by using the "kconfig: " prefix. + + While reading ignore blank or commented lines. """ ret = {} depfile = open(depfilename, 'r') for item in depfile: + kconfig_exp = "" item = item.strip() if not item or item[0] == '#': continue - sym, dep = item.split() - if not sym in ret: - ret[sym] = [dep, ] + if "kconfig:" in item: + sym, kconfig_exp = item.split(" ", 1) + if not sym in ret: + ret[sym] = [kconfig_exp, ] + else: + ret[sym].append(kconfig_exp) else: - ret[sym].append(dep) + sym, dep = item.split() + if not sym in ret: + ret[sym] = [dep, ] + else: + ret[sym].append(dep) return ret @@ -513,7 +528,10 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None, for sym in tuple(deplist.keys()): new = [] for dep in deplist[sym]: - if dep == "DISABLE": + if "kconfig:" in dep: + kconfig_expr = dep.replace('kconfig: ', '') + new.append(kconfig_expr) + elif (dep == "DISABLE"): new.append('BACKPORT_DISABLED_KCONFIG_OPTION') else: new.append('!BACKPORT_KERNEL_%s' % dep.replace('.', '_')) -- 2.30.2