[Glibc-bsd-commits] r1431 - in trunk/glibc-2.3-head: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2006-04-10 22:24:34 +0000 (Mon, 10 Apr 2006)
New Revision: 1431

Added:
   trunk/glibc-2.3-head/gen_sysdep_patch.sh
   trunk/glibc-2.3-head/patches/nscd_no_mremap.patch
   trunk/glibc-2.3-head/patches/pthread_at_fork.patch
   trunk/glibc-2.3-head/patches/readdir_r.patch
   trunk/glibc-2.3-head/patches/scripts.patch
   trunk/glibc-2.3-head/patches/sys_queue_h.patch
   trunk/glibc-2.3-head/patches/thread_signals.patch
   trunk/glibc-2.3-head/patches/undef-glibc.patch
Removed:
   trunk/glibc-2.3-head/debian.sh
   trunk/glibc-2.3-head/patches/fixes/
   trunk/glibc-2.3-head/patches/scripts/
   trunk/glibc-2.3-head/patches/upstream/
Modified:
   trunk/glibc-2.3-head/NOTES
Log:
The patches has been merged in the Debian glibc. So:
- remove patches merged upstream
- put all the remaining patches in the same directory
- remove debian.sh
- add gen_sysdep_patch.sh to create the patch which goes in the Debian glibc



Modified: trunk/glibc-2.3-head/NOTES
===================================================================
--- trunk/glibc-2.3-head/NOTES	2006-04-10 14:39:42 UTC (rev 1430)
+++ trunk/glibc-2.3-head/NOTES	2006-04-10 22:24:34 UTC (rev 1431)
@@ -6,8 +6,7 @@
 ------------------
 
 apt-get source glibc
-cd glibc-2.3.5
-../debian.sh ..
+update patches and sysdeps (if needed)
 <build normally>
 
 

Deleted: trunk/glibc-2.3-head/debian.sh
===================================================================
--- trunk/glibc-2.3-head/debian.sh	2006-04-10 14:39:42 UTC (rev 1430)
+++ trunk/glibc-2.3-head/debian.sh	2006-04-10 22:24:34 UTC (rev 1431)
@@ -1,25 +0,0 @@
-#!/bin/sh
-set -ex
-
-if [ "$1" = "" ] ; then
-  echo "Usage: $0 ..../glibc-2.3-head/  (to be run from debian source tree)"
-  exit 1
-fi
-
-# sysdeps dir
-tmp=`mktemp -d`
-mkdir -p ${tmp}/sysdeps/unix/bsd/bsd4.4 ${tmp}/linuxthreads/sysdeps/unix/bsd/bsd4.4
-cp -a $1/sysdeps/kfreebsd ${tmp}/sysdeps/unix/bsd/bsd4.4/
-cp -a $1/linuxthreads/kfreebsd ${tmp}/linuxthreads/sysdeps/unix/bsd/bsd4.4/
-echo "kfreebsd-sysdeps.diff -p0" >> debian/patches/series
-(cd ${tmp} && diff -x .svn -Nurd null sysdeps/ ) > debian/patches/kfreebsd-sysdeps.diff
-(cd ${tmp} && diff -x .svn -Nurd null linuxthreads/ ) >> debian/patches/kfreebsd-sysdeps.diff
-rm -rf ${tmp}
-
-for i in `ls $1/patches` ; do
-  cat $1/patches/$i/*.patch > debian/patches/kfreebsd-$i.diff
-  echo "kfreebsd-$i.diff -p0" >> debian/patches/series
-done
-
-exit 0
-

Added: trunk/glibc-2.3-head/gen_sysdep_patch.sh
===================================================================
--- trunk/glibc-2.3-head/gen_sysdep_patch.sh	2006-04-10 14:39:42 UTC (rev 1430)
+++ trunk/glibc-2.3-head/gen_sysdep_patch.sh	2006-04-10 22:24:34 UTC (rev 1431)
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -ex
+
+# sysdeps dir
+tmp=`mktemp -d`
+mkdir -p ${tmp}/sysdeps/unix/bsd/bsd4.4 ${tmp}/linuxthreads/sysdeps/unix/bsd/bsd4.4
+cp -a sysdeps/kfreebsd ${tmp}/sysdeps/unix/bsd/bsd4.4/
+cp -a linuxthreads/kfreebsd ${tmp}/linuxthreads/sysdeps/unix/bsd/bsd4.4/
+(cd ${tmp} && diff -x .svn -Nurd null sysdeps/ ) > sysdeps.diff
+(cd ${tmp} && diff -x .svn -Nurd null linuxthreads/ ) >> sysdeps.diff
+rm -rf ${tmp}
+


Property changes on: trunk/glibc-2.3-head/gen_sysdep_patch.sh
___________________________________________________________________
Name: svn:executable
   + *

Copied: trunk/glibc-2.3-head/patches/nscd_no_mremap.patch (from rev 1430, trunk/glibc-2.3-head/patches/fixes/nscd_no_mremap.patch)

Copied: trunk/glibc-2.3-head/patches/pthread_at_fork.patch (from rev 1430, trunk/glibc-2.3-head/patches/fixes/pthread_at_fork.patch)

Copied: trunk/glibc-2.3-head/patches/readdir_r.patch (from rev 1430, trunk/glibc-2.3-head/patches/fixes/readdir_r.patch)

Copied: trunk/glibc-2.3-head/patches/scripts.patch (from rev 1430, trunk/glibc-2.3-head/patches/scripts/scripts.patch)

Copied: trunk/glibc-2.3-head/patches/sys_queue_h.patch (from rev 1430, trunk/glibc-2.3-head/patches/fixes/sys_queue_h.patch)

Copied: trunk/glibc-2.3-head/patches/thread_signals.patch (from rev 1430, trunk/glibc-2.3-head/patches/fixes/thread_signals.patch)

Copied: trunk/glibc-2.3-head/patches/undef-glibc.patch (from rev 1430, trunk/glibc-2.3-head/patches/fixes/undef-glibc.patch)