diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-07-02 13:49:12 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-07-02 15:07:27 +0200 |
| commit | 2524d88cb7132482c9949f076d8733a50325ebe8 (patch) | |
| tree | 9c739a9c6f8d6d62df9031730ca76582426c845e /rules/barebox.make | |
| parent | 61e5228587126d15dd44c6cfd911312920aa7ae8 (diff) | |
| download | ptxdist-2524d88cb7132482c9949f076d8733a50325ebe8.tar.gz ptxdist-2524d88cb7132482c9949f076d8733a50325ebe8.tar.xz | |
barebox: copy back .config file after make oldconfig step
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/barebox.make')
| -rw-r--r-- | rules/barebox.make | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rules/barebox.make b/rules/barebox.make index 9ca0c9982..2e4d818fa 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -65,8 +65,11 @@ endif $(STATEDIR)/barebox.prepare: $(BAREBOX_CONFIG) @$(call targetinfo) - @echo "Using barebox config file: $(BAREBOX_CONFIG)" - @install -m 644 $(BAREBOX_CONFIG) $(BAREBOX_DIR)/.config + @echo "Using barebox config file: $(<)" + @install -m 644 "$(<)" "$(BAREBOX_DIR)/.config" + + @$(call ptx/oldconfig, BAREBOX) + @diff -q -I "# [^C]" "$(BAREBOX_DIR)/.config" "$(<)" > /dev/null || cp "$(BAREBOX_DIR)/.config" "$(<)" ifdef PTXCONF_BAREBOX_EXTRA_ENV @rm -rf $(BAREBOX_DIR)/.ptxdist-defaultenv @@ -83,8 +86,6 @@ ifdef PTXCONF_BAREBOX_EXTRA_ENV $(BAREBOX_DIR)/.config endif - @$(call ptx/oldconfig, BAREBOX) - @$(call touch) # ---------------------------------------------------------------------------- |