diff options
Diffstat (limited to 'support')
| -rwxr-xr-x | support/dependencies/dependencies.sh | 10 | ||||
| -rw-r--r-- | support/kconfig/confdata.c | 2 | ||||
| -rw-r--r-- | support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch | 2 | ||||
| -rwxr-xr-x | support/scripts/mkusers | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 5739ee03be..0e7e1fa047 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -167,8 +167,8 @@ if test "${missing_progs}" = "yes" ; then exit 1 fi -if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BUILDROOT_CONFIG > /dev/null && \ - grep ^BR2_ENABLE_LOCALE=y $BUILDROOT_CONFIG > /dev/null ; then +if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BR2_CONFIG > /dev/null && \ + grep ^BR2_ENABLE_LOCALE=y $BR2_CONFIG > /dev/null ; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" @@ -181,7 +181,7 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BUILDROOT_CONFIG > /dev/null && \ fi fi -if grep -q ^BR2_PACKAGE_CLASSPATH=y $BUILDROOT_CONFIG ; then +if grep -q ^BR2_PACKAGE_CLASSPATH=y $BR2_CONFIG ; then for prog in javac jar; do if ! which $prog > /dev/null ; then echo >&2 @@ -191,7 +191,7 @@ if grep -q ^BR2_PACKAGE_CLASSPATH=y $BUILDROOT_CONFIG ; then done fi -if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then +if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG ; then if test ! -f /lib/ld-linux.so.2 ; then echo echo "Your Buildroot configuration uses pre-built tools for the x86 architecture," @@ -205,7 +205,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then fi fi -if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BUILDROOT_CONFIG ; then +if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then if ! echo "int main(void) {}" | gcc -m32 -x c - -o /dev/null ; then echo echo "Your Buildroot configuration needs a compiler capable of building 32 bits binaries." 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"; } diff --git a/support/scripts/mkusers b/support/scripts/mkusers index 3b287b8a9a..a67356ab6d 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -39,7 +39,7 @@ GROUP="${TARGET_DIR}/etc/group" # with /etc/group, so any use of gshadow must be conditional. GSHADOW="${TARGET_DIR}/etc/gshadow" -# We can't simply source ${BUILDROOT_CONFIG} as it may contains constructs +# We can't simply source ${BR2_CONFIG} as it may contains constructs # such as: # BR2_DEFCONFIG="$(CONFIG_DIR)/defconfig" # which when sourced from a shell script will eventually try to execute @@ -48,7 +48,7 @@ GSHADOW="${TARGET_DIR}/etc/gshadow" # So, we have to scan that file instead. Sigh... :-( PASSWD_METHOD="$( sed -r -e '/^BR2_TARGET_GENERIC_PASSWD_METHOD="(.*)"$/!d;' \ -e 's//\1/;' \ - "${BUILDROOT_CONFIG}" \ + "${BR2_CONFIG}" \ )" #---------------------------------------------------------------------------- |
