From: Roland McGrath <roland@gnu.org>
Date: Fri, 18 Feb 2005 22:05:58 +0000 (+0000)
Subject: Use -kk to suppress patches for $Id$ differences between branches.
X-Git-Tag: cvs/fedora-glibc-2_3_4-11~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00e4559b612f179492ff3721f86c92498894432f;p=thirdparty%2Fglibc.git

Use -kk to suppress patches for $Id$ differences between branches.
---

diff --git a/fedora/Makefile b/fedora/Makefile
index 6d0098ac1c3..88b68eea28f 100644
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -81,7 +81,8 @@ force-tag: glibc.spec
 # Note this rule assumes that your working directory (..) is up to date.
 $(tar-name)-$(branch-name).patch: makepatch.awk glibc.spec \
 				  ../ChangeLog ../*/ChangeLog
-	(cd ..; cvs -q diff -upN $(select-snapshot) $(select-release)) | \
+# Use -kk to suppress patches for $Id$ differences between branches.
+	(cd ..; cvs -q diff -kk -upN $(select-snapshot) $(select-release)) | \
 	awk -v OLDVER=$(tar-name)-$(snapshot-name) \
 	    -v NEWVER=$(tar-name)-$(snapshot-name)-$(branch-name) \
 	    -f $< > patch.tmp