On 7/18/2016 5:06 PM, Sergio Gonzalez Monroy wrote:
> The sed syntax of '0,/regexp/' is GNU specific and fails with
> non GNU sed in FreeBSD.
>
> To solve the issue we can use awk instead to remove duplicates.
>
> Fixes: b2063f104db7 ("mk: filter duplicate configuration entries")
>
> Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy at intel.com>
> ---
>
> v2:
> - Use temp var instead of temp file
>
> mk/rte.sdkconfig.mk | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
> index e93237f..c2b6e13 100644
> --- a/mk/rte.sdkconfig.mk
> +++ b/mk/rte.sdkconfig.mk
> @@ -88,11 +88,8 @@ $(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE |
> $(RTE_OUTPUT)
> $(CPP) -undef -P -x assembler-with-cpp \
> -ffreestanding \
> -o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \
> - for config in $$(grep -v "^#" $(RTE_OUTPUT)/.config_tmp | cut
> -d"=" -f1 | sort | uniq -d); do \
> - while [ $$(grep "^$${config}="
> $(RTE_OUTPUT)/.config_tmp -c ) -gt 1 ]; do \
> - sed -i "0,/^$${config}=/{//d}"
> $(RTE_OUTPUT)/.config_tmp; \
> - done; \
> - done; \
> + config=$$(grep -v "^#" $(RTE_OUTPUT)/.config_tmp) ; \
> + echo "$$config" | awk -F'=' '{a[$$1]=$$0} END {for (i in a)
> print a[i]}' > $(RTE_OUTPUT)/.config_tmp ; \
This is another nice awk command.
A few comments about new command:
- Removes all comments from final config
- Spreads config option all over the file, logical grouping of options
removed.
When both happens at the same time, I have a concern that this may lead
missing some config options when somebody wants to update local config
file, but I am OK if everybody is OK.
> 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
> ; \
>
