When running "make config" and additional config.orig file is also
generated, which is intended to hold the original, clean configuration
from the template.
When running make install, we first check if there is no existing
.config file, and run make config if not. If there is a file, we then
check if it's unmodified, in which case we regenerate a new .config to
take account of any possible updates to the template. Finally, in the
case where there is an existing .config file, and it HAS been modified,
we then do a check to see if the template has had further updates, and
throw an error if so. If no updates, we continue with the build using
the existing, user-modified config.
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
---
mk/rte.sdkconfig.mk | 1 +
mk/rte.sdkinstall.mk | 10 ++++++++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index d0692e7..3124dce 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -74,6 +74,7 @@ $(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE
-o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \
if ! cmp -s $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config;
then \
cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config ; \
+ cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config.orig
; \
fi ; \
rm -f $(RTE_OUTPUT)/.config_tmp ; \
else \
diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 61a8771..25ebf6b 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -54,10 +54,20 @@ INSTALL_TARGETS := $(addsuffix _install,\
.PHONY: install
install: $(INSTALL_TARGETS)
+
%_install:
@echo ================== Installing $*
$(Q)if [ ! -f $(BUILD_DIR)/$*/.config ]; then \
$(MAKE) config T=$* O=$(BUILD_DIR)/$*; \
+ elif cmp -s $(BUILD_DIR)/$*/.config.orig $(BUILD_DIR)/$*/.config; then \
+ $(MAKE) config T=$* O=$(BUILD_DIR)/$*; \
+ else \
+ $(MAKE) config T=$* O=/tmp/$*; \
+ if ! cmp -s /tmp/$*/.config.orig $(BUILD_DIR)/$*/.config.orig
; then \
+ echo "Config Conflict: Local config and standard config
have both changed" ; \
+ exit 1; \
+ fi ; \
+ echo "Using local configuration" ; \
fi
$(Q)$(MAKE) all O=$(BUILD_DIR)/$*
--
1.7.0.7
