Since barebox v2012.10.0, barebox_default_env has moved to common/.
Signed-off-by: Jan Luebbe <[email protected]>
---
rules/barebox.make | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/rules/barebox.make b/rules/barebox.make
index d16abda..ae00503 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -125,7 +125,11 @@ ifdef PTXCONF_BAREBOX_BAREBOXENV
@$(call install_finish, barebox)
endif
@install -D -m644 $(BAREBOX_DIR)/barebox.bin $(IMAGEDIR)/barebox-image
- @install -D -m644 $(BAREBOX_DIR)/barebox_default_env
$(IMAGEDIR)/barebox-default-environment
+ @if [ -e $(BAREBOX_DIR)/common/barebox_default_env ]; then \
+ install -D -m644 $(BAREBOX_DIR)/common/barebox_default_env
$(IMAGEDIR)/barebox-default-environment; \
+ else \
+ install -D -m644 $(BAREBOX_DIR)/barebox_default_env
$(IMAGEDIR)/barebox-default-environment; \
+ fi
@$(call touch)
# ----------------------------------------------------------------------------
--
1.7.10.4
--
ptxdist mailing list
[email protected]
