Re: [PATCH] merge_config.sh: Avoid creating unnessary source softlinks

[Darren Hart]

On 04/04/2013 12:02 PM, John Stultz wrote:
> Viresh noticed when using merge_config.sh that a source softlink
> was being created even when he didn't specify the -O option.
> 
> The problem arises due to the previous commit 409f117e2d6b
> which added the -O option. Basically if -O is not specified,
> we still pass '-O=.' to the make command, which then generates
> a source softlink to ./
> 
> This patch adds an extra check so if there is no -O specified
> to merge_config.sh, we don't pass one on to make.
> 
> Cc: Zhangfei Gao <zhangfei.gao@xxxxxxxxxx>
> Cc: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
> Cc: Michal Marek <mmarek@xxxxxxx>
> Cc: Bruce Ashfield <bruce.ashfield@xxxxxxxxxxxxx>
> Cc: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
> Reported-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
> Tested-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
> Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>

Thanks John!

Acked-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx>


> ---
>  scripts/kconfig/merge_config.sh |   10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
> index 05274fc..81b0c61 100755
> --- a/scripts/kconfig/merge_config.sh
> +++ b/scripts/kconfig/merge_config.sh
> @@ -120,10 +120,18 @@ if [ "$MAKE" = "false" ]; then
>  	exit
>  fi
>  
> +# If we have an output dir, setup the O= argument, otherwise leave
> +# it blank, since O=. will create an unnecessary ./source softlink
> +OUTPUT_ARG=""
> +if [ "$OUTPUT" != "." ] ; then
> +	OUTPUT_ARG="O=$OUTPUT"
> +fi
> +
> +
>  # Use the merged file as the starting point for:
>  # alldefconfig: Fills in any missing symbols with Kconfig default
>  # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
> -make KCONFIG_ALLCONFIG=$TMP_FILE O=$OUTPUT $ALLTARGET
> +make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
>  
>  
>  # Check all specified config values took (might have missed-dependency issues)
> 

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/