LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Roman Zippel <zippel@linux-m68k.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Verych <olecom@flower.upol.cz>,
	Tony Luck <tony.luck@intel.com>,
	LKML <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Jesper Juhl <jesper.juhl@gmail.com>,
	Bastian Blank <bastian@waldi.eu.org>,
	Sam Ravnborg <sam@ravnborg.org>
Subject: Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files
Date: Tue, 13 Feb 2007 17:09:47 +0100 (CET)	[thread overview]
Message-ID: <Pine.LNX.4.64.0702131700190.14457@scrub.home> (raw)
In-Reply-To: <Pine.LNX.4.64.0702130744030.8424@woody.linux-foundation.org>

Hi,

On Tue, 13 Feb 2007, Linus Torvalds wrote:

> > I know it maybe another my "change it all" proposition, but i can't find
> > nothing against `GNU $(wildcard ..)' and `unnecessarily complex "find"'.
> 
> It's the regexp in both cases. $(wildcard ) doesn't do regexp's (only the 
> normal path rules), and traditional 'find' doesn't either. The fact that 
> GNU find does is another matter. I don't think we require GNU find 
> normally.
> 
> And I don't even much like the "backup" thing. Some programs will use 
> other things than "~" as a backup marker. Patch more often uses ".orig", 
> for example. So both methods are fairly complex, but at the same time not 
> quite complex enough.
> 
> It would probably have been a better idea had we made the rule be that the 
> file is called "*localversion" rather than "localversion*", exactly 
> because that way it's unambiguous (people normally use _suffixes_ for 
> filetypes, not prefixes). That would have avoided the whole complexity in 
> wildcarding, but it's too late now..
> 
> 	$(sort $(wildcard $(srctree)/*localversion $(objtree)/*localversion)
> 
> should have worked.

For now I think it's easier to just revert the change to use find, I 
posted the patch for this already a few days ago.
I don't know if it really makes sense to change the rules for this now, 
apparently people are using this, it may not be perfect, but I think in 
the end it's just a matter of taste.

bye, Roman



[PATCH] refix localversion handling

This reverts part of the localversion patch, which now already got into
git. It removes the unnecessary find call, with the simpler $(notdir ...)
fix.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>

---
 Makefile |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Index: linux-2.6/Makefile
===================================================================
--- linux-2.6.orig/Makefile
+++ linux-2.6/Makefile
@@ -787,12 +787,14 @@ $(vmlinux-dirs): prepare scripts
 # moment, only git is supported but other SCMs can edit the script
 # scripts/setlocalversion and add the appropriate checks as needed.
 
-pattern = ".*/localversion[^~]*"
-string  = $(shell cat /dev/null \
-	   `find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort`)
-
-localver = $(subst $(space),, $(string) \
-			      $(patsubst "%",%,$(CONFIG_LOCALVERSION)))
+___localver = $(objtree)/localversion* $(srctree)/localversion*
+__localver  = $(sort $(wildcard $(___localver)))
+# skip files containing '~' (like backup files)
+_localver = $(foreach f,$(__localver),$(if $(findstring ~,$(notdir $(f))),,$(f)))
+
+localver = $(subst $(space),, \
+	   $(shell cat /dev/null $(_localver)) \
+	   $(patsubst "%",%,$(CONFIG_LOCALVERSION)))
 
 # If CONFIG_LOCALVERSION_AUTO is set scripts/setlocalversion is called
 # and if the SCM is know a tag from the SCM is appended.

  reply	other threads:[~2007-02-13 16:10 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-06  1:18 [patch 0/3, resend] scripts, kbuild updates/fixes (against 2.6.20) Oleg Verych
2007-02-06  1:18 ` [patch 1/3, resend] scripts: replace gawk, head, bc with shell, update Oleg Verych
2007-02-06 14:49   ` Mark Lord
2007-02-06 16:47     ` Oleg Verych
2007-02-06 17:13       ` Mark Lord
2007-02-07  8:58   ` Jesper Juhl
2007-02-07 13:02     ` Oleg Verych
2007-02-07 14:28   ` Roman Zippel
2007-02-06  1:18 ` [patch 2/3, resend] kbuild: improve option checking, Kbuild.include cleanup Oleg Verych
2007-02-07 14:36   ` Roman Zippel
2007-02-07 18:18     ` Oleg Verych
2007-02-07 20:14     ` Oleg Verych
2007-02-06  1:18 ` [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files Oleg Verych
2007-02-07 14:39   ` Roman Zippel
2007-02-07 18:03     ` Oleg Verych
2007-02-12 22:09   ` Tony Luck
2007-02-12 22:53     ` Linus Torvalds
2007-02-13  0:32       ` Oleg Verych
2007-02-13  5:05         ` Oleg Verych
2007-02-13  8:23           ` Gerd Hoffmann
2007-02-13 15:51           ` Linus Torvalds
2007-02-13 16:09             ` Roman Zippel [this message]
2007-02-14  1:16               ` kbuild, localversion (Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files) Oleg Verych
2007-02-14  8:30                 ` Sam Ravnborg
2007-02-06 17:56 ` [patch 0/3, resend] scripts, kbuild updates/fixes (against 2.6.20) Randy Dunlap
2007-02-06 18:25   ` Oleg Verych
2007-02-06 23:38 ` Oleg Verych

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=Pine.LNX.4.64.0702131700190.14457@scrub.home \
    --to=zippel@linux-m68k.org \
    --cc=akpm@linux-foundation.org \
    --cc=bastian@waldi.eu.org \
    --cc=jesper.juhl@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=olecom@flower.upol.cz \
    --cc=sam@ravnborg.org \
    --cc=tony.luck@intel.com \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).