Skip to content

S
Software for White Rabbit PTP Core
Commit 5fda0c85 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

kconfig: use pathnames from Linux-2.6.34 

This undoes some differences between the upstream 2.6.34 kconfig and
the bst-kconfig out-of-tree port. This basically adds back
include/config/ and include/generated/ .
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 89cdfcd5
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
scripts/kconfig/confdata.c
View file @ 5fda0c85
...@@ -45,7 +45,7 @@ const char *conf_get_autoconfig_name(void) ...@@ -45,7 +45,7 @@ const char *conf_get_autoconfig_name(void)
{ {
char *name = getenv("KCONFIG_AUTOCONFIG"); char *name = getenv("KCONFIG_AUTOCONFIG");
return name ? name : "include/auto.conf"; return name ? name : "include/config/auto.conf";
} }
static char *conf_expand_value(const char *in) static char *conf_expand_value(const char *in)
...@@ -567,7 +567,7 @@ static int conf_split_config(void) ...@@ -567,7 +567,7 @@ static int conf_split_config(void)
name = conf_get_autoconfig_name(); name = conf_get_autoconfig_name();
conf_read_simple(name, S_DEF_AUTO); conf_read_simple(name, S_DEF_AUTO);
if (chdir("include")) if (chdir("include/config"))
return 1; return 1;
res = 0; res = 0;
...@@ -661,7 +661,7 @@ static int conf_split_config(void) ...@@ -661,7 +661,7 @@ static int conf_split_config(void)
close(fd); close(fd);
} }
out: out:
if (chdir("..")) if (chdir("../.."))
return 1; return 1;
return res; return res;
...@@ -678,7 +678,7 @@ int conf_write_autoconf(void) ...@@ -678,7 +678,7 @@ int conf_write_autoconf(void)
sym_clear_all_valid(); sym_clear_all_valid();
file_write_dep("include/auto.conf.cmd"); file_write_dep("include/config/auto.conf.cmd");
if (conf_split_config()) if (conf_split_config())
return 1; return 1;
...@@ -784,12 +784,12 @@ int conf_write_autoconf(void) ...@@ -784,12 +784,12 @@ int conf_write_autoconf(void)
name = getenv("KCONFIG_AUTOHEADER"); name = getenv("KCONFIG_AUTOHEADER");
if (!name) if (!name)
name = "include/autoconf.h"; name = "include/generated/autoconf.h";
if (rename(".tmpconfig.h", name)) if (rename(".tmpconfig.h", name))
return 1; return 1;
name = getenv("KCONFIG_TRISTATE"); name = getenv("KCONFIG_TRISTATE");
if (!name) if (!name)
name = "include/tristate.conf"; name = "include/config/tristate.conf";
if (rename(".tmpconfig_tristate", name)) if (rename(".tmpconfig_tristate", name))
return 1; return 1;
name = conf_get_autoconfig_name(); name = conf_get_autoconfig_name();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment