2002-10-07 16:02:49

by Mikael Pettersson

[permalink] [raw]
Subject: [PATCH] 2.5.40 kbuild bug: mrproper removes files it shouldn't remove

'make mrproper' incorrectly deletes *~-style editor backup files
from the top-level directory. This bug was introduced in 2.5.29
when the top-level Makefile was changed to remain in the top-level
directory when invoking DocBook's Makefile:

(snippet from patch-2.5.29):
>--- a/Makefile Fri Jul 26 19:58:50 2002
>+++ b/Makefile Fri Jul 26 19:58:50 2002
>@@ -650,7 +650,7 @@
> -name .\*.tmp -o -name .\*.d \) -type f -print \
> | grep -v lxdialog/ | xargs rm -f
> @rm -f $(CLEAN_FILES)
>- @$(MAKE) -C Documentation/DocBook clean
>+ @$(MAKE) -f Documentation/DocBook/Makefile clean
>
> mrproper: clean archmrproper
> @echo 'Making mrproper'

The problem is that DocBook's 'make clean' rule contains

clean:
@echo 'Cleaning up (DocBook)'
@rm -f core *~

so the rm now removes files from the wrong directory. Not good.

Since the top-level Makefile removes all core files, I suggest
simply removing the problematic rm line. Patch below.

/Mikael

--- linux-2.5.40/Documentation/DocBook/Makefile.~1~ Sat Aug 3 00:40:00 2002
+++ linux-2.5.40/Documentation/DocBook/Makefile Mon Oct 7 17:05:16 2002
@@ -155,7 +155,6 @@

clean:
@echo 'Cleaning up (DocBook)'
- @rm -f core *~
@rm -f $(BOOKS)
@rm -f $(DVI) $(AUX) $(TEX) $(LOG) $(OUT)
@rm -f $(PNG-parportbook) $(EPS-parportbook)


2002-10-07 17:03:31

by John Levon

[permalink] [raw]
Subject: Re: [PATCH] 2.5.40 kbuild bug: mrproper removes files it shouldn't remove

On Mon, Oct 07, 2002 at 06:08:24PM +0200, Mikael Pettersson wrote:

> 'make mrproper' incorrectly deletes *~-style editor backup files

A vaguely related long time irritation :

cp .config .config-phew-saved-it
make mrproper

whoops !

regards
john

--
"I will eat a rubber tire to the music of The Flight of the Bumblebee"