[Quilt-dev] linux 2.6 kernel changes to support quilt

[Joe Green]

I don't know if a patch for this has been posted here before; I didn't 
find it in a search of the archives.

For Linux 2.6 kernel developers using quilt, the attached patch adds the 
QUILT_PATCHES and QUILT_PC directories to a list of special directories 
that are not affected by kernel Makefile targets.  Without this patch, 
operations like "make distclean" can delete files from the .pc 
directory, silently changing the patches produced by "quilt refresh".

This patch honors settings in "$HOME/.quiltrc".

Note, this is a patch to the Linux kernel, not to quilt.

--
Joe Green <address@hidden>
MontaVista Software, Inc.

Source: MontaVista Software, Inc
Type: Integration
Description:
    Add QUILT_PC and QUILT_PATCHES directories to top-level Makefile
    RCS_FIND_IGNORE and RCS_TAR_IGNORE variables.  This prevents
    operations like "make distclean" from damaging the stored
    information.

Index: linux-2.6.7/Makefile
===================================================================
--- linux-2.6.7.orig/Makefile
+++ linux-2.6.7/Makefile
@@ -332,10 +332,14 @@
 comma := ,
 depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
 
+# Get quilt metadata directory locations
+QUILT_PC := $(shell [ -r "$$HOME/.quiltrc" ] && . "$$HOME/.quiltrc" ; echo 
"$${QUILT_PC:-.pc}")
+QUILT_PATCHES := $(shell [ -r "$$HOME/.quiltrc" ] && . "$$HOME/.quiltrc" ; 
echo "$${QUILT_PATCHES:-patches}")
+
 # Files to ignore in find ... statements
 
-RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS 
\) -prune -o
-RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude 
CVS
+RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS 
-o -name "$(QUILT_PATCHES)" -o -name "$(QUILT_PC)" \) -prune -o
+RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude 
CVS --exclude "$(QUILT_PATCHES)" --exclude "$(QUILT_PC)"
 
 # ===========================================================================
 # Rules shared between *config targets and build targets