From 7b498d9838e68eb0b58450ec54ed968e7848c8e0 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 14 Nov 2007 19:41:08 +0100
Subject: [makesystem] reworked default environment handling

This patch improves the default environment handling, now the makesystem
bails out if the default environment path is empty or points to an
invalid directory (with activated default environment). It also fixes
this error:

find: invalid predicate `'

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 Makefile        | 16 ++++++++++++++++
 common/Makefile | 17 ++++++++---------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 6e785bba78..19a908355f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,22 @@ SUBLEVEL = 0
 EXTRAVERSION =-git
 NAME = Homicidal Dwarf Hamster
 
+#
+# sanity checks for check default environemnt
+#
+ifdef CONFIG_DEFAULT_ENVIRONMENT
+
+ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_PATH),"")
+$(error default environment path empty))
+endif
+
+saved-env_path := $(CONFIG_DEFAULT_ENVIRONMENT_PATH)
+CONFIG_DEFAULT_ENVIRONMENT_PATH := $(shell cd $(CONFIG_DEFAULT_ENVIRONMENT_PATH) && /bin/pwd)
+$(if $(CONFIG_DEFAULT_ENVIRONMENT_PATH),, \
+	$(error default environment path $(saved-env_path) does not exist))
+
+endif # ifdef CONFIG_DEFAULT_ENVIRONMENT
+
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
 # More info can be located in ./README
diff --git a/common/Makefile b/common/Makefile
index 11d4ae5166..33d302c222 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -19,14 +19,13 @@ obj-y += memsize.o
 obj-$(CONFIG_MODULES) += module.o
 extra-$(CONFIG_MODULES) += module.lds
 
-ifdef CONFIG_DEFAULT_ENVIRONMENT_PATH
-
-startup.o: include/uboot_default_env.h
-
-include/uboot_default_env.h: $(shell find $(CONFIG_DEFAULT_ENVIRONMENT_PATH) -type f)
-	$(Q)scripts/ubootenv -s $(CONFIG_DEFAULT_ENVIRONMENT_PATH) uboot_default_env
-	$(Q)cat uboot_default_env | scripts/bin2c default_environment > $@
-
+ifdef CONFIG_DEFAULT_ENVIRONMENT
+$(obj)/startup.o: include/uboot_default_env.h
 $(obj)/env.o: include/uboot_default_env.h
-endif
 
+ENV_FILES := $(shell find $(CONFIG_DEFAULT_ENVIRONMENT_PATH))
+endif # ifdef CONFIG_DEFAULT_ENVIRONMENT
+
+include/uboot_default_env.h: $(ENV_FILES)
+	$(Q)scripts/ubootenv -s $(CONFIG_DEFAULT_ENVIRONMENT_PATH) | \
+		scripts/bin2c default_environment > $@
-- 
cgit v1.2.3