From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by dpdk.org (Postfix) with ESMTP id 38568AFCF for ; Tue, 10 Jun 2014 15:51:32 +0200 (CEST) Received: by mail-wi0-f182.google.com with SMTP id r20so6184472wiv.15 for ; Tue, 10 Jun 2014 06:51:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=J7C7RnZiQnDytoGqv0Y4gwJ4rQLjFwMb0HO1V17FXVM=; b=Bf9XmRnz7725W9zqkatrJ+XyLPwH+sVo0De9MKA9EzDgV8FxesFs2KeCmpD/FejRWh xKLGfVhQc+JXqhWO8I3u/+I8ah1NObP5GlhKcXg1wVyX8ICIsT/2mFnopmoTf3jvcVtb fn1SRAq2QuDTupPPhJt/9Zdmk5p3hWrN1DFzSIZJr2w0ce348NHi8XzbUc9jjTzJA0ze W4H+mu5gXY6OKycINCPdSZffCS9sIlme9lhN/kET6UYn1Lrrr2AjK0lLZvBUnb7+qUfI xrcvlKQ4J4norXrXnN96gelCau9nwEn0bcLJ7pwucmzZ1zxW7gPC8ACRq2uOOZDrB0P7 Y97Q== X-Gm-Message-State: ALoCoQkctOp7jD+4SPqEFds00u/+Fo4VvuaFjQwXa/vBvuB3llI+RvF7M9tntKtgzIGsnnsPEof0 X-Received: by 10.180.218.4 with SMTP id pc4mr30081443wic.21.1402408305834; Tue, 10 Jun 2014 06:51:45 -0700 (PDT) Received: from XPS13.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id di10sm29742775wjb.1.2014.06.10.06.51.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Jun 2014 06:51:45 -0700 (PDT) From: Thomas Monjalon To: dev@dpdk.org Date: Tue, 10 Jun 2014 15:51:33 +0200 Message-Id: <1402408293-19426-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <537B3E91.4030400@6wind.com> References: <537B3E91.4030400@6wind.com> Subject: [dpdk-dev] [PATCH v3] mk: allow updates to build config on make install X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jun 2014 13:51:32 -0000 From: Bruce Richardson When running "make config", an 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 Signed-off-by: Thomas Monjalon --- mk/rte.sdkconfig.mk | 1 + mk/rte.sdkinstall.mk | 13 +++++++++++++ 2 files changed, 14 insertions(+) changes in v3: - typos commented by Olivier - compatibility with old builds without .orig - prefix and suffix in tmp path - remove tmp directory if no conflict 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 24b60cf..28eb662 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -58,6 +58,19 @@ install: $(INSTALL_TARGETS) @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 \ + if [ -f $(BUILD_DIR)/$*/.config.orig ] ; then \ + tmp_build=/tmp/dpdk-$*-$$$$; \ + $(MAKE) config T=$* O=$$(tmp_build); \ + if ! cmp -s $(BUILD_DIR)/$*/.config.orig $$(tmp_build)/.config ; then \ + echo "Conflict: local config and template config have both changed"; \ + exit 1; \ + fi; \ + rm -rf $$(tmp_build); \ + fi; \ + echo "Using local configuration"; \ fi $(Q)$(MAKE) all O=$(BUILD_DIR)/$* -- 2.0.0