[Glibc-bsd-commits] r3450 - trunk/kfreebsd-9/debian/patches

[Robert Millan]

Author: rmh
Date: 2011-06-15 21:13:04 +0000 (Wed, 15 Jun 2011)
New Revision: 3450

Modified:
   trunk/kfreebsd-9/debian/patches/004_xargs.diff
Log:
refresh 004_xargs.diff

Modified: trunk/kfreebsd-9/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/004_xargs.diff	2011-06-15 20:58:22 UTC (rev 3449)
+++ trunk/kfreebsd-9/debian/patches/004_xargs.diff	2011-06-15 21:13:04 UTC (rev 3450)
@@ -1,10 +1,9 @@
 
 Status: xargs -J option requested to both upstream and debian.
 
-diff -ur a/sys/conf/kmod.mk b/sys/conf/kmod.mk
---- a/sys/conf/kmod.mk	2010-07-22 20:47:41.000000000 +0200
-+++ b/sys/conf/kmod.mk	2010-11-09 00:29:56.000000000 +0100
-@@ -220,7 +220,7 @@
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -217,7 +217,7 @@
  	grep -v '^#' < ${EXPORT_SYMS} > export_syms
  .endif
  	awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -12,21 +11,4 @@
 +	    export_syms | xargs -I% ${OBJCOPY} % ${.TARGET}
  .endif
  .endif
- .if !defined(DEBUG_FLAGS) && \
-Només a b/sys/conf: kmod.mk.orig
-diff -ur a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
---- a/sys/contrib/dev/acpica/acpica_prep.sh	2010-07-06 22:57:28.000000000 +0200
-+++ b/sys/contrib/dev/acpica/acpica_prep.sh	2010-11-09 00:30:19.000000000 +0100
-@@ -59,10 +59,10 @@
- # copy files
- echo copying full dirs
- for i in ${fulldirs}; do
--	find ${wrk} -name ${i} -type d -print | xargs -J % mv % ${dst}
-+	find ${wrk} -name ${i} -type d -print | xargs -I % mv % ${dst}
- done
- echo copying remaining files
--find ${wrk} -type f -print | xargs -J % mv % ${dst}
-+find ${wrk} -type f -print | xargs -I % mv % ${dst}
- 
- # canonify include paths
- for H in ${src_headers}; do
+ .if !defined(DEBUG_FLAGS) && ${__KLD_SHARED} == no