From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id D9B0F5A6B for ; Wed, 6 Jul 2016 10:12:41 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 06 Jul 2016 01:12:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,318,1464678000"; d="scan'208";a="1001687239" Received: from bricha3-mobl3.ger.corp.intel.com ([10.237.220.95]) by fmsmga001.fm.intel.com with SMTP; 06 Jul 2016 01:12:39 -0700 Received: by (sSMTP sendmail emulation); Wed, 06 Jul 2016 09:12:38 +0025 Date: Wed, 6 Jul 2016 09:12:38 +0100 From: Bruce Richardson To: Christian Ehrhardt Cc: ferruh.yigit@intel.com, thomas.monjalon@6wind.com, dev@dpdk.org Message-ID: <20160706081238.GA17404@bricha3-MOBL3> References: <1467783465-14533-1-git-send-email-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1467783465-14533-1-git-send-email-christian.ehrhardt@canonical.com> Organization: Intel Research and =?iso-8859-1?Q?De=ACvel?= =?iso-8859-1?Q?opment?= Ireland Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [dpdk-dev] [PATCH v3] 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: Wed, 06 Jul 2016 08:12:42 -0000 On Wed, Jul 06, 2016 at 07:37:45AM +0200, Christian Ehrhardt wrote: > *updates in v3* > - replace tac with sed '1!G;h;$!d' to avoid build time dependency > > *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..d031bf4 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) ; \ > + sed '1!G;h;$$!d' $(RTE_OUTPUT)/.config_tmp > $(RTE_OUTPUT)/.config_tmp_reverse ; \ > + awk --field-separator '=' '!/^#/ {if (!seen[$$1]) {print ($$0)}; seen[$$1]=1;} \ > + /^#/ {print($$0)}' $(RTE_OUTPUT)/.config_tmp_reverse \ > + | sed '1!G;h;$$!d' > $(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 ; \ > -- Given the length and complexity of the work being done here, using some pretty fancy sed and awk features, I feel that the comment at the top should be expanded to actually explain what is being done and how. I would also include in that explanation how sed is being used to reverse a file. Personally, I would have preferred to keep the dependency on tac for a readability perspective. /Bruce