[Glibc-bsd-commits] r2355 - in trunk/kfreebsd-8/debian: . patches
slackydeb-guest at alioth.debian.org
slackydeb-guest at alioth.debian.org
Fri Feb 6 01:27:07 UTC 2009
Author: slackydeb-guest
Date: 2009-02-06 01:27:07 +0000 (Fri, 06 Feb 2009)
New Revision: 2355
Removed:
trunk/kfreebsd-8/debian/patches/000_ext2fs.diff
trunk/kfreebsd-8/debian/patches/005_binutils.diff
trunk/kfreebsd-8/debian/patches/017_oss_compat.diff
trunk/kfreebsd-8/debian/patches/911_no_werror.diff
Modified:
trunk/kfreebsd-8/debian/copyright
trunk/kfreebsd-8/debian/patches/001_misc.diff
trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-8/debian/patches/912_binutils.diff
trunk/kfreebsd-8/debian/patches/913_uudecode.diff
trunk/kfreebsd-8/debian/patches/999_config.diff
trunk/kfreebsd-8/debian/patches/series
Log:
package builds
Modified: trunk/kfreebsd-8/debian/copyright
===================================================================
--- trunk/kfreebsd-8/debian/copyright 2009-02-05 09:25:08 UTC (rev 2354)
+++ trunk/kfreebsd-8/debian/copyright 2009-02-06 01:27:07 UTC (rev 2355)
@@ -41,7 +41,6 @@
(and disabled in the build system):
src/sys/compat/opensolaris
-src/sys/contrib/dev/ath
src/sys/contrib/dev/nve
src/sys/contrib/dev/oltr
src/sys/contrib/opensolaris
@@ -52,10 +51,7 @@
The following directories contained code that is itself free, but depends
on the above cited non-free sources and was also removed (and disabled):
-src/sys/dev/ath
src/sys/dev/nve
-src/sys/modules/ath
-src/sys/modules/ath_hal
src/sys/modules/hptmv
src/sys/modules/hptrr
src/sys/modules/nve
Deleted: trunk/kfreebsd-8/debian/patches/000_ext2fs.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_ext2fs.diff 2009-02-05 09:25:08 UTC (rev 2354)
+++ trunk/kfreebsd-8/debian/patches/000_ext2fs.diff 2009-02-06 01:27:07 UTC (rev 2355)
@@ -1,13 +0,0 @@
-upstream head revision 186740
-
---- head/sys/gnu/fs/ext2fs/ext2_bitops.h
-+++ head/sys/gnu/fs/ext2fs/ext2_bitops.h
-@@ -84,7 +84,7 @@
- mask = ~0U << (ofs & 31);
- bit = *p | ~mask;
- if (bit != ~0U)
-- return (ffs(~bit) + ofs - 1);
-+ return (ffs(~bit) + (ofs & ~31U) - 1);
- p++;
- ofs = (ofs + 31U) & ~31U;
- }
Modified: trunk/kfreebsd-8/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/001_misc.diff 2009-02-05 09:25:08 UTC (rev 2354)
+++ trunk/kfreebsd-8/debian/patches/001_misc.diff 2009-02-06 01:27:07 UTC (rev 2355)
@@ -7,7 +7,7 @@
--- src.orig/sys/conf/kern.mk
+++ src/sys/conf/kern.mk
@@ -1,5 +1,9 @@
- # $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $
+ # $FreeBSD: src/sys/conf/kern.mk,v 1.57 2008/07/23 06:16:34 imp Exp $
+.if !defined(OPSYS)
+OPSYS!= uname -s
@@ -33,7 +33,7 @@
.if !defined(WITH_GCC3)
_Wno_pointer_sign=-Wno-pointer-sign
.endif
-@@ -36,8 +44,12 @@
+@@ -36,7 +44,11 @@
# reserved for user applications.
#
.if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
@@ -46,63 +46,3 @@
+.endif
INLINE_LIMIT?= 8000
.endif
-
-Index: src/sys/conf/kern.post.mk
-===================================================================
---- src.orig/sys/conf/kern.post.mk
-+++ src/sys/conf/kern.post.mk
-@@ -1,5 +1,15 @@
- # $FreeBSD: src/sys/conf/kern.post.mk,v 1.100.2.1 2008/08/27 04:41:15 jb Exp $
-
-+.if !defined(OPSYS)
-+OPSYS!= uname -s
-+.endif
-+
-+.if ${OPSYS} == "FreeBSD"
-+WHEEL_GROUP?= wheel
-+.else
-+WHEEL_GROUP?= root
-+.endif
-+
- # Part of a unified Makefile for building kernels. This part includes all
- # the definitions that need to be after all the % directives except %RULES
- # and ones that act like they are part of %RULES.
-@@ -211,11 +221,9 @@
- .if exists(${DESTDIR}${KODIR})
- -thiskernel=`sysctl -n kern.bootfile` ; \
- if [ ! "`dirname "$$thiskernel"`" -ef ${DESTDIR}${KODIR} ] ; then \
-- chflags -R noschg ${DESTDIR}${KODIR} ; \
- rm -rf ${DESTDIR}${KODIR} ; \
- else \
- if [ -d ${DESTDIR}${KODIR}.old ] ; then \
-- chflags -R noschg ${DESTDIR}${KODIR}.old ; \
- rm -rf ${DESTDIR}${KODIR}.old ; \
- fi ; \
- mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \
-@@ -223,21 +231,21 @@
- fi
- .endif
- mkdir -p ${DESTDIR}${KODIR}
-- ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
-+ ${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${KERNEL_KO} ${DESTDIR}${KODIR}
- .if defined(DEBUG) && !defined(INSTALL_NODEBUG)
-- ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
-+ ${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
- .endif
- .if defined(KERNEL_EXTRA_INSTALL)
-- ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}
-+ ${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}
- .endif
-
-
-
- kernel-reinstall:
- @-chflags -R noschg ${DESTDIR}${KODIR}
-- ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
-+ ${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${KERNEL_KO} ${DESTDIR}${KODIR}
- .if defined(DEBUG) && !defined(INSTALL_NODEBUG)
-- ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
-+ ${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
- .endif
-
- config.o env.o hints.o vers.o vnode_if.o:
Deleted: trunk/kfreebsd-8/debian/patches/005_binutils.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/005_binutils.diff 2009-02-05 09:25:08 UTC (rev 2354)
+++ trunk/kfreebsd-8/debian/patches/005_binutils.diff 2009-02-06 01:27:07 UTC (rev 2355)
@@ -1,360 +0,0 @@
-
-Status: Reported as kern/93331
-
-Index: src/sys/i386/i386/locore.s
-===================================================================
---- src.orig/sys/i386/i386/locore.s
-+++ src/sys/i386/i386/locore.s
-@@ -338,7 +338,7 @@
- pushl %eax
- testl $PSL_VM,UC_EFLAGS(%eax)
- jne 1f
-- movl UC_GS(%eax),%gs /* restore %gs */
-+ movw UC_GS(%eax),%gs /* restore %gs */
- 1:
- movl $SYS_sigreturn,%eax
- pushl %eax /* junk to fake return addr. */
-@@ -355,7 +355,7 @@
- pushl %eax
- testl $PSL_VM,UC4_EFLAGS(%eax)
- jne 1f
-- movl UC4_GS(%eax),%gs /* restore %gs */
-+ movw UC4_GS(%eax),%gs /* restore %gs */
- 1:
- movl $344,%eax /* 4.x SYS_sigreturn */
- pushl %eax /* junk to fake return addr. */
-@@ -373,7 +373,7 @@
- pushl %eax
- testl $PSL_VM,SC_PS(%eax)
- jne 9f
-- movl SC_GS(%eax),%gs /* restore %gs */
-+ movw SC_GS(%eax),%gs /* restore %gs */
- 9:
- movl $103,%eax /* 3.x SYS_sigreturn */
- pushl %eax /* junk to fake return addr. */
-Index: src/sys/i386/i386/swtch.s
-===================================================================
---- src.orig/sys/i386/i386/swtch.s
-+++ src/sys/i386/i386/swtch.s
-@@ -130,7 +130,7 @@
- movl %ebp,PCB_EBP(%edx)
- movl %esi,PCB_ESI(%edx)
- movl %edi,PCB_EDI(%edx)
-- movl %gs,PCB_GS(%edx)
-+ movw %gs,PCB_GS(%edx)
- pushfl /* PSL */
- popl PCB_PSL(%edx)
- /* Test if debug registers should be saved. */
-@@ -301,7 +301,7 @@
- /* This must be done after loading the user LDT. */
- .globl cpu_switch_load_gs
- cpu_switch_load_gs:
-- movl PCB_GS(%edx),%gs
-+ movw PCB_GS(%edx),%gs
-
- /* Test if debug registers should be restored. */
- testl $PCB_DBREGS,PCB_FLAGS(%edx)
-@@ -371,7 +371,7 @@
- movl %ebp,PCB_EBP(%ecx)
- movl %esi,PCB_ESI(%ecx)
- movl %edi,PCB_EDI(%ecx)
-- movl %gs,PCB_GS(%ecx)
-+ movw %gs,PCB_GS(%ecx)
- pushfl
- popl PCB_PSL(%ecx)
-
-Index: src/sys/i386/include/cpufunc.h
-===================================================================
---- src.orig/sys/i386/include/cpufunc.h
-+++ src/sys/i386/include/cpufunc.h
-@@ -452,7 +452,7 @@
- rfs(void)
- {
- u_int sel;
-- __asm __volatile("movl %%fs,%0" : "=rm" (sel));
-+ __asm __volatile("mov %%fs,%0" : "=rm" (sel));
- return (sel);
- }
-
-@@ -468,7 +468,7 @@
- rgs(void)
- {
- u_int sel;
-- __asm __volatile("movl %%gs,%0" : "=rm" (sel));
-+ __asm __volatile("mov %%gs,%0" : "=rm" (sel));
- return (sel);
- }
-
-@@ -507,13 +507,13 @@
- static __inline void
- load_fs(u_int sel)
- {
-- __asm __volatile("movl %0,%%fs" : : "rm" (sel));
-+ __asm __volatile("mov %0,%%fs" : : "rm" (sel));
- }
-
- static __inline void
- load_gs(u_int sel)
- {
-- __asm __volatile("movl %0,%%gs" : : "rm" (sel));
-+ __asm __volatile("mov %0,%%gs" : : "rm" (sel));
- }
-
- static __inline void
-Index: src/sys/i386/linux/linux_locore.s
-===================================================================
---- src.orig/sys/i386/linux/linux_locore.s
-+++ src/sys/i386/linux/linux_locore.s
-@@ -8,7 +8,7 @@
- NON_GPROF_ENTRY(linux_sigcode)
- call *LINUX_SIGF_HANDLER(%esp)
- leal LINUX_SIGF_SC(%esp),%ebx /* linux scp */
-- movl LINUX_SC_GS(%ebx),%gs
-+ movw LINUX_SC_GS(%ebx),%gs
- movl %esp, %ebx /* pass sigframe */
- push %eax /* fake ret addr */
- movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */
-@@ -20,7 +20,7 @@
- call *LINUX_RT_SIGF_HANDLER(%esp)
- leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */
- leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */
-- movl LINUX_SC_GS(%ecx),%gs
-+ movw LINUX_SC_GS(%ecx),%gs
- push %eax /* fake ret addr */
- movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */
- int $0x80 /* enter kernel with args */
-Index: src/sys/compat/ndis/winx32_wrap.S
-===================================================================
---- src.orig/sys/compat/ndis/winx32_wrap.S
-+++ src/sys/compat/ndis/winx32_wrap.S
-@@ -369,7 +369,7 @@
- ret
-
- ENTRY(x86_setfs)
-- movl 4(%esp),%fs
-+ movw 4(%esp),%fs
- ret
-
- ENTRY(x86_gettid)
-Index: src/sys/amd64/amd64/cpu_switch.S
-===================================================================
---- src.orig/sys/amd64/amd64/cpu_switch.S
-+++ src/sys/amd64/amd64/cpu_switch.S
-@@ -259,12 +259,12 @@
- jmp do_tss
-
- store_seg:
-- movl %gs,PCB_GS(%r8)
-+ movw %gs,PCB_GS(%r8)
- testl $PCB_GS32BIT,PCB_FLAGS(%r8)
- jnz 2f
--1: movl %ds,PCB_DS(%r8)
-- movl %es,PCB_ES(%r8)
-- movl %fs,PCB_FS(%r8)
-+1: movw %ds,PCB_DS(%r8)
-+ movw %es,PCB_ES(%r8)
-+ movw %fs,PCB_FS(%r8)
- jmp done_store_seg
- 2: movq PCPU(GS32P),%rax
- movq (%rax),%rax
-@@ -276,11 +276,11 @@
- jnz 2f
- 1: movl $MSR_GSBASE,%ecx
- rdmsr
-- movl PCB_GS(%r8),%gs
-+ movw PCB_GS(%r8),%gs
- wrmsr
-- movl PCB_DS(%r8),%ds
-- movl PCB_ES(%r8),%es
-- movl PCB_FS(%r8),%fs
-+ movw PCB_DS(%r8),%ds
-+ movw PCB_ES(%r8),%es
-+ movw PCB_FS(%r8),%fs
- jmp done_load_seg
- /* Restore userland %gs while preserving kernel gsbase */
- 2: movq PCPU(GS32P),%rax
-Index: src/sys/amd64/ia32/ia32_signal.c
-===================================================================
---- src.orig/sys/amd64/ia32/ia32_signal.c
-+++ src/sys/amd64/ia32/ia32_signal.c
-@@ -328,8 +328,8 @@
- sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
- sf.sf_uc.uc_mcontext.mc_gs = rgs();
- sf.sf_uc.uc_mcontext.mc_fs = rfs();
-- __asm __volatile("movl %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es));
-- __asm __volatile("movl %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds));
-+ __asm __volatile("mov %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es));
-+ __asm __volatile("mov %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds));
- sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi;
- sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi;
- sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
-@@ -443,8 +443,8 @@
- sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
- sf.sf_uc.uc_mcontext.mc_gs = rgs();
- sf.sf_uc.uc_mcontext.mc_fs = rfs();
-- __asm __volatile("movl %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es));
-- __asm __volatile("movl %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds));
-+ __asm __volatile("mov %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es));
-+ __asm __volatile("mov %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds));
- sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi;
- sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi;
- sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
-Index: src/sys/amd64/include/cpufunc.h
-===================================================================
---- src.orig/sys/amd64/include/cpufunc.h
-+++ src/sys/amd64/include/cpufunc.h
-@@ -482,7 +482,7 @@
- rfs(void)
- {
- u_int sel;
-- __asm __volatile("movl %%fs,%0" : "=rm" (sel));
-+ __asm __volatile("mov %%fs,%0" : "=rm" (sel));
- return (sel);
- }
-
-@@ -490,7 +490,7 @@
- rgs(void)
- {
- u_int sel;
-- __asm __volatile("movl %%gs,%0" : "=rm" (sel));
-+ __asm __volatile("mov %%gs,%0" : "=rm" (sel));
- return (sel);
- }
-
-@@ -498,20 +498,20 @@
- rss(void)
- {
- u_int sel;
-- __asm __volatile("movl %%ss,%0" : "=rm" (sel));
-+ __asm __volatile("mov %%ss,%0" : "=rm" (sel));
- return (sel);
- }
-
- static __inline void
- load_ds(u_int sel)
- {
-- __asm __volatile("movl %0,%%ds" : : "rm" (sel));
-+ __asm __volatile("mov %0,%%ds" : : "rm" (sel));
- }
-
- static __inline void
- load_es(u_int sel)
- {
-- __asm __volatile("movl %0,%%es" : : "rm" (sel));
-+ __asm __volatile("mov %0,%%es" : : "rm" (sel));
- }
-
- #ifdef _KERNEL
-@@ -526,7 +526,7 @@
-
- /* Preserve the fsbase value across the selector load */
- fsbase = MSR_FSBASE;
-- __asm __volatile("rdmsr; movl %0,%%fs; wrmsr"
-+ __asm __volatile("rdmsr; mov %0,%%fs; wrmsr"
- : : "rm" (sel), "c" (fsbase) : "eax", "edx");
- }
-
-@@ -544,7 +544,7 @@
- * being trashed happens to be the kernel gsbase at the time.
- */
- gsbase = MSR_GSBASE;
-- __asm __volatile("pushfq; cli; rdmsr; movl %0,%%gs; wrmsr; popfq"
-+ __asm __volatile("pushfq; cli; rdmsr; mov %0,%%gs; wrmsr; popfq"
- : : "rm" (sel), "c" (gsbase) : "eax", "edx");
- }
- #else
-@@ -552,13 +552,13 @@
- static __inline void
- load_fs(u_int sel)
- {
-- __asm __volatile("movl %0,%%fs" : : "rm" (sel));
-+ __asm __volatile("mov %0,%%fs" : : "rm" (sel));
- }
-
- static __inline void
- load_gs(u_int sel)
- {
-- __asm __volatile("movl %0,%%gs" : : "rm" (sel));
-+ __asm __volatile("mov %0,%%gs" : : "rm" (sel));
- }
- #endif
-
-Index: src/sys/amd64/linux32/linux32_sysvec.c
-===================================================================
---- src.orig/sys/amd64/linux32/linux32_sysvec.c
-+++ src/sys/amd64/linux32/linux32_sysvec.c
-@@ -355,9 +355,9 @@
- frame.sf_sc.uc_mcontext.sc_mask = frame.sf_sc.uc_sigmask.__bits[0];
- frame.sf_sc.uc_mcontext.sc_gs = rgs();
- frame.sf_sc.uc_mcontext.sc_fs = rfs();
-- __asm __volatile("movl %%es,%0" :
-+ __asm __volatile("mov %%es,%0" :
- "=rm" (frame.sf_sc.uc_mcontext.sc_es));
-- __asm __volatile("movl %%ds,%0" :
-+ __asm __volatile("mov %%ds,%0" :
- "=rm" (frame.sf_sc.uc_mcontext.sc_ds));
- frame.sf_sc.uc_mcontext.sc_edi = regs->tf_rdi;
- frame.sf_sc.uc_mcontext.sc_esi = regs->tf_rsi;
-@@ -489,8 +489,8 @@
- frame.sf_sc.sc_mask = lmask.__bits[0];
- frame.sf_sc.sc_gs = rgs();
- frame.sf_sc.sc_fs = rfs();
-- __asm __volatile("movl %%es,%0" : "=rm" (frame.sf_sc.sc_es));
-- __asm __volatile("movl %%ds,%0" : "=rm" (frame.sf_sc.sc_ds));
-+ __asm __volatile("mov %%es,%0" : "=rm" (frame.sf_sc.sc_es));
-+ __asm __volatile("mov %%ds,%0" : "=rm" (frame.sf_sc.sc_ds));
- frame.sf_sc.sc_edi = regs->tf_rdi;
- frame.sf_sc.sc_esi = regs->tf_rsi;
- frame.sf_sc.sc_ebp = regs->tf_rbp;
-Index: src/sys/amd64/ia32/ia32_sigtramp.S
-===================================================================
---- src.orig/sys/amd64/ia32/ia32_sigtramp.S
-+++ src/sys/amd64/ia32/ia32_sigtramp.S
-@@ -45,8 +45,8 @@
- calll *IA32_SIGF_HANDLER(%esp)
- leal IA32_SIGF_UC(%esp),%eax /* get ucontext */
- pushl %eax
-- movl IA32_UC_ES(%eax),%es /* restore %es */
-- movl IA32_UC_DS(%eax),%ds /* restore %ds */
-+ mov IA32_UC_ES(%eax),%es /* restore %es */
-+ mov IA32_UC_DS(%eax),%ds /* restore %ds */
- movl $SYS_sigreturn,%eax
- pushl %eax /* junk to fake return addr. */
- int $0x80 /* enter kernel with args */
-@@ -60,8 +60,8 @@
- calll *IA32_SIGF_HANDLER(%esp)
- leal IA32_SIGF_UC4(%esp),%eax/* get ucontext */
- pushl %eax
-- movl IA32_UC4_ES(%eax),%es /* restore %es */
-- movl IA32_UC4_DS(%eax),%ds /* restore %ds */
-+ mov IA32_UC4_ES(%eax),%es /* restore %es */
-+ mov IA32_UC4_DS(%eax),%ds /* restore %ds */
- movl $344,%eax /* 4.x SYS_sigreturn */
- pushl %eax /* junk to fake return addr. */
- int $0x80 /* enter kernel with args */
-Index: src/sys/amd64/linux32/linux32_locore.s
-===================================================================
---- src.orig/sys/amd64/linux32/linux32_locore.s
-+++ src/sys/amd64/linux32/linux32_locore.s
-@@ -11,8 +11,8 @@
- NON_GPROF_ENTRY(linux_sigcode)
- call *LINUX_SIGF_HANDLER(%esp)
- leal LINUX_SIGF_SC(%esp),%ebx /* linux scp */
-- movl LINUX_SC_ES(%ebx),%es
-- movl LINUX_SC_DS(%ebx),%ds
-+ mov LINUX_SC_ES(%ebx),%es
-+ mov LINUX_SC_DS(%ebx),%ds
- movl %esp, %ebx /* pass sigframe */
- push %eax /* fake ret addr */
- movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */
-@@ -24,8 +24,8 @@
- call *LINUX_RT_SIGF_HANDLER(%esp)
- leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */
- leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */
-- movl LINUX_SC_ES(%ecx),%es
-- movl LINUX_SC_DS(%ecx),%ds
-+ mov LINUX_SC_ES(%ecx),%es
-+ mov LINUX_SC_DS(%ecx),%ds
- push %eax /* fake ret addr */
- movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */
- int $0x80 /* enter kernel with args */
Deleted: trunk/kfreebsd-8/debian/patches/017_oss_compat.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/017_oss_compat.diff 2009-02-05 09:25:08 UTC (rev 2354)
+++ trunk/kfreebsd-8/debian/patches/017_oss_compat.diff 2009-02-06 01:27:07 UTC (rev 2355)
@@ -1,13 +0,0 @@
-Index: src/sys/sys/soundcard.h
-===================================================================
---- src.orig/sys/sys/soundcard.h
-+++ src/sys/sys/soundcard.h
-@@ -813,6 +813,8 @@
- /* Has a coprocessor, sometimes it's a DSP but usually not */
- #define DSP_CAP_TRIGGER 0x00001000 /* Supports SETTRIGGER */
- #define DSP_CAP_MMAP 0x00002000 /* Supports mmap() */
-+#define DSP_CAP_MULTI 0x00004000 /* Supports multiple open */
-+#define DSP_CAP_BIND 0x00008000 /* Channel binding to front/rear/cneter/lfe */
-
- /*
- * What do these function do ?
Modified: trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2009-02-05 09:25:08 UTC (rev 2354)
+++ trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2009-02-06 01:27:07 UTC (rev 2355)
@@ -1,71 +1,32 @@
-Index: src/sys/conf/files
-===================================================================
---- src.orig/sys/conf/files
-+++ src/sys/conf/files
-@@ -473,18 +473,6 @@
- dev/ata/atapi-cd.c optional atapicd
- dev/ata/atapi-fd.c optional atapifd
- dev/ata/atapi-tape.c optional atapist
--dev/ath/ah_osdep.c optional ath_hal \
-- compile-with "${NORMAL_C} -I$S/dev/ath"
--dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr \
-- compile-with "${NORMAL_C} -I$S/dev/ath"
--dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \
-- compile-with "${NORMAL_C} -I$S/dev/ath"
--dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \
-- compile-with "${NORMAL_C} -I$S/dev/ath"
--dev/ath/if_ath.c optional ath \
-- compile-with "${NORMAL_C} -I$S/dev/ath"
--dev/ath/if_ath_pci.c optional ath pci \
-- compile-with "${NORMAL_C} -I$S/dev/ath"
- dev/awi/am79c930.c optional awi
- dev/awi/awi.c optional awi
- dev/awi/if_awi_pccard.c optional awi pccard
Index: src/sys/conf/files.i386
===================================================================
--- src.orig/sys/conf/files.i386
+++ src/sys/conf/files.i386
-@@ -46,42 +46,6 @@
+@@ -46,26 +46,5 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
--trlld.o optional oltr \
-- dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \
-- compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \
-- no-implicit-rule
--#
--hal.o optional ath_hal \
-- dependency "$S/contrib/dev/ath/public/i386-elf.hal.o.uu" \
-- compile-with "uudecode < $S/contrib/dev/ath/public/i386-elf.hal.o.uu" \
-- no-implicit-rule
--opt_ah.h optional ath_hal \
-- dependency "$S/contrib/dev/ath/public/i386-elf.opt_ah.h" \
-- compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h opt_ah.h" \
-- no-obj no-implicit-rule before-depend \
-- clean "opt_ah.h"
--#
-nvenetlib.o optional nve pci \
- dependency "$S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu" \
- compile-with "uudecode $S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
- no-implicit-rule
-#
--os+%DIKED-nve.h optional nve pci \
+-os+%DIKED-nve.h optional nve pci \
- dependency "$S/contrib/dev/nve/os.h" \
- compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \
- no-implicit-rule no-obj before-depend \
- clean "os+%DIKED-nve.h"
-#
+-hptmvraid.o optional hptmv \
+- dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \
+- compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \
+- no-implicit-rule
+-#
-hptrr_lib.o optional hptrr \
- dependency "$S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
- compile-with "uudecode < $S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
- no-implicit-rule
-#
--hptmvraid.o optional hptmv \
-- dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \
-- compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \
-- no-implicit-rule
--#
- #
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
@@ -181,14 +145,6 @@
@@ -91,20 +52,6 @@
dev/nvram/nvram.c optional nvram isa
dev/pcf/pcf_isa.c optional pcf
dev/random/nehemiah.c optional random
-Index: src/sys/conf/kern.pre.mk
-===================================================================
---- src.orig/sys/conf/kern.pre.mk
-+++ src/sys/conf/kern.pre.mk
-@@ -67,9 +67,6 @@
- # ... and the same for pf
- INCLUDES+= -I$S/contrib/pf
-
--# ... and the same for Atheros HAL
--INCLUDES+= -I$S/dev/ath
--
- # ... and the same for the NgATM stuff
- INCLUDES+= -I$S/contrib/ngatm
-
Index: src/sys/i386/conf/GENERIC
===================================================================
--- src.orig/sys/i386/conf/GENERIC
@@ -118,32 +65,10 @@
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -252,9 +250,6 @@
- device wlan_scan_ap # 802.11 AP mode scanning
- device wlan_scan_sta # 802.11 STA mode scanning
- device an # Aironet 4500/4800 802.11 wireless NICs.
--device ath # Atheros pci/cardbus NIC's
--device ath_hal # Atheros HAL (Hardware Access Layer)
--device ath_rate_sample # SampleRate tx rate control for ath
- device awi # BayStack 660 and others
- device ral # Ralink Technology RT2500 wireless NICs.
- device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
Index: src/sys/modules/Makefile
===================================================================
--- src.orig/sys/modules/Makefile
+++ src/sys/modules/Makefile
-@@ -26,11 +26,6 @@
- ${_arl} \
- ${_asr} \
- ata \
-- ${_ath} \
-- ${_ath_hal} \
-- ${_ath_rate_amrr} \
-- ${_ath_rate_onoe} \
-- ${_ath_rate_sample} \
- aue \
- ${_auxio} \
- ${_awi} \
@@ -100,8 +95,6 @@
hifn \
hme \
@@ -153,15 +78,15 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -200,11 +193,8 @@
+@@ -200,11 +193,9 @@
ntfs_iconv \
- ${_nxge} \
nullfs \
- ${_nve} \
${_nvram} \
${_nwfs} \
-- ${_oltr} \
+ ${_nxge} \
- ${_opensolaris} \
+ ohci \
${_padlock} \
patm \
${_pccard} \
@@ -173,29 +98,15 @@
zlib \
zyd
-@@ -372,11 +361,6 @@
- _apm= apm
- _ar= ar
- _arcnet= arcnet
--_ath= ath
--_ath_hal= ath_hal
--_ath_rate_amrr= ath_rate_amrr
--_ath_rate_onoe= ath_rate_onoe
--_ath_rate_sample=ath_rate_sample
- _awi= awi
- _bktr= bktr
- _cardbus= cardbus
-@@ -422,10 +406,6 @@
+@@ -422,8 +406,5 @@
.if ${MK_NCP} != "no"
_nwfs= nwfs
.endif
--_oltr= oltr
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_opensolaris= opensolaris
-.endif
_pccard= pccard
_pcfclock= pcfclock
- _pecoff= pecoff
@@ -447,9 +427,6 @@
_tmpfs= tmpfs
_wi= wi
@@ -223,18 +134,6 @@
_nvram= nvram
_nxge= nxge
_wpi= wpi
-@@ -508,11 +482,6 @@
- _agp= agp
- _an= an
- _arcmsr= arcmsr
--_ath= ath
--_ath_hal= ath_hal
--_ath_rate_amrr= ath_rate_amrr
--_ath_rate_onoe= ath_rate_onoe
--_ath_rate_sample=ath_rate_sample
- _cardbus= cardbus
- _cbb= cbb
- _cmx= cmx
@@ -533,8 +502,6 @@
_exca= exca
_ext2fs= ext2fs
@@ -254,9 +153,9 @@
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_opensolaris= opensolaris
-.endif
- _pccard= pccard
- _rdma= rdma
- _safe= safe
+ .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
+ .if exists(${.CURDIR}/../crypto/via)
+ _padlock= padlock
@@ -573,9 +536,6 @@
_wi= wi
_wpi= wpi
@@ -267,29 +166,6 @@
.endif
.if ${MACHINE_ARCH} == "ia64"
-@@ -617,22 +577,12 @@
-
- .if ${MACHINE_ARCH} == "powerpc"
- _an= an
--_ath= ath
--_ath_hal= ath_hal
--_ath_rate_amrr= ath_rate_amrr
--_ath_rate_onoe= ath_rate_onoe
--_ath_rate_sample=ath_rate_sample
- _bm= bm
- _nvram= powermac_nvram
- _smbfs= smbfs
- .endif
-
- .if ${MACHINE_ARCH} == "sparc64"
--_ath= ath
--_ath_hal= ath_hal
--_ath_rate_amrr= ath_rate_amrr
--_ath_rate_onoe= ath_rate_onoe
--_ath_rate_sample=ath_rate_sample
- _auxio= auxio
- _em= em
- _i2c= i2c
Index: src/sys/amd64/conf/GENERIC
===================================================================
--- src.orig/sys/amd64/conf/GENERIC
@@ -303,38 +179,18 @@
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -240,9 +238,6 @@
- device wlan_scan_ap # 802.11 AP mode scanning
- device wlan_scan_sta # 802.11 STA mode scanning
- device an # Aironet 4500/4800 802.11 wireless NICs.
--device ath # Atheros pci/cardbus NIC's
--device ath_hal # Atheros HAL (Hardware Access Layer)
--device ath_rate_sample # SampleRate tx rate control for ath
- device awi # BayStack 660 and others
- device ral # Ralink Technology RT2500 wireless NICs.
- device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
Index: src/sys/conf/files.amd64
===================================================================
--- src.orig/sys/conf/files.amd64
+++ src/sys/conf/files.amd64
-@@ -47,37 +47,6 @@
+@@ -47,26 +47,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
--hal.o optional ath_hal \
-- dependency "$S/contrib/dev/ath/public/x86_64-elf.hal.o.uu" \
-- compile-with "uudecode < $S/contrib/dev/ath/public/x86_64-elf.hal.o.uu" \
-- no-implicit-rule
--opt_ah.h optional ath_hal \
-- dependency "$S/contrib/dev/ath/public/x86_64-elf.opt_ah.h" \
-- compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/x86_64-elf.opt_ah.h opt_ah.h" \
-- no-obj no-implicit-rule before-depend \
-- clean "opt_ah.h"
--#
-nvenetlib.o optional nve pci \
- dependency "$S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu" \
- compile-with "uudecode $S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
-- no-implicit-rule
+- no-implicit-rule
-#
-os+%DIKED-nve.h optional nve pci \
- dependency "$S/contrib/dev/nve/os.h" \
@@ -346,16 +202,15 @@
- dependency "$S/dev/hptmv/amd64-elf.raid.o.uu" \
- compile-with "uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \
- no-implicit-rule
--#
-hptrr_lib.o optional hptrr \
- dependency "$S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \
- compile-with "uudecode < $S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \
- no-implicit-rule
-#
- #
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
-@@ -176,14 +145,6 @@
+ amd64/acpica/acpi_wakeup.c optional acpi
+@@ -173,14 +153,6 @@
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
@@ -370,7 +225,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
-@@ -191,7 +152,6 @@
+@@ -191,7 +163,6 @@
dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/mem/memutil.c optional mem
dev/nfe/if_nfe.c optional nfe pci
Deleted: trunk/kfreebsd-8/debian/patches/911_no_werror.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/911_no_werror.diff 2009-02-05 09:25:08 UTC (rev 2354)
+++ trunk/kfreebsd-8/debian/patches/911_no_werror.diff 2009-02-06 01:27:07 UTC (rev 2355)
@@ -1,25 +0,0 @@
-
-
-Index: src/sys/modules/hwpmc/Makefile
-===================================================================
---- src.orig/sys/modules/hwpmc/Makefile
-+++ src/sys/modules/hwpmc/Makefile
-@@ -9,6 +9,7 @@
- SRCS= hwpmc_mod.c hwpmc_logging.c vnode_if.h
-
- WARNS?= 2
-+NO_WERROR?= 1
-
- .if ${MACHINE_ARCH} == "amd64"
- SRCS+= hwpmc_amd.c hwpmc_piv.c hwpmc_x86.c
-Index: src/sys/modules/geom/geom_eli/Makefile
-===================================================================
---- src.orig/sys/modules/geom/geom_eli/Makefile
-+++ src/sys/modules/geom/geom_eli/Makefile
-@@ -12,5 +12,6 @@
- SRCS+= pkcs5v2.c
- SRCS+= vnode_if.h
- WARNS?= 2
-+NO_WERROR?= 1
-
- .include <bsd.kmod.mk>
Modified: trunk/kfreebsd-8/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/912_binutils.diff 2009-02-05 09:25:08 UTC (rev 2354)
+++ trunk/kfreebsd-8/debian/patches/912_binutils.diff 2009-02-06 01:27:07 UTC (rev 2355)
@@ -3,7 +3,7 @@
--- src.orig/sys/conf/ldscript.amd64
+++ src/sys/conf/ldscript.amd64
@@ -1,12 +1,12 @@
- /* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9.26.1 2008/11/25 02:59:29 kensmith Exp $ */
+ /* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9 2004/05/29 01:09:00 tjr Exp $ */
-OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
+OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
OUTPUT_ARCH(i386:x86-64)
Modified: trunk/kfreebsd-8/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/913_uudecode.diff 2009-02-05 09:25:08 UTC (rev 2354)
+++ trunk/kfreebsd-8/debian/patches/913_uudecode.diff 2009-02-06 01:27:07 UTC (rev 2355)
@@ -88,3 +88,16 @@
+ uudecode -o- ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu > ${.TARGET}
.include <bsd.kmod.mk>
+
+Index: src/sys/modules/iwnfw/Makefile
+===================================================================
+--- src.orig/sys/modules/iwnfw/Makefile
++++ src/sys/modules/iwnfw/Makefile
+@@ -9,6 +9,6 @@
+ CLEANFILES= iwlwifi-4965-4.44.17.fw
+
+ iwlwifi-4965-4.44.17.fw: ${.CURDIR}/../../contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu
+- uudecode -p ${.CURDIR}/../../contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu > ${.TARGET}
++ uudecode -o- ${.CURDIR}/../../contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu > ${.TARGET}
+
+ .include <bsd.kmod.mk>
Modified: trunk/kfreebsd-8/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_config.diff 2009-02-05 09:25:08 UTC (rev 2354)
+++ trunk/kfreebsd-8/debian/patches/999_config.diff 2009-02-06 01:27:07 UTC (rev 2355)
@@ -2,9 +2,9 @@
===================================================================
--- src.orig/sys/amd64/conf/GENERIC
+++ src/sys/amd64/conf/GENERIC
-@@ -18,13 +18,13 @@
+@@ -18,19 +18,19 @@
#
- # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.14 2008/08/29 18:54:35 jhb Exp $
+ # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.518 2009/01/19 15:33:06 sobomax Exp $
-cpu HAMMER
-ident GENERIC
@@ -15,6 +15,12 @@
-#hints "GENERIC.hints" # Default places to look for devices.
+hints "GENERIC.hints" # Default places to look for devices.
+ # Use the following to compile in values accessible to the kernel
+ # through getenv() (or kenv(1) in userland). The format of the file
+ # is 'variable=value', see kenv(1)
+ #
+ # env "GENERIC.env"
+
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
@@ -29,10 +35,11 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -53,7 +55,7 @@
+@@ -53,8 +55,8 @@
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
+ options COMPAT_FREEBSD7 # Compatible with FreeBSD7
-options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
@@ -77,21 +84,19 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -252,13 +249,8 @@
+@@ -252,11 +249,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
--device sl # Kernel SLIP
--device ppp # Kernel PPP
-device tun # Packet tunnel.
- device pty # Pseudo-ttys (telnet etc)
+ device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
-device gif # IPv6 and IPv4 tunneling
-device faith # IPv6-to-IPv4 relaying (translation)
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -275,12 +267,9 @@
+@@ -275,13 +267,10 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -99,6 +104,7 @@
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
device ural # Ralink Technology RT2500USB wireless NICs
+ device rum # Ralink Technology RT2501USB wireless NICs
-device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
# USB Serial devices
@@ -120,9 +126,9 @@
===================================================================
--- src.orig/sys/i386/conf/GENERIC
+++ src/sys/i386/conf/GENERIC
-@@ -18,15 +18,15 @@
+@@ -18,21 +18,21 @@
#
- # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.14 2008/08/29 18:54:35 jhb Exp $
+ # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.507 2009/01/19 17:20:09 sam Exp $
-cpu I486_CPU
-cpu I586_CPU
@@ -137,6 +143,12 @@
-#hints "GENERIC.hints" # Default places to look for devices.
+hints "GENERIC.hints" # Default places to look for devices.
+ # Use the following to compile in values accessible to the kernel
+ # through getenv() (or kenv(1) in userland). The format of the file
+ # is 'variable=value', see kenv(1)
+ #
+ # env "GENERIC.env"
+
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
@@ -151,10 +163,11 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -53,7 +55,7 @@
+@@ -53,8 +55,8 @@
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
+ options COMPAT_FREEBSD7 # Compatible with FreeBSD7
-options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
@@ -199,21 +212,19 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -265,13 +262,8 @@
+@@ -265,11 +262,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
--device sl # Kernel SLIP
--device ppp # Kernel PPP
-device tun # Packet tunnel.
- device pty # Pseudo-ttys (telnet etc)
+ device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
-device gif # IPv6 and IPv4 tunneling
-device faith # IPv6-to-IPv4 relaying (translation)
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -288,13 +280,10 @@
+@@ -288,15 +280,12 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -222,10 +233,12 @@
device ums # Mouse
device ural # Ralink Technology RT2500USB wireless NICs
device rum # Ralink Technology RT2501USB wireless NICs
+ device zyd # ZyDAS zb1211/zb1211b wireless NICs
-device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
# USB Serial devices
device ucom # Generic com ttys
+ device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
@@ -321,3 +310,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series 2009-02-05 09:25:08 UTC (rev 2354)
+++ trunk/kfreebsd-8/debian/patches/series 2009-02-06 01:27:07 UTC (rev 2355)
@@ -1,14 +1,11 @@
-000_ext2fs.diff
001_misc.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
-005_binutils.diff
007_clone_signals.diff
008_config.diff
009_disable_duped_modules.diff
010_ET_DYN.diff
013_ip_packed.diff
-017_oss_compat.diff
020_linker.diff
101_subsecond_timestamp.diff
102_POLL_HUP.diff
@@ -19,7 +16,6 @@
907_cpu_class.diff
908_linprocfs_is_not_proc.diff
910_GENERIC_hints.diff
-911_no_werror.diff
912_binutils.diff
913_uudecode.diff
999_config.diff
More information about the Glibc-bsd-commits
mailing list