From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 997AF567D for ; Tue, 5 Jul 2016 18:47:40 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP; 05 Jul 2016 09:47:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,580,1459839600"; d="scan'208";a="989567675" Received: from nnguy21-mobl3.ccr.corp.intel.com (HELO [10.255.149.189]) ([10.255.149.189]) by orsmga001.jf.intel.com with ESMTP; 05 Jul 2016 09:47:31 -0700 To: Christian Ehrhardt , thomas.monjalon@6wind.com, dev@dpdk.org References: <1467288021-23950-1-git-send-email-christian.ehrhardt@canonical.com> From: Ferruh Yigit Message-ID: <577BE4A1.3040302@intel.com> Date: Tue, 5 Jul 2016 17:47:29 +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: <1467288021-23950-1-git-send-email-christian.ehrhardt@canonical.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH v2] 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, 05 Jul 2016 16:47:41 -0000 On 6/30/2016 1:00 PM, Christian Ehrhardt wrote: > *updates in v2* > - move to .config target > - fix usage order of tac > - simplify inner section by only using awk (instead of awk+loop+bash+sed) > > Due to the hierarchy and the demand to keep the base config showing all > options, some config keys end up multiple times in the .config file. > > Due to the way the actual config is sourced only the last entry is > important. That can confuse people changing values in .config which > are then ignored. > > 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 | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk > index a3acfe6..6c46122 100644 > --- a/mk/rte.sdkconfig.mk > +++ b/mk/rte.sdkconfig.mk > @@ -79,11 +79,17 @@ $(RTE_OUTPUT): > ifdef NODOTCONF > $(RTE_OUTPUT)/.config: ; > else > +# Generate config from template, if there are duplicates keep only the last > $(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT) > $(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \ > $(CPP) -undef -P -x assembler-with-cpp \ > -ffreestanding \ > -o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \ > + tac $(RTE_OUTPUT)/.config_tmp > $(RTE_OUTPUT)/.config_tmp_reverse ; \ Now we are adding new binary dependency (tac) to build system and we now create a interim file, as far as I understand which is required to use awk. Although this is a nice piece of awk command, I am not sure if sed alternative or this is better because of above two issues. This is a question that I have more than a comment against one to another. If you prefer to use this one, I confirmed that this works fine. > + awk --field-separator '=' '!/^#/ {if (!seen[$$1]) {print ($$0)}; seen[$$1]=1;} \ > + /^#/ {print($$0)}' $(RTE_OUTPUT)/.config_tmp_reverse \ > + | tac > $(RTE_OUTPUT)/.config_tmp ; \ > + rm $(RTE_OUTPUT)/.config_tmp_reverse ; \ > 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 ; \ >