From patchwork Wed Jul 6 05:37:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Ehrhardt X-Patchwork-Id: 14592 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 81B5D68E8; Wed, 6 Jul 2016 07:37:59 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id D3DAE68DD for ; Wed, 6 Jul 2016 07:37:57 +0200 (CEST) Received: from 1.general.paelzer.uk.vpn ([10.172.196.172] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1bKfX0-0003xg-LT; Wed, 06 Jul 2016 05:37:54 +0000 From: Christian Ehrhardt To: christian.ehrhardt@canonical.com, ferruh.yigit@intel.com, thomas.monjalon@6wind.com, dev@dpdk.org Date: Wed, 6 Jul 2016 07:37:45 +0200 Message-Id: <1467783465-14533-1-git-send-email-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" *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 Reviewed-by: Ferruh Yigit --- 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 ; \