summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2007-09-23 16:12:58 +0200
committerBernhard Reutner-Fischer2007-09-23 16:12:58 +0200
commit54cf1e72f4c37d7351514ef96df1980b32291a43 (patch)
treee598e9bb181160e4c0a5a5a892553f8a662aae7c /package
parent- pull kbuild from 2.6.22.7. This should fix the ncurses detection for dylib ... (diff)
downloadbuildroot-54cf1e72f4c37d7351514ef96df1980b32291a43.tar.gz
buildroot-54cf1e72f4c37d7351514ef96df1980b32291a43.tar.xz
buildroot-54cf1e72f4c37d7351514ef96df1980b32291a43.zip
- search env for BUILDROOT_CONFIG for use as a config file; defaults to .config
Diffstat (limited to 'package')
-rw-r--r--package/config/confdata.c2
-rw-r--r--package/config/kconfig-to-buildroot2.patch11
2 files changed, 12 insertions, 1 deletions
diff --git a/package/config/confdata.c b/package/config/confdata.c
index 0098a08ee..f604916b4 100644
--- a/package/config/confdata.c
+++ b/package/config/confdata.c
@@ -37,7 +37,7 @@ static void conf_warning(const char *fmt, ...)
const char *conf_get_configname(void)
{
- char *name = getenv("KCONFIG_CONFIG");
+ char *name = getenv("BUILDROOT_CONFIG");
return name ? name : ".config";
}
diff --git a/package/config/kconfig-to-buildroot2.patch b/package/config/kconfig-to-buildroot2.patch
index 7e478816e..01701d832 100644
--- a/package/config/kconfig-to-buildroot2.patch
+++ b/package/config/kconfig-to-buildroot2.patch
@@ -1292,3 +1292,14 @@ diff -rdup kernel-config/zconf.y config/zconf.y
"\t$(deps_config)\n\n"
"$(deps_config): ;\n");
fclose(out);
+--- kernel-config/confdata.c 2007-09-23 15:33:26.000000000 +0200
++++ config/confdata.c 2007-09-23 16:10:52.000000000 +0200
+@@ -37,7 +37,7 @@
+
+ const char *conf_get_configname(void)
+ {
+- char *name = getenv("KCONFIG_CONFIG");
++ char *name = getenv("BUILDROOT_CONFIG");
+
+ return name ? name : ".config";
+ }