[Glibc-bsd-commits] r3631 - in trunk/kfreebsd-9/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-26 14:11:25 +0000 (Tue, 26 Jul 2011)
New Revision: 3631

Removed:
   trunk/kfreebsd-9/debian/patches/200_xen.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/series
   trunk/kfreebsd-9/debian/rules
Log:
Make regex kludge a bit more strict.  This removes the need for 200_xen.diff (removed).

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-07-26 13:23:36 UTC (rev 3630)
+++ trunk/kfreebsd-9/debian/changelog	2011-07-26 14:11:25 UTC (rev 3631)
@@ -5,8 +5,10 @@
   * Disable 007_clone_signals.diff, since we already require eglibc
     2.13-11 or later.  This ensures that the RFTSIGZMB codepath is
     tested.
+  * Make regex kludge a bit more strict.  This removes the need for
+    200_xen.diff (removed).
 
- -- Robert Millan <rmh at debian.org>  Tue, 26 Jul 2011 15:23:02 +0200
+ -- Robert Millan <rmh at debian.org>  Tue, 26 Jul 2011 15:25:36 +0200
 
 kfreebsd-9 (9.0~svn224126-1) experimental; urgency=low
 

Deleted: trunk/kfreebsd-9/debian/patches/200_xen.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/200_xen.diff	2011-07-26 13:23:36 UTC (rev 3630)
+++ trunk/kfreebsd-9/debian/patches/200_xen.diff	2011-07-26 14:11:25 UTC (rev 3631)
@@ -1,22 +0,0 @@
---- a/sys/dev/xen/evtchn/evtchn_dev.c
-+++ b/sys/dev/xen/evtchn/evtchn_dev.c
-@@ -41,7 +41,7 @@
- } evtchn_softc_t;
- 
- 
--#ifdef linuxcrap
-+#if 0
- /* NB. This must be shared amongst drivers if more things go in /dev/xen */
- static devfs_handle_t xen_dev_dir;
- #endif
---- a/sys/xen/evtchn/evtchn_dev.c
-+++ b/sys/xen/evtchn/evtchn_dev.c
-@@ -39,7 +39,7 @@
- } evtchn_softc_t;
- 
- 
--#ifdef linuxcrap
-+#if 0
- /* NB. This must be shared amongst drivers if more things go in /dev/xen */
- static devfs_handle_t xen_dev_dir;
- #endif

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-07-26 13:23:36 UTC (rev 3630)
+++ trunk/kfreebsd-9/debian/patches/series	2011-07-26 14:11:25 UTC (rev 3631)
@@ -12,7 +12,6 @@
 108_teken_utf8_table.diff
 109_linprocfs_non_x86.diff
 110_disable_trampoline_flavour.diff
-200_xen.diff
 902_version.diff
 903_disable_non-free_drivers.diff 
 904_dev_full.diff

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2011-07-26 13:23:36 UTC (rev 3630)
+++ trunk/kfreebsd-9/debian/rules	2011-07-26 14:11:25 UTC (rev 3631)
@@ -87,13 +87,13 @@
 	set -e ; find src/sys -type f | (while read i ; do \
 		sed -i $$i \
 		-e 's/defined\s*(\s*__FreeBSD__\s*)/1/g' \
-		-e 's/#\s*ifdef\s*__FreeBSD__/#if 1/g' \
-		-e 's/#\s*ifndef\s*__FreeBSD__/#if 0/g' \
+		-e 's/#\s*ifdef\s*__FreeBSD__\s*/#if 1/g' \
+		-e 's/#\s*ifndef\s*__FreeBSD__\s*/#if 0/g' \
 		-e 's/__FreeBSD__/$(major)/g' \
 		\
 		-e 's/defined\s*(\s*\(__linux__\|linux\)\s*)/0/g' \
-		-e 's/#\s*ifdef\s*\(__linux__\|linux\)/#if 0/g' \
-		-e 's/#\s*ifndef\s*\(__linux__\|linux\)/#if 1/g' \
+		-e 's/#\s*ifdef\s*\(__linux__\|linux\)\s*/#if 0/g' \
+		-e 's/#\s*ifndef\s*\(__linux__\|linux\)\s*/#if 1/g' \
 	; done)
 
 	install debian/gen-ld-u-options src/usr.sbin/config