summaryrefslogtreecommitdiffstats
path: root/rules/barebox.make
diff options
context:
space:
mode:
Diffstat (limited to 'rules/barebox.make')
-rw-r--r--rules/barebox.make14
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