2004-11-02 23:48:23

by Blaisorblade

[permalink] [raw]
Subject: [patch 1/2] Kbuild: avoid backup localversion files


From: Paolo 'Blaisorblade' Giarrusso <[email protected]>
Cc: Sam Ravnborg <[email protected]>

(Please CC me on replies as I'm not subscribed).

Avoid including as localversion-files the *~ files, i.e. backup files. If I
have localversion-a and localversion-a~, I don't want both to be used. Nor I
want to use localversion*~ anyway.

Don't code that as $(wildcard localversion*[^~]) as that would exclude
"localversion" from the wildcard expansion result, because it requires at
least one character after localversion to exist in the name file. I.e.,

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
---

vanilla-linux-2.6.9-paolo/Makefile | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN Makefile~avoid-backup-localversion Makefile
--- vanilla-linux-2.6.9/Makefile~avoid-backup-localversion 2004-11-03 00:16:50.651772000 +0100
+++ vanilla-linux-2.6.9-paolo/Makefile 2004-11-03 00:16:50.654771544 +0100
@@ -156,7 +156,7 @@ localversion-files := $(wildcard $(objtr
endif

LOCALVERSION = $(subst $(space),, \
- $(shell cat /dev/null $(localversion-files)) \
+ $(shell cat /dev/null $(localversion-files:%~=)) \
$(patsubst "%",%,$(CONFIG_LOCALVERSION)))

KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION)
_


2004-11-05 22:08:26

by Sam Ravnborg

[permalink] [raw]
Subject: Re: [patch 1/2] Kbuild: avoid backup localversion files

On Wed, Nov 03, 2004 at 12:19:57AM +0100, [email protected] wrote:
>
> From: Paolo 'Blaisorblade' Giarrusso <[email protected]>
> Cc: Sam Ravnborg <[email protected]>
>
> (Please CC me on replies as I'm not subscribed).
>
> Avoid including as localversion-files the *~ files, i.e. backup files. If I
> have localversion-a and localversion-a~, I don't want both to be used. Nor I
> want to use localversion*~ anyway.
>
> Don't code that as $(wildcard localversion*[^~]) as that would exclude
> "localversion" from the wildcard expansion result, because it requires at
> least one character after localversion to exist in the name file. I.e.,

Applied,

Sam