diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-06-06 17:49:05 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-06-12 09:30:00 +0200 |
| commit | 09b7ecf5deff6ef8f577e802423bc45d9b979d1f (patch) | |
| tree | 1a12bd858aee855ffe5ce21c1fbad7f48859cf32 /rules/barebox.make | |
| parent | 4e87252770794aaaaacc3fefe55f30bc77208977 (diff) | |
| download | ptxdist-09b7ecf5deff6ef8f577e802423bc45d9b979d1f.tar.gz ptxdist-09b7ecf5deff6ef8f577e802423bc45d9b979d1f.tar.xz | |
barebox: support multiple entires in BAREBOX_EXTRA_ENV_PATH
BAREBOX_EXTRA_ENV_PATH can now contain multiple file and directory entries.
The are added in specified order.
In addition, dependencies are added to rebuild the environment when any of
the files change.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/barebox.make')
| -rw-r--r-- | rules/barebox.make | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/rules/barebox.make b/rules/barebox.make index 317d1e569..5bb8124e8 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -63,6 +63,11 @@ $(BAREBOX_CONFIG): @exit 1 endif +ifdef PTXCONF_BAREBOX_EXTRA_ENV_PATH +$(STATEDIR)/barebox.prepare: $(call remove_quotes,$(PTXCONF_BAREBOX_EXTRA_ENV_PATH)) +$(STATEDIR)/barebox.prepare: $(shell find $(call remove_quotes,$(PTXCONF_BAREBOX_EXTRA_ENV_PATH)) -print 2>/dev/null) +endif + $(STATEDIR)/barebox.prepare: $(BAREBOX_CONFIG) @$(call targetinfo) @@ -73,8 +78,13 @@ ifdef PTXCONF_BAREBOX_EXTRA_ENV @rm -rf $(BAREBOX_DIR)/.ptxdist-defaultenv @ptxd_source_kconfig "${PTXDIST_PTXCONFIG}" && \ ptxd_source_kconfig "${PTXDIST_PLATFORMCONFIG}" && \ - ptxd_filter_dir "$(PTXCONF_BAREBOX_EXTRA_ENV_PATH)" \ - $(BAREBOX_DIR)/.ptxdist-defaultenv + $(foreach path, $(call remove_quotes,$(PTXCONF_BAREBOX_EXTRA_ENV_PATH)), \ + if [ -d "$(path)" ]; then \ + ptxd_filter_dir "$(path)" \ + $(BAREBOX_DIR)/.ptxdist-defaultenv; \ + else \ + cp "$(path)" $(BAREBOX_DIR)/.ptxdist-defaultenv/; \ + fi;) @sed -i -e "s,^\(CONFIG_DEFAULT_ENVIRONMENT_PATH=.*\)\"$$,\1 .ptxdist-defaultenv\"," \ $(BAREBOX_DIR)/.config endif |