Commit 6768021c authored by Arnout Vandecappelle's avatar Arnout Vandecappelle Committed by Peter Korsgaard
Browse files

infra: replace BUILDROOT_DL_DIR with BR2_DL_DIR. 



To make the naming consistent (all user-visible options should be
prefixed BR2_).

An entry is added to Makefile.legacy to warn users who have set
BUILDROOT_DL_DIR but not BR2_DL_DIR.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 674fd4f8

Config.in

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ config BR2_DL_DIR 
	default "$(TOPDIR)/dl"

	help

	  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

Makefile

+7 −0
Original line number Diff line number Diff line
@@ -121,6 +121,13 @@ else 
  $(shell echo BR2_EXTERNAL ?= $(BR2_EXTERNAL) > $(BR2_EXTERNAL_FILE))

endif



# To make sure the the environment variable overrides the .config option,

# set this before including .config.

ifneq ($(BR2_DL_DIR),)

DL_DIR := $(BR2_DL_DIR)

endif





# Need that early, before we scan packages

# Avoids doing the $(or...) everytime

BR2_GRAPH_OUT := $(or $(GRAPH_OUT),pdf)

Makefile.legacy

+16 −0
Original line number Diff line number Diff line
@@ -12,6 +12,22 @@ ifeq ($(BR2_LEGACY),y) 
$(error "You have legacy configuration in your .config! Please check your configuration.")

endif



#

# 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.

ifneq ($(BUILDROOT_DL_DIR),)

ifneq ($(BUILDROOT_DL_DIR),$(DL_DIR))

$(error "The BUILDROOT_DL_DIR environment variable was renamed to BR2_DL_DIR.")

endif

endif



#

# Legacy options from 2012.08

#

docs/manual/common-usage.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

docs/manual/download-location.txt

+4 −4
Original line number Diff line number Diff line
@@ -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+

environment variable.
 
+BR2_DL_DIR+ option. Unlike most options in the .config file, this value

is overridden by the +BR2_DL_DIR+ environment variable.