From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 4E4182C2D for ; Tue, 28 Jun 2016 18:48:11 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 28 Jun 2016 09:48:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,541,1459839600"; d="scan'208";a="836757965" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.237.221.47]) ([10.237.221.47]) by orsmga003.jf.intel.com with ESMTP; 28 Jun 2016 09:48:09 -0700 To: Christian Ehrhardt References: <1465830632-25156-1-git-send-email-christian.ehrhardt@canonical.com> <5772A1C4.3030700@intel.com> Cc: Thomas Monjalon , dev From: Ferruh Yigit Message-ID: <5772AA48.2090209@intel.com> Date: Tue, 28 Jun 2016 17:48:08 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [RFC] mk: filter duplicate configuration entries 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, 28 Jun 2016 16:48:11 -0000 On 6/28/2016 5:38 PM, Christian Ehrhardt wrote: > On Tue, Jun 28, 2016 at 6:11 PM, Ferruh Yigit > wrote: > > On 6/13/2016 4:10 PM, Christian Ehrhardt wrote: > > Due to the hierarchy and the demand to keep the base config shoing all > > options some options end up multiple times in the .config file. > > > > A suggested solution was to filter for duplicates at the end of the > > actual config step which is implemented here. > > > > Signed-off-by: Christian Ehrhardt > > > --- > > mk/rte.sdkconfig.mk | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk > > > index a3acfe6..734aa06 100644 > > --- a/mk/rte.sdkconfig.mk > > +++ b/mk/rte.sdkconfig.mk > > @@ -70,6 +70,11 @@ config: notemplate > > else > > config: $(RTE_OUTPUT)/include/rte_config.h $(RTE_OUTPUT)/Makefile > Not sure if this should go under this rule, or "$(RTE_OUTPUT)/.config:" > and should work with ".config_tmp". > > > $(Q)$(MAKE) depdirs > > + tac $(RTE_OUTPUT)/.config | awk --field-separator '=' '!/^#/ {print $$1}' | while read config; do \ > Why reversing file since already checking all lines one by one in > original file? > > > Hi, > every other comment is ok I'll rebase and resubmit once I find some time > again. > But for this (tac) the reason is simple - to keep behaviour. > Currently the last one wins. Correct, but if I am not missing something, reversing doesn't help to this, how lines deleted taking care of this: sed -i "0,/$${config}/{//d}" $(RTE_OUTPUT)/.config; sed works on original file, and deletes first occurrence, independent from lines from bottom to up, or up to bottom fed into it. > So if you have > CONFIG_A=n > CONFIG_A=y > > Essentially you have > CONFIG_A=y > > By the tac and keeping the first occurrence we maintain behavior. > It is interestingly hard to "keep the last occurrence" without such > tricks, but I'm open to suggestions. > > > And instead of checking each line, it is possible to get list of > duplicates via "sort | uniq -d". > > > That would fail for the reasons outlined above. > > Although less important, file comments also tripled in final .config. > > > + if [ $$(grep "^$${config}=" $(RTE_OUTPUT)/.config | wc -l) -gt 1 ]; then \ > "grep -c" can be used instead of "grep | wc -l" > > > + sed -i "0,/$${config}/{//d}" > $(RTE_OUTPUT)/.config; \ > > + fi; \ > > + done > > @echo "Configuration done" > > endif > > > > > >