diff options
| author | Ulf Magnusson <ulfalizer@gmail.com> | 2018-05-27 04:50:06 +0200 |
|---|---|---|
| committer | Ulf Magnusson <ulfalizer@gmail.com> | 2018-05-27 04:59:33 +0200 |
| commit | 7427079f008155f0901a5d53f9f1d4175381a585 (patch) | |
| tree | 77d3ab7fe3264e20fc9fbf6bfd6440f72791d47c /kconfiglib.py | |
| parent | 1c81db1a573b930f80df176ef3012b6159e0598a (diff) | |
Get rid of the predefined UNAME_RELEASE symbol
Commit cbf32e2 ("Expand environment variables in strings directly")
added direct expansion of environment variables is strings, with commit
b9384a1 ("Restore compatibility with $UNAME_RELEASE") adding a hack to
restore compatibility with the predefined $UNAME_RELEASE symbol, used by
DEFCONFIG_LIST in the Linux kernel.
With the compatibility hack in place, there's no longer any need to
define UNAME_RELEASE as a proper symbol. Remove it.
Diffstat (limited to 'kconfiglib.py')
| -rw-r--r-- | kconfiglib.py | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/kconfiglib.py b/kconfiglib.py index 99635fe..99c75d0 100644 --- a/kconfiglib.py +++ b/kconfiglib.py @@ -658,17 +658,6 @@ class Kconfig(object): self.modules = self._lookup_sym("MODULES") self.defconfig_list = None - # The only predefined symbol besides n/m/y. DEFCONFIG_LIST uses this as - # of writing. - uname_sym = self._lookup_const_sym("UNAME_RELEASE") - uname_sym.orig_type = STRING - # env_var doubles as the SYMBOL_AUTO flag from the C implementation, so - # just set it to something. The naming breaks a bit here. - uname_sym.env_var = "<uname release>" - uname_sym.defaults.append( - (self._lookup_const_sym(platform.uname()[2]), self.y)) - self.syms["UNAME_RELEASE"] = uname_sym - self.top_node = MenuNode() self.top_node.kconfig = self self.top_node.item = MENU @@ -2880,9 +2869,6 @@ class Symbol(object): 'option env="FOO"' acts like a 'default' property whose value is the value of $FOO. - env_var is set to "<uname release>" for the predefined symbol - UNAME_RELEASE, which holds the 'release' field from uname. - Symbols with 'option env' are never written out to .config files, even if they are visible. env_var corresponds to a flag called SYMBOL_AUTO in the C implementation. @@ -4537,8 +4523,8 @@ def _make_depend_on(sym, expr): "expression with token stream {}.".format(expr)) def _expand(s): - # The predefined UNAME_RELEASE symbol is expanded in one of the 'default's - # of the DEFCONFIG_LIST symbol in the Linux kernel. This function maintains + # A predefined UNAME_RELEASE symbol is expanded in one of the 'default's of + # the DEFCONFIG_LIST symbol in the Linux kernel. This function maintains # compatibility with it even though environment variables in strings are # now expanded directly. |