From: Ferruh Yigit <ferruh.yigit@intel.com>
To: Christian Ehrhardt <christian.ehrhardt@canonical.com>,
thomas.monjalon@6wind.com, dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v2] mk: filter duplicate configuration entries
Date: Tue, 5 Jul 2016 17:47:29 +0100 [thread overview]
Message-ID: <577BE4A1.3040302@intel.com> (raw)
In-Reply-To: <1467288021-23950-1-git-send-email-christian.ehrhardt@canonical.com>
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 <christian.ehrhardt@canonical.com>
> ---
> 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 ; \
>
next prev parent reply other threads:[~2016-07-05 16:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 11:50 [dpdk-dev] Duplicate config symbols Christian Ehrhardt
2016-06-13 13:07 ` Ferruh Yigit
2016-06-13 13:47 ` Thomas Monjalon
2016-06-13 15:09 ` Christian Ehrhardt
2016-06-13 15:10 ` [dpdk-dev] [RFC] mk: filter duplicate configuration entries Christian Ehrhardt
2016-06-28 16:11 ` Ferruh Yigit
2016-06-28 16:38 ` Christian Ehrhardt
2016-06-28 16:48 ` Ferruh Yigit
2016-06-30 11:57 ` Christian Ehrhardt
2016-06-30 12:00 ` [dpdk-dev] [PATCH v2] " Christian Ehrhardt
2016-07-05 16:47 ` Ferruh Yigit [this message]
2016-07-05 19:47 ` Thomas Monjalon
2016-07-06 5:37 ` Christian Ehrhardt
2016-07-06 5:37 ` [dpdk-dev] [PATCH v3] " Christian Ehrhardt
2016-07-06 8:06 ` Ferruh Yigit
2016-07-06 8:12 ` Bruce Richardson
2016-07-06 8:57 ` Ferruh Yigit
2016-07-06 9:08 ` Christian Ehrhardt
2016-07-06 9:13 ` [dpdk-dev] [PATCH v4] " Christian Ehrhardt
2016-07-11 12:47 ` Thomas Monjalon
2016-07-06 9:30 ` [dpdk-dev] [PATCH v3] " Bruce Richardson
2016-06-13 16:55 ` [dpdk-dev] Duplicate config symbols Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=577BE4A1.3040302@intel.com \
--to=ferruh.yigit@intel.com \
--cc=christian.ehrhardt@canonical.com \
--cc=dev@dpdk.org \
--cc=thomas.monjalon@6wind.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).