diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2012-10-15 17:53:11 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-10-17 17:49:38 +0200 |
| commit | 64ab1d597c4a716531863e416ae21a15f719fefe (patch) | |
| tree | 95ba67e81dcf165b004157c30474ceb10a5c9e49 /rules/barebox.make | |
| parent | 29c7c32c155260442507c9bd9d5adb7e6fba1611 (diff) | |
| download | ptxdist-64ab1d597c4a716531863e416ae21a15f719fefe.tar.gz ptxdist-64ab1d597c4a716531863e416ae21a15f719fefe.tar.xz | |
barebox: support new location of barebox_default_env
Since barebox > v2012.10.0, barebox_default_env has moved to common/.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/barebox.make')
| -rw-r--r-- | rules/barebox.make | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rules/barebox.make b/rules/barebox.make index d16abda36..ae005039b 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) # ---------------------------------------------------------------------------- |