kconfig: reference environment variables directly and remove 'option env='

To get access to environment variables, Kconfig needs to define a
symbol using "option env=" syntax.  It is tedious to add a symbol entry
for each environment variable given that we need to define much more
such as 'CC', 'AS', 'srctree' etc. to evaluate the compiler capability
in Kconfig.

Adding '$' for symbol references is grammatically inconsistent.
Looking at the code, the symbols prefixed with 'S' are expanded by:
 - conf_expand_value()
   This is used to expand 'arch/$ARCH/defconfig' and 'defconfig_list'
 - sym_expand_string_value()
   This is used to expand strings in 'source' and 'mainmenu'

All of them are fixed values independent of user configuration.  So,
they can be changed into the direct expansion instead of symbols.

This change makes the code much cleaner.  The bounce symbols 'SRCARCH',
'ARCH', 'SUBARCH', 'KERNELVERSION' are gone.

sym_init() hard-coding 'UNAME_RELEASE' is also gone.  'UNAME_RELEASE'
should be replaced with an environment variable.

ARCH_DEFCONFIG is a normal symbol, so it should be simply referenced
without '$' prefix.

The new syntax is addicted by Make.  The variable reference needs
parentheses, like $(FOO), but you can omit them for single-letter
variables, like $F.  Yet, in Makefiles, people tend to use the
parenthetical form for consistency / clarification.

At this moment, only the environment variable is supported, but I will
extend the concept of 'variable' later on.

The variables are expanded in the lexer so we can simplify the token
handling on the parser side.

For example, the following code works.

[Example code]

  config MY_TOOLCHAIN_LIST
          string
          default "My tools: CC=$(CC), AS=$(AS), CPP=$(CPP)"

[Result]

  $ make -s alldefconfig && tail -n 1 .config
  CONFIG_MY_TOOLCHAIN_LIST="My tools: CC=gcc, AS=as, CPP=gcc -E"

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Kees Cook <keescook@chromium.org>

1 files changed, 12 insertions, 17 deletions

diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index c6f6e21b809f..703ee4904613 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -34,8 +34,6 @@ struct file *file_lookup(const char *name)
 /* write a dependency file as used by kbuild to track dependencies */
 int file_write_dep(const char *name)
 {
-        struct symbol *sym, *env_sym;
-        struct expr *e;
         struct file *file;
         FILE *out;
 
@@ -54,21 +52,7 @@ int file_write_dep(const char *name)
         fprintf(out, "\n%s: \\\n"
                      "\t$(deps_config)\n\n", conf_get_autoconfig_name());
 
-        expr_list_for_each_sym(sym_env_list, e, sym) {
-                struct property *prop;
-                const char *value;
-
-                prop = sym_get_env_prop(sym);
-                env_sym = prop_get_symbol(prop);
-                if (!env_sym)
-                        continue;
-                value = getenv(env_sym->name);
-                if (!value)
-                        value = "";
-                fprintf(out, "ifneq \"$(%s)\" \"%s\"\n", env_sym->name, value);
-                fprintf(out, "%s: FORCE\n", conf_get_autoconfig_name());
-                fprintf(out, "endif\n");
-        }
+        env_write_dep(out, conf_get_autoconfig_name());
 
         fprintf(out, "\n$(deps_config): ;\n");
         fclose(out);
@@ -165,3 +149,14 @@ char *xstrdup(const char *s)
         fprintf(stderr, "Out of memory.\n");
         exit(1);
 }
+
+char *xstrndup(const char *s, size_t n)
+{
+        char *p;
+
+        p = strndup(s, n);
+        if (p)
+                return p;
+        fprintf(stderr, "Out of memory.\n");
+        exit(1);
+}