public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Michal Marek <mmarek@suse•cz>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
	"Rafael J. Wysocki" <rjw@sisk•pl>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Linus Torvalds <torvalds@linux-foundation•org>
Subject: Re: Linux 2.6.35-rc4 - CONFIG_LOCALVERSION ignored?
Date: Mon, 5 Jul 2010 23:43:04 +0200	[thread overview]
Message-ID: <20100705214304.GA24291@sepie.suse.cz> (raw)
In-Reply-To: <201007052325.56971.rjw@sisk.pl> <20100705103941.9b57282d.sfr@canb.auug.org.au>

On Mon, Jul 05, 2010 at 11:25:56PM +0200, Rafael J. Wysocki wrote:
> Hmm.  Am I dong anything particularly wrong, or is CONFIG_LOCALVERSION ignored
> now, as it seems?

(also reported by Stephen earlier that day)

On Mon, Jul 05, 2010 at 10:39:41AM +1000, Stephen Rothwell wrote:
> After merging the libata tree, today's linux-next build produced this
> warning (but it should be a failure ...):
> 
> /bin/sh: scripts/setlocalversion: No such file or directory
> 
> Probably introduced by commit 0a564b2645c8766a669c55bde1f1ef5b0518caec
> ("kbuild: Propagate LOCALVERSION= down to scripts/setlocalversion").
> 
> That commit really isn't ready for inclusion in Linus' tree ...


Oops, I'm an idiot. The below patch should fix localversion again:

From: Michal Marek <mmarek@suse•cz>
Subject: [PATCH] kbuild: Fix path to scripts/setlocalversion

Commit 0a564b2 broke LOCALVERSION for O=... builds. Ouch.

Reported-by: Stephen Rothwell <sfr@canb•auug.org.au>
Reported-by: Rafael J. Wysocki <rjw@sisk•pl>
Signed-off-by: Michal Marek <mmarek@suse•cz>

diff --git a/Makefile b/Makefile
index 12ab175..df16c4f 100644
--- a/Makefile
+++ b/Makefile
@@ -886,7 +886,7 @@ $(vmlinux-dirs): prepare scripts
 # Store (new) KERNELRELASE string in include/config/kernel.release
 include/config/kernel.release: include/config/auto.conf FORCE
 	$(Q)rm -f $@
-	$(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) scripts/setlocalversion $(srctree))" > $@
+	$(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@
 
 
 # Things we need to do before we recursively start building the kernel

  reply	other threads:[~2010-07-05 21:43 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <201007052325.56971.rjw@sisk.pl>
2010-07-05  0:39 ` linux-next: build failure after merge of the kbuild-current tree Stephen Rothwell
2010-07-05 21:43   ` Michal Marek [this message]
2010-07-06 18:29     ` Linux 2.6.35-rc4 - CONFIG_LOCALVERSION ignored? Rafael J. Wysocki
2010-07-07  1:32       ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100705214304.GA24291@sepie.suse.cz \
    --to=mmarek@suse$(echo .)cz \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=rjw@sisk$(echo .)pl \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=torvalds@linux-foundation$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox