Re: [PATCH] kbuild: setlocalversion should respect srctree paramwhen looking for auto.conf

[Michal Marek]

On 07/13/2010 11:34 AM, Martin Jansa wrote:
> * it works properly only when CWD == scrtree
> * with this patch:
>   jama src # /usr/src/linux/scripts/setlocalversion /usr/src/linux
>   -JaMa-00001-g18672de
> * without:
>   jama src # /usr/src/linux/scripts/setlocalversion /usr/src/linux
>   Error: kernelrelease not valid - run 'make prepare' to update it

This doesn't look correct, include/config/auto.conf is generated in the
build directory (*), where this script is called from by the Makefile.
If you call the script manually, you have to cd to the build directory
first.

(*) which is different from the source directory if you build with O=.

Michal
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@xxxxxxxxx>
> ---
>  scripts/setlocalversion |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/scripts/setlocalversion b/scripts/setlocalversion
> index d6a866e..41864d1 100755
> --- a/scripts/setlocalversion
> +++ b/scripts/setlocalversion
> @@ -135,7 +135,7 @@ if $scm_only; then
>  	exit
>  fi
>  
> -if test -e include/config/auto.conf; then
> +if test -e "${srctree}/include/config/auto.conf"; then
>  	source "$_"
>  else
>  	echo "Error: kernelrelease not valid - run 'make prepare' to update it"

--
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/