lkml.org 
[lkml]   [2010]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] kbuild: setlocalversion should respect srctree param when looking for auto.conf
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@gmail.com>
> ---
> 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"



\
 
 \ /
  Last update: 2010-07-13 14:39    [W:0.041 / U:0.164 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site