[Buildroot] [PATCH 2/4] Makefile: internally use absolute paths to BR2_EXTERNAL
Yann E. MORIN
yann.morin.1998 at free.fr
Sat Feb 8 16:04:03 UTC 2014
From: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Using a relative path for BR2_EXTERNAL, and using an external defconfig,
such as in (from a Buildroot top-dir):
make O=.. BR2_EXTERNAL=.. foo_defconfig
is broken. It is unclear why the %_defconfig rule recurses in that case.
This patch internaly makes BR2_EXTERNAL canonical (ie. makes it an absolute
path), and checks the directory exists.
Reported-by: Jérémy Rosen <jeremy.rosen at openwide.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Cc: Peter Korsgaard <jacmet at uclibc.org>
Cc: Romain Naour <romain.naour at openwide.fr>
Cc: Arnout Vandecappelle <arnout at mind.be>
---
Changes v1->v2:
- fix override BR2_EXTERNAL (Jérémy)
- only one error message (Arnout)
---
Makefile | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Makefile b/Makefile
index fceb2e8..142c78f 100644
--- a/Makefile
+++ b/Makefile
@@ -118,6 +118,11 @@ ifeq ($(BR2_EXTERNAL),)
override BR2_EXTERNAL = support/dummy-external
$(shell rm -f $(BR2_EXTERNAL_FILE))
else
+ _BR2_EXTERNAL = $(shell cd $(BR2_EXTERNAL) >/dev/null 2>&1 && pwd)
+ ifeq ($(_BR2_EXTERNAL),)
+ $(error BR2_EXTERNAL='$(BR2_EXTERNAL)' does not exist, relatively to $(TOPDIR))
+ endif
+ override BR2_EXTERNAL := $(_BR2_EXTERNAL)
$(shell echo BR2_EXTERNAL ?= $(BR2_EXTERNAL) > $(BR2_EXTERNAL_FILE))
endif
--
1.8.1.2
More information about the buildroot
mailing list