@@ -126,7 +126,7 @@ config BR2_DL_DIR
Directory to store all the source files that we need to fetch.
- If the Linux shell environment has defined the BUILDROOT_DL_DIR
+ If the Linux shell environment has defined the BR2_DL_DIR
environment variable, then this overrides this configuration item.
The default is $(TOPDIR)/dl
@@ -121,6 +121,13 @@ else
$(shell echo BR2_EXTERNAL ?= $(BR2_EXTERNAL) > $(BR2_EXTERNAL_FILE))
+# To make sure the the environment variable overrides the .config option,
+# set this before including .config.
+DL_DIR := $(BR2_DL_DIR)
# Need that early, before we scan packages
# Avoids doing the $(or...) everytime
BR2_GRAPH_OUT := $(or $(GRAPH_OUT),pdf)
@@ -13,6 +13,22 @@ $(error "You have legacy configuration in your .config! Please check your config
+# Legacy options from 2014.02
+# The BUILDROOT_DL_DIR environment variable was renamed by BR2_DL_DIR. We
+# want to detect someone using the old variable, _except_ if also the new
+# variable was set. By the time we get here, however, we no longer have
+# access to the BR2_DL_DIR environment variable (because it has been overridden
+# by the .config inclusion). However, the environment variable (if defined) was
+# saved in DL_DIR, so we can use that.
+$(error "The BUILDROOT_DL_DIR environment variable was renamed to BR2_DL_DIR.")
# Legacy options from 2012.08
@@ -80,7 +80,7 @@ to +make+ or set in the environment:
configuration interface, so through the Buildroot +.config+ file; this
is the recommended way of setting it.
-* +BUILDROOT_DL_DIR+ to override the directory in which
+* +BR2_DL_DIR+ to override the directory in which
Buildroot stores/retrieves downloaded files
Note that the Buildroot download directory can also be set from the
@@ -13,14 +13,14 @@ filesystem with exactly the same versions.
If you maintain several Buildroot trees, it might be better to have a
shared download location. This can be achieved by pointing the
-+BUILDROOT_DL_DIR+ environment variable to a directory. If this is
++BR2_DL_DIR+ environment variable to a directory. If this is
set, then the value of +BR2_DL_DIR+ in the Buildroot configuration is
overridden. The following line should be added to +<~/.bashrc>+.
- $ export BUILDROOT_DL_DIR <shared download location>
+ $ export BR2_DL_DIR <shared download location>
The download location can also be set in the +.config+ file, with the
-+BR2_DL_DIR+ option. This value is overridden by the +BUILDROOT_DL_DIR+
++BR2_DL_DIR+ option. Unlike most options in the .config file, this value
+is overridden by the +BR2_DL_DIR+ environment variable.
@@ -23,13 +23,8 @@ LOCALFILES := $(call qstrip,$(BR2_LOCALFILES))
# external-deps target.
-# Override BR2_DL_DIR if shell variable defined
-DL_DIR := $(BUILDROOT_DL_DIR)
-DL_DIR := $(call qstrip,$(BR2_DL_DIR))
+# DL_DIR may have been set already from the environment
+DL_DIR ?= $(call qstrip,$(BR2_DL_DIR))
DL_DIR := $(TOPDIR)/dl