[Glibc-bsd-commits] r2001 - trunk/kfreebsd-7/debian/patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2007-10-18 18:32:33 +0000 (Thu, 18 Oct 2007)
New Revision: 2001

Modified:
   trunk/kfreebsd-7/debian/patches/005_binutils.diff
   trunk/kfreebsd-7/debian/patches/008_config.diff
   trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
   trunk/kfreebsd-7/debian/patches/913_uudecode.diff
Log:
* refresh RELENG_7 patches



Modified: trunk/kfreebsd-7/debian/patches/005_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/005_binutils.diff	2007-10-17 19:20:00 UTC (rev 2000)
+++ trunk/kfreebsd-7/debian/patches/005_binutils.diff	2007-10-18 18:32:33 UTC (rev 2001)
@@ -85,15 +85,7 @@
  	return (sel);
  }
  
-@@ -468,20 +468,20 @@
- rss(void)
- {
- 	u_int sel;
--	__asm __volatile("movl %%ss,%0" : "=rm" (sel));
-+	__asm __volatile("mov %%ss,%0" : "=rm" (sel));
- 	return (sel);
- }
- 
+@@ -468,12 +468,12 @@
  static __inline void
  load_fs(u_int sel)
  {

Modified: trunk/kfreebsd-7/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/008_config.diff	2007-10-17 19:20:00 UTC (rev 2000)
+++ trunk/kfreebsd-7/debian/patches/008_config.diff	2007-10-18 18:32:33 UTC (rev 2001)
@@ -16,7 +16,7 @@
 +#WARNS?=	6
 +CFLAGS+= -I. -I${.CURDIR} -D_GNU_SOURCE
  
- DPADD=	${LIBL}
+ DPADD=	${LIBL} ${LIBSBUF}
 -LDADD=	-ll -lsbuf
 +LDADD=	-ll -lbsd
  

Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff	2007-10-17 19:20:00 UTC (rev 2000)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff	2007-10-18 18:32:33 UTC (rev 2001)
@@ -263,7 +263,7 @@
  .endif
  
  .if ${MACHINE_ARCH} == "ia64"
-@@ -565,22 +532,12 @@
+@@ -565,21 +532,11 @@
  
  .if ${MACHINE_ARCH} == "powerpc"
  _an=		an
@@ -272,7 +272,6 @@
 -_ath_rate_amrr=	ath_rate_amrr
 -_ath_rate_onoe=	ath_rate_onoe
 -_ath_rate_sample=ath_rate_sample
- _gem=		gem
  _powermac_nvram=	powermac_nvram
  _smbfs=		smbfs
  .endif
@@ -285,7 +284,7 @@
 -_ath_rate_sample=ath_rate_sample
  _auxio=		auxio
  _em=		em
- _gem=		gem
+ _i2c=		i2c
 Index: sys/amd64/conf/GENERIC
 ===================================================================
 --- sys/amd64/conf/GENERIC.orig	2007-05-30 17:46:15.000000000 +0200

Modified: trunk/kfreebsd-7/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/913_uudecode.diff	2007-10-17 19:20:00 UTC (rev 2000)
+++ trunk/kfreebsd-7/debian/patches/913_uudecode.diff	2007-10-18 18:32:33 UTC (rev 2001)
@@ -4,12 +4,12 @@
 @@ -16,7 +16,7 @@
  .if ${MACHINE_ARCH} != "ia64"
  # ld is broken on ia64
- t3fw-4.1.0.bin: ${CXGB}/t3fw-4.1.0.bin.gz.uu
--	uudecode -p < ${CXGB}/t3fw-4.1.0.bin.gz.uu \
-+	uudecode -o- < ${CXGB}/t3fw-4.1.0.bin.gz.uu \
+ t3fw-4.7.0.bin: ${CXGB}/t3fw-4.7.0.bin.gz.uu
+-	uudecode -p < ${CXGB}/t3fw-4.7.0.bin.gz.uu \
++	uudecode -o- < ${CXGB}/t3fw-4.7.0.bin.gz.uu \
  	| gzip -dc > ${.TARGET}
  
- FIRMWS= t3fw-4.0.0.bin:t3fw400
+ FIRMWS= t3fw-4.7.0.bin:t3fw400
 diff -ur sys.orig/modules/ipwfw/ipw_bss/Makefile sys/modules/ipwfw/ipw_bss/Makefile
 --- sys.orig/modules/ipwfw/ipw_bss/Makefile	2007-05-30 18:15:13.000000000 +0200
 +++ sys/modules/ipwfw/ipw_bss/Makefile	2007-05-30 20:03:15.000000000 +0200
@@ -82,27 +82,3 @@
  
  .include <bsd.kmod.mk>
  
-diff -ur sys.orig/modules/mxge/mxge_eth_z8e/Makefile sys/modules/mxge/mxge_eth_z8e/Makefile
---- sys.orig/modules/mxge/mxge_eth_z8e/Makefile	2007-05-30 18:15:15.000000000 +0200
-+++ sys/modules/mxge/mxge_eth_z8e/Makefile	2007-05-30 20:02:39.000000000 +0200
-@@ -7,7 +7,7 @@
- CLEANFILES+= eth_z8e.dat
- 
- eth_z8e.dat: ${MXGE}/eth_z8e.dat.gz.uu
--	uudecode -p < ${MXGE}/eth_z8e.dat.gz.uu \
-+	uudecode -o- < ${MXGE}/eth_z8e.dat.gz.uu \
- 		| gzip -dc > ${.TARGET}
- 
- .include <bsd.kmod.mk>
-diff -ur sys.orig/modules/mxge/mxge_ethp_z8e/Makefile sys/modules/mxge/mxge_ethp_z8e/Makefile
---- sys.orig/modules/mxge/mxge_ethp_z8e/Makefile	2007-05-30 18:15:15.000000000 +0200
-+++ sys/modules/mxge/mxge_ethp_z8e/Makefile	2007-05-30 20:02:48.000000000 +0200
-@@ -7,7 +7,7 @@
- CLEANFILES+= ethp_z8e.dat
- 
- ethp_z8e.dat: ${MXGE}/ethp_z8e.dat.gz.uu
--	uudecode -p < ${MXGE}/ethp_z8e.dat.gz.uu \
-+	uudecode -o- < ${MXGE}/ethp_z8e.dat.gz.uu \
- 		| gzip -dc > ${.TARGET}
- 
- .include <bsd.kmod.mk>