From 6768021c930fe5f7753f274436506792f87ce4da Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Tue, 4 Feb 2014 16:18:51 +0100 Subject: 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: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Makefile.legacy | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'Makefile.legacy') diff --git a/Makefile.legacy b/Makefile.legacy index e0b7ec29c..4954398c5 100644 --- a/Makefile.legacy +++ b/Makefile.legacy @@ -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 # -- cgit v1.2.3