|
@@ -41,7 +41,7 @@ Index: config/confdata.c
|
|
dirname[0] = 0;
|
|
dirname[0] = 0;
|
|
if (name && name[0]) {
|
|
if (name && name[0]) {
|
|
struct stat st;
|
|
struct stat st;
|
|
-@@ -656,6 +657,7 @@
|
|
|
|
|
|
+@@ -658,6 +659,7 @@
|
|
{
|
|
{
|
|
const char *name;
|
|
const char *name;
|
|
char path[128];
|
|
char path[128];
|
|
@@ -49,7 +49,7 @@ Index: config/confdata.c
|
|
char *s, *d, c;
|
|
char *s, *d, c;
|
|
struct symbol *sym;
|
|
struct symbol *sym;
|
|
struct stat sb;
|
|
struct stat sb;
|
|
-@@ -664,8 +666,20 @@
|
|
|
|
|
|
+@@ -666,8 +668,20 @@
|
|
name = conf_get_autoconfig_name();
|
|
name = conf_get_autoconfig_name();
|
|
conf_read_simple(name, S_DEF_AUTO);
|
|
conf_read_simple(name, S_DEF_AUTO);
|
|
|
|
|
|
@@ -72,7 +72,7 @@ Index: config/confdata.c
|
|
|
|
|
|
res = 0;
|
|
res = 0;
|
|
for_all_symbols(i, sym) {
|
|
for_all_symbols(i, sym) {
|
|
-@@ -758,9 +772,11 @@
|
|
|
|
|
|
+@@ -760,9 +774,11 @@
|
|
close(fd);
|
|
close(fd);
|
|
}
|
|
}
|
|
out:
|
|
out:
|
|
@@ -87,7 +87,7 @@ Index: config/confdata.c
|
|
return res;
|
|
return res;
|
|
}
|
|
}
|
|
|
|
|
|
-@@ -772,25 +788,38 @@
|
|
|
|
|
|
+@@ -774,25 +790,38 @@
|
|
FILE *out, *tristate, *out_h;
|
|
FILE *out, *tristate, *out_h;
|
|
time_t now;
|
|
time_t now;
|
|
int i;
|
|
int i;
|
|
@@ -130,7 +130,7 @@ Index: config/confdata.c
|
|
if (!out_h) {
|
|
if (!out_h) {
|
|
fclose(out);
|
|
fclose(out);
|
|
fclose(tristate);
|
|
fclose(tristate);
|
|
-@@ -811,8 +840,7 @@
|
|
|
|
|
|
+@@ -815,8 +844,7 @@
|
|
fprintf(out_h, "/*\n"
|
|
fprintf(out_h, "/*\n"
|
|
" * Automatically generated C config: don't edit\n"
|
|
" * Automatically generated C config: don't edit\n"
|
|
" * %s"
|
|
" * %s"
|
|
@@ -140,7 +140,7 @@ Index: config/confdata.c
|
|
ctime(&now));
|
|
ctime(&now));
|
|
|
|
|
|
for_all_symbols(i, sym) {
|
|
for_all_symbols(i, sym) {
|
|
-@@ -866,19 +894,22 @@
|
|
|
|
|
|
+@@ -870,19 +898,22 @@
|
|
name = getenv("KCONFIG_AUTOHEADER");
|
|
name = getenv("KCONFIG_AUTOHEADER");
|
|
if (!name)
|
|
if (!name)
|
|
name = "include/generated/autoconf.h";
|
|
name = "include/generated/autoconf.h";
|