From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by dpdk.org (Postfix) with ESMTP id 90ABD68A1 for ; Tue, 20 May 2014 13:37:48 +0200 (CEST) Received: by mail-wg0-f46.google.com with SMTP id n12so362199wgh.5 for ; Tue, 20 May 2014 04:37:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=tcW866DEE5PMukShMqhsQAoeiFlH+wBkoieg1+fHUAA=; b=IRLuO2y1IPUBgbFAe67VJPuOswD9K5FIuSnARAagEQ2Qodplq8B/gKwMOcHd2BsQjZ yc2i8gFXTnHgtANFmqlGhbiACQcyLRNhXXIBDzdds+C2fPcSPCuOJj9uA+2ezhOcvE3U 4OfH2aMDTMmuajHLF4wHYRNPOUMtTmN0O2tEB8j8YcE27nujwqnB8UWScIR++i36jKGA +jTUUg/0JdGnCBiltAff1P+RTKWUpWFVT9F3of803oSN0Xqz9Sdghs93llW4/2T3Ak2n NNWOt4C/KVcm8wlaPqWH3wEyPtZbLHHe/1Jof1zeR39hBiBrbrL4Ga8RxfVEszAxeGYJ aiQw== X-Gm-Message-State: ALoCoQkFIU0xAnnLzgLvcA2jFVwF3xUSCIOiWlIgJozzQiSaDI9RMPhpeM0WeXQbbql2vBAOlGIK X-Received: by 10.180.77.165 with SMTP id t5mr3606617wiw.38.1400585877620; Tue, 20 May 2014 04:37:57 -0700 (PDT) Received: from [10.16.0.195] (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id lq9sm20316316wic.8.2014.05.20.04.37.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 May 2014 04:37:56 -0700 (PDT) Message-ID: <537B3E91.4030400@6wind.com> Date: Tue, 20 May 2014 13:37:53 +0200 From: Olivier MATZ User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Icedove/24.4.0 MIME-Version: 1.0 To: Bruce Richardson , dev@dpdk.org References: <1400062955-27338-1-git-send-email-bruce.richardson@intel.com> <1400082910-16804-1-git-send-email-bruce.richardson@intel.com> In-Reply-To: <1400082910-16804-1-git-send-email-bruce.richardson@intel.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v2] 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, 20 May 2014 11:37:48 -0000 Hi Bruce, On 05/14/2014 05:55 PM, Bruce Richardson wrote: > 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 It looks good to me, except the small typos below. > --- 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)/$*; \ No need to add an extra line here. > + 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; \ I would remove extra upper-case chars and say "template" instead of "standard". Like that: echo "Config conflict: local config and template config have both changed" Apart from these minor changes, Acked-by: Olivier Matz Regards, Olivier