aboutsummaryrefslogtreecommitdiff
path: root/support/kconfig
diff options
context:
space:
mode:
authorGravatar Arnout Vandecappelle <arnout@mind.be>2014-02-04 16:18:52 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-02-09 17:00:13 +0100
commit4113b3c3bdb9c7943e011827982000403f66dc61 (patch)
treef4d52eb74841c6f925ca0a200f7cd0fc9fce454c /support/kconfig
parenta7c1b84a5967e88be8032ef085c2d84aafc0008a (diff)
downloadbuildroot-4113b3c3bdb9c7943e011827982000403f66dc61.tar.gz
buildroot-4113b3c3bdb9c7943e011827982000403f66dc61.tar.bz2
infra: replace BUILDROOT_CONFIG with BR2_CONFIG
To make the naming consistent (all user-visible options should be prefixed with BR2_). An entry is added to Makefile.legacy to warn users who have set BUILDROOT_CONFIG but not BR2_CONFIG. Still export BUILDROOT_CONFIG but pointing to some phony value, to make sure that scripts that still use it fail in a predictable way. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Jérémy Rosen <jeremy.rosen@openwide.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'support/kconfig')
-rw-r--r--support/kconfig/confdata.c2
-rw-r--r--support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/support/kconfig/confdata.c b/support/kconfig/confdata.c
index 4b41fe6291..2371fa8179 100644
--- a/support/kconfig/confdata.c
+++ b/support/kconfig/confdata.c
@@ -64,7 +64,7 @@ static void conf_message(const char *fmt, ...)
const char *conf_get_configname(void)
{
- char *name = getenv("BUILDROOT_CONFIG");
+ char *name = getenv("BR2_CONFIG");
return name ? name : ".config";
}
diff --git a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
index 6f545e275c..ecfe76b6e2 100644
--- a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
+++ b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
@@ -88,7 +88,7 @@ Index: kconfig/confdata.c
const char *conf_get_configname(void)
{
- char *name = getenv("KCONFIG_CONFIG");
-+ char *name = getenv("BUILDROOT_CONFIG");
++ char *name = getenv("BR2_CONFIG");
return name ? name : ".config";
}