diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-02-18 12:02:57 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-02-18 12:05:21 +0100 |
| commit | 962d1a6af5f9b934cdcac81e1ad8669ef148d167 (patch) | |
| tree | ba2d6f3859899c1bf33a21ea5ed24d7ea772a4fc /rules/barebox.make | |
| parent | b611bc649487cc59c268447be917ddbf18d55b5f (diff) | |
| download | ptxdist-962d1a6af5f9b934cdcac81e1ad8669ef148d167.tar.gz ptxdist-962d1a6af5f9b934cdcac81e1ad8669ef148d167.tar.xz | |
barebox: use barebox_zero_env as default environment if available
Newer barebox versions only save changes to the builtin environment. So now
we can use a zero diff environment file as 'default' environment.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/barebox.make')
| -rw-r--r-- | rules/barebox.make | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rules/barebox.make b/rules/barebox.make index c096f8bc5..5c596a56f 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -151,7 +151,9 @@ endif else \ install -D -m644 $(BAREBOX_DIR)/barebox.bin $(IMAGEDIR)/barebox-image; \ fi - @if [ -e $(BAREBOX_DIR)/common/barebox_default_env ]; then \ + @if [ -e $(BAREBOX_DIR)/defaultenv/barebox_zero_env ]; then \ + install -D -m644 $(BAREBOX_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-default-environment; \ + elif [ -e $(BAREBOX_DIR)/common/barebox_default_env ]; then \ install -D -m644 $(BAREBOX_DIR)/common/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \ elif [ -e $(BAREBOX_DIR)/barebox_default_env ]; then \ install -D -m644 $(BAREBOX_DIR)/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \ |