Re: [PATCH] kbuild: Re-enable Makefile generation in a new O=... directory

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Dec 11, 2007 at 01:22:08PM +0100, Guillaume Chazarain wrote:
> The patch kbuild: fix building with O=.. options
> http://git.kernel.org/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=18c32dac75b187d1a4e858f3cfdf03e844129f5e
> disabled the creation of a Makefile in a new O=... directory. Restore it.
> 
> Signed-off-by: Guillaume Chazarain <[email protected]>

Crap - thanks for noticing this.
I will push this fix.

	Sam
> ---
> 
>  scripts/mkmakefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/scripts/mkmakefile b/scripts/mkmakefile
> index 9ad1bd7..e0f54b9 100644
> --- a/scripts/mkmakefile
> +++ b/scripts/mkmakefile
> @@ -13,7 +13,7 @@
>  test ! -r $2/Makefile -o -O $2/Makefile || exit 0
>  # Only overwrite automatically generated Makefiles
>  # (so we do not overwrite kernel Makefile)
> -if ! grep -q Automatically $2/Makefile
> +if test -e $2/Makefile && ! grep -q Automatically $2/Makefile
>  then
>  	exit 0
>  fi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux