[ELDK] Problems rebuilding ELDK-4.1 from scratch (RCS keyword expansion)

[J.T. Conklin]

Hi,

I've got RH 7.3 installed in a VM and am starting to build ELDK 4.1
from scratch.

I have run into a problem with the ELDK patch files not matching the
code from the SRPMs due to RCS $Id: $ keywords being different.  All
the patch files appear to have keyword expansion disabled, so RCS Id's
are $Id$.

So far, I've been modifying the .patch files to either remove the diff
hunks containing the $Id$ (as oftentimes they're they only change in
the hunk), or changing the patch to contain the $Id$ as it is in the
SRPM.  I've attached a patch with my changes so far.  I don't know if
they're complete, as I have not yet had ELDK_BUILD completely build
the target files for the first cpu varient.

Is this a problem with the files in the repo, or in how I checked the
files with git?

Many thanks,

    --jtc

diff --git a/cross_rpms/crosstool/SOURCES/uclibc-0.9.27-update-math.patch
b/cross_rpms/crosstool/SOURCES/uclibc-0.9.27-update-math.patch
index 2d6f3c8..aacf6cd 100644
--- a/cross_rpms/crosstool/SOURCES/uclibc-0.9.27-update-math.patch
+++ b/cross_rpms/crosstool/SOURCES/uclibc-0.9.27-update-math.patch
@@ -684,15 +684,6 @@ diff -purbN uClibc-0.9.27/libm/Makefile
uClibc-0.9.28/libm/Makefile
 diff -purbN uClibc-0.9.27/libm/math_private.h uClibc-0.9.28/libm/math_private.h
 --- uClibc-0.9.27/libm/math_private.h	2005-01-12 08:59:21.000000000 +0100
 +++ uClibc-0.9.28/libm/math_private.h	2005-08-18 00:49:41.000000000 +0200
-@@ -11,7 +11,7 @@
-
- /*
-  * from: @(#)fdlibm.h 5.1 93/09/24
-- * $Id$
-+ * $Id$
-  */
-
- #ifndef _MATH_PRIVATE_H_
 @@ -40,7 +40,8 @@
   * For VFP, floats words follow the memory system mode.
   */
diff --git a/target_rpms/crosstool/SOURCES/uclibc-0.9.27-update-math.patch
b/target_rpms/crosstool/SOURCES/uclibc-0.9.27-update-math.patch
index 2d6f3c8..aacf6cd 100644
--- a/target_rpms/crosstool/SOURCES/uclibc-0.9.27-update-math.patch
+++ b/target_rpms/crosstool/SOURCES/uclibc-0.9.27-update-math.patch
@@ -684,15 +684,6 @@ diff -purbN uClibc-0.9.27/libm/Makefile
uClibc-0.9.28/libm/Makefile
 diff -purbN uClibc-0.9.27/libm/math_private.h uClibc-0.9.28/libm/math_private.h
 --- uClibc-0.9.27/libm/math_private.h	2005-01-12 08:59:21.000000000 +0100
 +++ uClibc-0.9.28/libm/math_private.h	2005-08-18 00:49:41.000000000 +0200
-@@ -11,7 +11,7 @@
-
- /*
-  * from: @(#)fdlibm.h 5.1 93/09/24
-- * $Id$
-+ * $Id$
-  */
-
- #ifndef _MATH_PRIVATE_H_
 @@ -40,7 +40,8 @@
   * For VFP, floats words follow the memory system mode.
   */
diff --git a/target_rpms/mtd_utils/SOURCES/mtd_utils-2.6.19.patch
b/target_rpms/mtd_utils/SOURCES/mtd_utils-2.6.19.patch
index 1a80d69..934ce37 100644
--- a/target_rpms/mtd_utils/SOURCES/mtd_utils-2.6.19.patch
+++ b/target_rpms/mtd_utils/SOURCES/mtd_utils-2.6.19.patch
@@ -155,7 +155,7 @@
 @@ -9,6 +9,7 @@
  #include <sys/mount.h>

- /* $Id$ */
+ /* $Id: doc_loadbios.c,v 1.7 2002/02/22 22:13:19 ilatypov Exp $ */
 +#include <linux/compiler.h> /* For __user */
  #include <linux/mtd/mtd.h>

diff --git a/target_rpms/rsh/SOURCES/netkit-rsh-0.16-jbj2.patch
b/target_rpms/rsh/SOURCES/netkit-rsh-0.16-jbj2.patch
index db994ee..9032710 100644
--- a/target_rpms/rsh/SOURCES/netkit-rsh-0.16-jbj2.patch
+++ b/target_rpms/rsh/SOURCES/netkit-rsh-0.16-jbj2.patch
@@ -1,14 +1,5 @@
 --- netkit-rsh-0.16/rshd/rshd.c.jbj2	Mon Jan 10 11:23:21 2000
 +++ netkit-rsh-0.16/rshd/rshd.c	Mon Jan 10 13:34:44 2000
-@@ -43,7 +43,7 @@
-  * From: @(#)rshd.c	5.38 (Berkeley) 3/2/91
-  */
- char rcsid[] =
--  "$Id$";
-+  "$Id$";
- #include "../version.h"
-
- /*
 @@ -171,7 +171,7 @@
      fd_set ready, readfrom;
      char buf[BUFSIZ], sig;