summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/barebox.make9
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)
# ----------------------------------------------------------------------------