[Glibc-bsd-commits] r2291 - in trunk/kfreebsd-7/debian: . patches
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Wed Aug 6 19:45:20 UTC 2008
Author: aurel32
Date: 2008-08-06 19:45:19 +0000 (Wed, 06 Aug 2008)
New Revision: 2291
Modified:
trunk/kfreebsd-7/debian/changelog
trunk/kfreebsd-7/debian/control.in
trunk/kfreebsd-7/debian/patches/000_tcp.diff
trunk/kfreebsd-7/debian/patches/001_misc.diff
trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff
trunk/kfreebsd-7/debian/patches/004_xargs.diff
trunk/kfreebsd-7/debian/patches/005_binutils.diff
trunk/kfreebsd-7/debian/patches/007_clone_signals.diff
trunk/kfreebsd-7/debian/patches/008_config.diff
trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff
trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff
trunk/kfreebsd-7/debian/patches/013_ip_packed.diff
trunk/kfreebsd-7/debian/patches/017_oss_compat.diff
trunk/kfreebsd-7/debian/patches/020_linker.diff
trunk/kfreebsd-7/debian/patches/030_abi_cld.diff
trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff
trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff
trunk/kfreebsd-7/debian/patches/902_version.diff
trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-7/debian/patches/904_dev_full.diff
trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-7/debian/patches/907_cpu_class.diff
trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff
trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff
trunk/kfreebsd-7/debian/patches/911_no_werror.diff
trunk/kfreebsd-7/debian/patches/912_binutils.diff
trunk/kfreebsd-7/debian/patches/913_uudecode.diff
trunk/kfreebsd-7/debian/patches/999_config.diff
trunk/kfreebsd-7/debian/patches/series
Log:
Upload to experimental
Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/changelog 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,4 +1,4 @@
-kfreebsd-7 (7.1~cvs20080731-1) EXPERIMENTAL; urgency=low
+kfreebsd-7 (7.1~cvs20080806-1) experimental; urgency=low
[ Petr Salinger ]
* New upstream snapshot of RELENG_7
@@ -6,7 +6,7 @@
- refresh remaining patches
- 030_abi_cld.diff and 000_tcp.diff applied upstream
* Reduce number of kernel-image flavours
- * Reenable ums driver in GENERIC. Closes #492891.
+ * Reenable ums driver in GENERIC. Closes: #492891.
* Do not specify SMP in GENERIC, it is enabled on per flavour basis
* Ship config file used for building corresponding flavour
* libdb-dev is now a real package, build-depend only on it.
@@ -14,8 +14,13 @@
Closes: #474762.
* add Vcs-* fields into debian/control.
* redefine POLL_HUP to be distinct from POLL_ERR
+
+ [ Aurelien Jarno ]
+ * Bumped Standards-Version to 3.8.0 (no changes).
+ * debian/patches/*: convert to patchlevel p1 as requested by the new
+ dpkg-source.
- -- Aurelien Jarno <aurel32 at debian.org> Thu, 17 Jul 2008 11:11:11 +0200
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 06 Aug 2008 20:34:46 +0200
kfreebsd-7 (7.0-4) unstable; urgency=medium
Modified: trunk/kfreebsd-7/debian/control.in
===================================================================
--- trunk/kfreebsd-7/debian/control.in 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/control.in 2008-08-06 19:45:19 UTC (rev 2291)
@@ -6,7 +6,7 @@
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
Build-Depends: debhelper (>= 4.1.0), bzip2, quilt, freebsd-buildutils (>= @major@) [kfreebsd-i386 kfreebsd-amd64] | freebsd6-buildutils (>= 6.2) [kfreebsd-i386 kfreebsd-amd64], libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Package: kfreebsd-source- at version@
Architecture: all
Modified: trunk/kfreebsd-7/debian/patches/000_tcp.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/000_tcp.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/000_tcp.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,10 +1,10 @@
-Index: sys/netinet/tcp.h
+Index: src/sys/netinet/tcp.h
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp.h,v
retrieving revision 1.40
diff -p -u -I__FBSDID -I$FreeBSD -r1.40 tcp.h
---- sys/netinet/tcp.h 25 May 2007 21:28:49 -0000 1.40
-+++ sys/netinet/tcp.h 18 Jun 2008 05:36:20 -0000
+--- src/sys/netinet/tcp.h 25 May 2007 21:28:49 -0000 1.40
++++ src/sys/netinet/tcp.h 18 Jun 2008 05:36:20 -0000
@@ -78,6 +78,8 @@ struct tcphdr {
#define TCPOPT_EOL 0
@@ -14,13 +14,13 @@
#define TCPOPT_NOP 1
#define TCPOLEN_NOP 1
#define TCPOPT_MAXSEG 2
-Index: sys/netinet/tcp_output.c
+Index: src/sys/netinet/tcp_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_output.c,v
retrieving revision 1.141.2.3
diff -p -u -I__FBSDID -I$FreeBSD -r1.141.2.3 tcp_output.c
---- sys/netinet/tcp_output.c 5 Dec 2007 10:37:17 -0000 1.141.2.3
-+++ sys/netinet/tcp_output.c 18 Jun 2008 05:36:21 -0000
+--- src/sys/netinet/tcp_output.c 5 Dec 2007 10:37:17 -0000 1.141.2.3
++++ src/sys/netinet/tcp_output.c 18 Jun 2008 05:36:21 -0000
@@ -1280,12 +1280,16 @@ tcp_addoptions(struct tcpopt *to, u_char
for (mask = 1; mask < TOF_MAXOPT; mask <<= 1) {
if ((to->to_flags & mask) != mask)
Modified: trunk/kfreebsd-7/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/001_misc.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/001_misc.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -2,10 +2,10 @@
Status: chflags is BSD-specific. We could add it to freebsd-utils.
The rest has been rejected (kern/93502)
-Index: sys/conf/kern.mk
+Index: src/sys/conf/kern.mk
===================================================================
---- sys/conf/kern.mk.orig
-+++ sys/conf/kern.mk
+--- src/sys/conf/kern.mk.orig
++++ 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 $
@@ -47,10 +47,10 @@
INLINE_LIMIT?= 8000
.endif
-Index: sys/conf/kern.post.mk
+Index: src/sys/conf/kern.post.mk
===================================================================
---- sys/conf/kern.post.mk.orig
-+++ sys/conf/kern.post.mk
+--- src/sys/conf/kern.post.mk.orig
++++ src/sys/conf/kern.post.mk
@@ -1,5 +1,15 @@
# $FreeBSD: src/sys/conf/kern.post.mk,v 1.100 2007/03/23 21:55:59 imp Exp $
Modified: trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,7 +1,7 @@
-Index: sys/dev/aic7xxx/aicasm/Makefile
+Index: src/sys/dev/aic7xxx/aicasm/Makefile
===================================================================
---- sys/dev/aic7xxx/aicasm/Makefile.orig
-+++ sys/dev/aic7xxx/aicasm/Makefile
+--- src/sys/dev/aic7xxx/aicasm/Makefile.orig
++++ src/sys/dev/aic7xxx/aicasm/Makefile
@@ -14,7 +14,7 @@
SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
@@ -25,10 +25,10 @@
.ifdef MAKESRCPATH
CFLAGS+= -I${MAKESRCPATH}
.endif
-Index: sys/dev/aic7xxx/aicasm/aicasm.h
+Index: src/sys/dev/aic7xxx/aicasm/aicasm.h
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm.h.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm.h
+--- src/sys/dev/aic7xxx/aicasm/aicasm.h.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm.h
@@ -42,8 +42,9 @@
* $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.17 2005/01/06 01:42:27 imp Exp $
*/
@@ -41,10 +41,10 @@
#else
#include <sys/queue.h>
#endif
-Index: sys/dev/aic7xxx/aicasm/aicasm_gram.y
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_gram.y
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_gram.y.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_gram.y
+--- src/sys/dev/aic7xxx/aicasm/aicasm_gram.y.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_gram.y
@@ -52,8 +52,9 @@
#include <string.h>
#include <sysexits.h>
@@ -57,10 +57,10 @@
#else
#include <sys/queue.h>
#endif
-Index: sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+--- src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
@@ -52,8 +52,9 @@
#include <string.h>
#include <sysexits.h>
@@ -73,10 +73,10 @@
#else
#include <sys/queue.h>
#endif
-Index: sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+--- src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
@@ -51,8 +51,10 @@
#include <stdio.h>
#include <string.h>
@@ -90,10 +90,10 @@
#else
#include <sys/queue.h>
#endif
-Index: sys/dev/aic7xxx/aicasm/aicasm_scan.l
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_scan.l
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_scan.l.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_scan.l
+--- src/sys/dev/aic7xxx/aicasm/aicasm_scan.l.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_scan.l
@@ -51,8 +51,10 @@
#include <stdio.h>
#include <string.h>
@@ -107,10 +107,10 @@
#else
#include <sys/queue.h>
#endif
-Index: sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_symbol.c.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+--- src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
@@ -44,10 +44,11 @@
#include <sys/types.h>
@@ -126,10 +126,10 @@
#endif
#include <fcntl.h>
#include <inttypes.h>
-Index: sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+Index: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_symbol.h.orig
-+++ sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+--- src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h.orig
++++ src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -42,8 +42,9 @@
* $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.17 2005/01/06 01:42:27 imp Exp $
*/
Modified: trunk/kfreebsd-7/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/004_xargs.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/004_xargs.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,10 +1,10 @@
Status: xargs -J option requested to both upstream and debian.
-Index: sys/conf/kmod.mk
+Index: src/sys/conf/kmod.mk
===================================================================
---- sys/conf/kmod.mk.orig
-+++ sys/conf/kmod.mk
+--- src/sys/conf/kmod.mk.orig
++++ src/sys/conf/kmod.mk
@@ -204,7 +204,7 @@
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
@@ -14,10 +14,10 @@
.endif
.endif
.if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
-Index: sys/contrib/dev/acpica/acpica_prep.sh
+Index: src/sys/contrib/dev/acpica/acpica_prep.sh
===================================================================
---- sys/contrib/dev/acpica/acpica_prep.sh.orig
-+++ sys/contrib/dev/acpica/acpica_prep.sh
+--- src/sys/contrib/dev/acpica/acpica_prep.sh.orig
++++ src/sys/contrib/dev/acpica/acpica_prep.sh
@@ -55,12 +55,12 @@
echo copying full dirs
Modified: trunk/kfreebsd-7/debian/patches/005_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/005_binutils.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/005_binutils.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,10 +1,10 @@
Status: Reported as kern/93331
-Index: sys/i386/i386/locore.s
+Index: src/sys/i386/i386/locore.s
===================================================================
---- sys/i386/i386/locore.s.orig
-+++ sys/i386/i386/locore.s
+--- src/sys/i386/i386/locore.s.orig
++++ src/sys/i386/i386/locore.s
@@ -358,7 +358,7 @@
pushl %eax
testl $PSL_VM,UC_EFLAGS(%eax)
@@ -32,10 +32,10 @@
9:
movl $103,%eax /* 3.x SYS_sigreturn */
pushl %eax /* junk to fake return addr. */
-Index: sys/i386/i386/swtch.s
+Index: src/sys/i386/i386/swtch.s
===================================================================
---- sys/i386/i386/swtch.s.orig
-+++ sys/i386/i386/swtch.s
+--- src/sys/i386/i386/swtch.s.orig
++++ src/sys/i386/i386/swtch.s
@@ -130,7 +130,7 @@
movl %ebp,PCB_EBP(%edx)
movl %esi,PCB_ESI(%edx)
@@ -63,10 +63,10 @@
pushfl
popl PCB_PSL(%ecx)
-Index: sys/i386/include/cpufunc.h
+Index: src/sys/i386/include/cpufunc.h
===================================================================
---- sys/i386/include/cpufunc.h.orig
-+++ sys/i386/include/cpufunc.h
+--- src/sys/i386/include/cpufunc.h.orig
++++ src/sys/i386/include/cpufunc.h
@@ -452,7 +452,7 @@
rfs(void)
{
@@ -101,10 +101,10 @@
}
static __inline void
-Index: sys/i386/linux/linux_locore.s
+Index: src/sys/i386/linux/linux_locore.s
===================================================================
---- sys/i386/linux/linux_locore.s.orig
-+++ sys/i386/linux/linux_locore.s
+--- src/sys/i386/linux/linux_locore.s.orig
++++ src/sys/i386/linux/linux_locore.s
@@ -8,7 +8,7 @@
NON_GPROF_ENTRY(linux_sigcode)
call *LINUX_SIGF_HANDLER(%esp)
@@ -123,10 +123,10 @@
push %eax /* fake ret addr */
movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */
int $0x80 /* enter kernel with args */
-Index: sys/compat/ndis/winx32_wrap.S
+Index: src/sys/compat/ndis/winx32_wrap.S
===================================================================
---- sys/compat/ndis/winx32_wrap.S.orig
-+++ sys/compat/ndis/winx32_wrap.S
+--- src/sys/compat/ndis/winx32_wrap.S.orig
++++ src/sys/compat/ndis/winx32_wrap.S
@@ -369,7 +369,7 @@
ret
@@ -136,10 +136,10 @@
ret
ENTRY(x86_gettid)
-Index: sys/amd64/amd64/cpu_switch.S
+Index: src/sys/amd64/amd64/cpu_switch.S
===================================================================
---- sys/amd64/amd64/cpu_switch.S.orig
-+++ sys/amd64/amd64/cpu_switch.S
+--- src/sys/amd64/amd64/cpu_switch.S.orig
++++ src/sys/amd64/amd64/cpu_switch.S
@@ -110,7 +110,7 @@
jz 1f /* no, skip over */
@@ -158,10 +158,10 @@
wrmsr
1:
-Index: sys/amd64/ia32/ia32_signal.c
+Index: src/sys/amd64/ia32/ia32_signal.c
===================================================================
---- sys/amd64/ia32/ia32_signal.c.orig
-+++ sys/amd64/ia32/ia32_signal.c
+--- src/sys/amd64/ia32/ia32_signal.c.orig
++++ 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();
@@ -184,10 +184,10 @@
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: sys/amd64/include/cpufunc.h
+Index: src/sys/amd64/include/cpufunc.h
===================================================================
---- sys/amd64/include/cpufunc.h.orig
-+++ sys/amd64/include/cpufunc.h
+--- src/sys/amd64/include/cpufunc.h.orig
++++ src/sys/amd64/include/cpufunc.h
@@ -482,7 +482,7 @@
rfs(void)
{
@@ -264,10 +264,10 @@
}
#endif
-Index: sys/amd64/linux32/linux32_sysvec.c
+Index: src/sys/amd64/linux32/linux32_sysvec.c
===================================================================
---- sys/amd64/linux32/linux32_sysvec.c.orig
-+++ sys/amd64/linux32/linux32_sysvec.c
+--- src/sys/amd64/linux32/linux32_sysvec.c.orig
++++ 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();
@@ -291,10 +291,10 @@
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: sys/amd64/ia32/ia32_sigtramp.S
+Index: src/sys/amd64/ia32/ia32_sigtramp.S
===================================================================
---- sys/amd64/ia32/ia32_sigtramp.S.orig
-+++ sys/amd64/ia32/ia32_sigtramp.S
+--- src/sys/amd64/ia32/ia32_sigtramp.S.orig
++++ src/sys/amd64/ia32/ia32_sigtramp.S
@@ -45,8 +45,8 @@
calll *IA32_SIGF_HANDLER(%esp)
leal IA32_SIGF_UC(%esp),%eax /* get ucontext */
@@ -317,10 +317,10 @@
movl $344,%eax /* 4.x SYS_sigreturn */
pushl %eax /* junk to fake return addr. */
int $0x80 /* enter kernel with args */
-Index: sys/amd64/linux32/linux32_locore.s
+Index: src/sys/amd64/linux32/linux32_locore.s
===================================================================
---- sys/amd64/linux32/linux32_locore.s.orig
-+++ sys/amd64/linux32/linux32_locore.s
+--- src/sys/amd64/linux32/linux32_locore.s.orig
++++ src/sys/amd64/linux32/linux32_locore.s
@@ -11,8 +11,8 @@
NON_GPROF_ENTRY(linux_sigcode)
call *LINUX_SIGF_HANDLER(%esp)
Modified: trunk/kfreebsd-7/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/007_clone_signals.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/007_clone_signals.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,7 +1,7 @@
-Index: sys/kern/kern_fork.c
+Index: src/sys/kern/kern_fork.c
===================================================================
---- sys/kern/kern_fork.c.orig
-+++ sys/kern/kern_fork.c
+--- src/sys/kern/kern_fork.c.orig
++++ src/sys/kern/kern_fork.c
@@ -511,7 +511,11 @@
p2->p_sigacts = newsigacts;
}
@@ -15,10 +15,10 @@
else
p2->p_sigparent = SIGCHLD;
-Index: sys/sys/unistd.h
+Index: src/sys/sys/unistd.h
===================================================================
---- sys/sys/unistd.h.orig
-+++ sys/sys/unistd.h
+--- src/sys/sys/unistd.h.orig
++++ src/sys/sys/unistd.h
@@ -181,6 +181,10 @@
#define RFHIGHPID (1<<18) /* use a pid higher then 10 (idleproc) */
#define RFPPWAIT (1<<31) /* parent sleeps until child exits (vfork) */
Modified: trunk/kfreebsd-7/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/008_config.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/008_config.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -3,10 +3,10 @@
Status: gotta uncomment WARNS (see #351366), and find a portable way to add
"-lbsd". after this it can be sent upstream.
-Index: usr.sbin/config/Makefile
+Index: src/usr.sbin/config/Makefile
===================================================================
---- usr.sbin/config/Makefile.orig
-+++ usr.sbin/config/Makefile
+--- src/usr.sbin/config/Makefile.orig
++++ src/usr.sbin/config/Makefile
@@ -9,11 +9,11 @@
kernconf.c: kernconf.tmpl
file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
@@ -22,10 +22,10 @@
CLEANFILES+= kernconf.c
-Index: usr.sbin/config/main.c
+Index: src/usr.sbin/config/main.c
===================================================================
---- usr.sbin/config/main.c.orig
-+++ usr.sbin/config/main.c
+--- src/usr.sbin/config/main.c.orig
++++ src/usr.sbin/config/main.c
@@ -41,12 +41,18 @@
"$FreeBSD: src/usr.sbin/config/main.c,v 1.76.2.1 2008/06/27 15:20:18 emaste Exp $";
#endif /* not lint */
Modified: trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,10 +1,10 @@
Status: in upstream BTS
-Index: sys/conf/Makefile.amd64
+Index: src/sys/conf/Makefile.amd64
===================================================================
---- sys/conf/Makefile.amd64.orig
-+++ sys/conf/Makefile.amd64
+--- src/sys/conf/Makefile.amd64.orig
++++ src/sys/conf/Makefile.amd64
@@ -38,6 +38,8 @@
MKMODULESENV+= MACHINE=amd64
@@ -14,10 +14,10 @@
%BEFORE_DEPEND
%OBJS
-Index: sys/conf/Makefile.arm
+Index: src/sys/conf/Makefile.arm
===================================================================
---- sys/conf/Makefile.arm.orig
-+++ sys/conf/Makefile.arm
+--- src/sys/conf/Makefile.arm.orig
++++ src/sys/conf/Makefile.arm
@@ -109,6 +109,8 @@
rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
inflate-tramp.o tmphack.S
@@ -27,10 +27,10 @@
%BEFORE_DEPEND
%OBJS
-Index: sys/conf/Makefile.i386
+Index: src/sys/conf/Makefile.i386
===================================================================
---- sys/conf/Makefile.i386.orig
-+++ sys/conf/Makefile.i386
+--- src/sys/conf/Makefile.i386.orig
++++ src/sys/conf/Makefile.i386
@@ -34,6 +34,8 @@
MKMODULESENV+= MACHINE=${MACHINE}
@@ -40,10 +40,10 @@
%BEFORE_DEPEND
%OBJS
-Index: sys/conf/Makefile.ia64
+Index: src/sys/conf/Makefile.ia64
===================================================================
---- sys/conf/Makefile.ia64.orig
-+++ sys/conf/Makefile.ia64
+--- src/sys/conf/Makefile.ia64.orig
++++ src/sys/conf/Makefile.ia64
@@ -36,6 +36,8 @@
ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
@@ -53,10 +53,10 @@
%BEFORE_DEPEND
%OBJS
-Index: sys/conf/Makefile.pc98
+Index: src/sys/conf/Makefile.pc98
===================================================================
---- sys/conf/Makefile.pc98.orig
-+++ sys/conf/Makefile.pc98
+--- src/sys/conf/Makefile.pc98.orig
++++ src/sys/conf/Makefile.pc98
@@ -34,6 +34,8 @@
MKMODULESENV+= MACHINE=${MACHINE}
@@ -66,10 +66,10 @@
%BEFORE_DEPEND
%OBJS
-Index: sys/conf/Makefile.powerpc
+Index: src/sys/conf/Makefile.powerpc
===================================================================
---- sys/conf/Makefile.powerpc.orig
-+++ sys/conf/Makefile.powerpc
+--- src/sys/conf/Makefile.powerpc.orig
++++ src/sys/conf/Makefile.powerpc
@@ -37,6 +37,8 @@
CFLAGS+= -fno-omit-frame-pointer
.endif
@@ -79,10 +79,10 @@
%BEFORE_DEPEND
%OBJS
-Index: sys/conf/Makefile.sparc64
+Index: src/sys/conf/Makefile.sparc64
===================================================================
---- sys/conf/Makefile.sparc64.orig
-+++ sys/conf/Makefile.sparc64
+--- src/sys/conf/Makefile.sparc64.orig
++++ src/sys/conf/Makefile.sparc64
@@ -32,6 +32,8 @@
MDOBJS= exception.o interrupt.o
@@ -92,10 +92,10 @@
%BEFORE_DEPEND
%OBJS
-Index: usr.sbin/config/mkmakefile.c
+Index: src/usr.sbin/config/mkmakefile.c
===================================================================
---- usr.sbin/config/mkmakefile.c.orig
-+++ usr.sbin/config/mkmakefile.c
+--- src/usr.sbin/config/mkmakefile.c.orig
++++ src/usr.sbin/config/mkmakefile.c
@@ -70,6 +70,7 @@
static void do_rules(FILE *);
static void do_xxfiles(char *, FILE *);
Modified: trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,9 +1,9 @@
-Index: sys/kern/imgact_elf.c
+Index: src/sys/kern/imgact_elf.c
===================================================================
---- sys/kern/imgact_elf.c.orig
-+++ sys/kern/imgact_elf.c
+--- src/sys/kern/imgact_elf.c.orig
++++ src/sys/kern/imgact_elf.c
@@ -619,6 +619,8 @@
const char *note_name;
struct thread *td = curthread;
Modified: trunk/kfreebsd-7/debian/patches/013_ip_packed.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/013_ip_packed.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/013_ip_packed.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,7 +1,7 @@
-Index: sys/netinet/ip.h
+Index: src/sys/netinet/ip.h
===================================================================
---- sys/netinet/ip.h.orig
-+++ sys/netinet/ip.h
+--- src/sys/netinet/ip.h.orig
++++ src/sys/netinet/ip.h
@@ -67,7 +67,7 @@
u_char ip_p; /* protocol */
u_short ip_sum; /* checksum */
Modified: trunk/kfreebsd-7/debian/patches/017_oss_compat.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/017_oss_compat.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/017_oss_compat.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,7 +1,7 @@
-Index: sys/sys/soundcard.h
+Index: src/sys/sys/soundcard.h
===================================================================
---- sys/sys/soundcard.h.orig
-+++ sys/sys/soundcard.h
+--- src/sys/sys/soundcard.h.orig
++++ 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 */
Modified: trunk/kfreebsd-7/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/020_linker.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/020_linker.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -4,10 +4,10 @@
for details see http://sourceware.org/bugzilla/show_bug.cgi?id=5391
-Index: sys/conf/kern.post.mk
+Index: src/sys/conf/kern.post.mk
===================================================================
---- sys/conf/kern.post.mk.orig
-+++ sys/conf/kern.post.mk
+--- src/sys/conf/kern.post.mk.orig
++++ src/sys/conf/kern.post.mk
@@ -95,7 +95,9 @@
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@rm -f ${.TARGET}
@@ -19,10 +19,10 @@
.if !defined(DEBUG)
${OBJCOPY} --strip-debug ${.TARGET}
.endif
-Index: sys/conf/kmod.mk
+Index: src/sys/conf/kmod.mk
===================================================================
---- sys/conf/kmod.mk.orig
-+++ sys/conf/kmod.mk
+--- src/sys/conf/kmod.mk.orig
++++ src/sys/conf/kmod.mk
@@ -177,7 +177,8 @@
.if ${MACHINE_ARCH} != amd64
Modified: trunk/kfreebsd-7/debian/patches/030_abi_cld.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/030_abi_cld.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/030_abi_cld.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,6 +1,6 @@
diff -Nurd sys/amd64/amd64/machdep.c sys/amd64/amd64/machdep.c
---- sys/amd64/amd64/machdep.c 2008-01-19 19:15:01.000000000 +0100
-+++ sys/amd64/amd64/machdep.c 2008-03-06 01:29:07.000000000 +0100
+--- src/sys/amd64/amd64/machdep.c 2008-01-19 19:15:01.000000000 +0100
++++ src/sys/amd64/amd64/machdep.c 2008-03-06 01:29:07.000000000 +0100
@@ -357,7 +357,7 @@
regs->tf_rsp = (long)sfp;
@@ -11,8 +11,8 @@
PROC_LOCK(p);
mtx_lock(&psp->ps_mtx);
diff -Nurd sys/amd64/ia32/ia32_signal.c sys/amd64/ia32/ia32_signal.c
---- sys/amd64/ia32/ia32_signal.c 2006-10-05 03:56:10.000000000 +0200
-+++ sys/amd64/ia32/ia32_signal.c 2008-03-06 01:29:07.000000000 +0100
+--- src/sys/amd64/ia32/ia32_signal.c 2006-10-05 03:56:10.000000000 +0200
++++ src/sys/amd64/ia32/ia32_signal.c 2008-03-06 01:29:07.000000000 +0100
@@ -391,7 +391,7 @@
regs->tf_rsp = (uintptr_t)sfp;
@@ -32,8 +32,8 @@
regs->tf_ss = _udatasel;
load_ds(_udatasel);
diff -Nurd sys/amd64/linux32/linux32_sysvec.c sys/amd64/linux32/linux32_sysvec.c
---- sys/amd64/linux32/linux32_sysvec.c 2007-09-20 15:46:26.000000000 +0200
-+++ sys/amd64/linux32/linux32_sysvec.c 2008-03-06 01:29:07.000000000 +0100
+--- src/sys/amd64/linux32/linux32_sysvec.c 2007-09-20 15:46:26.000000000 +0200
++++ src/sys/amd64/linux32/linux32_sysvec.c 2008-03-06 01:29:07.000000000 +0100
@@ -402,7 +402,7 @@
regs->tf_rsp = PTROUT(fp);
regs->tf_rip = LINUX32_PS_STRINGS - *(p->p_sysent->sv_szsigcode) +
@@ -53,8 +53,8 @@
regs->tf_ss = _udatasel;
load_ds(_udatasel);
diff -Nurd sys/i386/i386/machdep.c sys/i386/i386/machdep.c
---- sys/i386/i386/machdep.c 2008-01-19 19:15:03.000000000 +0100
-+++ sys/i386/i386/machdep.c 2008-03-06 01:29:07.000000000 +0100
+--- src/sys/i386/i386/machdep.c 2008-01-19 19:15:03.000000000 +0100
++++ src/sys/i386/i386/machdep.c 2008-03-06 01:29:07.000000000 +0100
@@ -416,7 +416,7 @@
regs->tf_esp = (int)fp;
@@ -83,8 +83,8 @@
regs->tf_ds = _udatasel;
regs->tf_es = _udatasel;
diff -Nurd sys/i386/linux/linux_sysvec.c sys/i386/linux/linux_sysvec.c
---- sys/i386/linux/linux_sysvec.c 2007-09-20 15:46:26.000000000 +0200
-+++ sys/i386/linux/linux_sysvec.c 2008-03-06 01:29:07.000000000 +0100
+--- src/sys/i386/linux/linux_sysvec.c 2007-09-20 15:46:26.000000000 +0200
++++ src/sys/i386/linux/linux_sysvec.c 2008-03-06 01:29:07.000000000 +0100
@@ -389,7 +389,7 @@
regs->tf_esp = (int)fp;
regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode) +
@@ -104,8 +104,8 @@
regs->tf_ds = _udatasel;
regs->tf_es = _udatasel;
diff -Nurd sys/i386/svr4/svr4_machdep.c sys/i386/svr4/svr4_machdep.c
---- sys/i386/svr4/svr4_machdep.c 2005-10-19 16:59:54.000000000 +0200
-+++ sys/i386/svr4/svr4_machdep.c 2008-03-06 01:29:07.000000000 +0100
+--- src/sys/i386/svr4/svr4_machdep.c 2005-10-19 16:59:54.000000000 +0200
++++ src/sys/i386/svr4/svr4_machdep.c 2008-03-06 01:29:07.000000000 +0100
@@ -497,13 +497,13 @@
svr4_szsigcode);
tf->tf_cs = GSEL(GUSERLDT_SEL, SEL_UPL);
@@ -123,8 +123,8 @@
tf->tf_ds = _udatasel;
tf->tf_es = _udatasel;
diff -Nurd sys/pc98/pc98/machdep.c sys/pc98/pc98/machdep.c
---- sys/pc98/pc98/machdep.c 2008-01-19 19:15:05.000000000 +0100
-+++ sys/pc98/pc98/machdep.c 2008-03-06 01:29:07.000000000 +0100
+--- src/sys/pc98/pc98/machdep.c 2008-01-19 19:15:05.000000000 +0100
++++ src/sys/pc98/pc98/machdep.c 2008-03-06 01:29:07.000000000 +0100
@@ -388,7 +388,7 @@
regs->tf_esp = (int)fp;
Modified: trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -17,10 +17,10 @@
and utimes/futimes syscalls. Passed NULL to them means "now",
lets the "now" have precision according to vfs.timestamp_precision.
-Index: sys/kern/vfs_syscalls.c
+Index: src/sys/kern/vfs_syscalls.c
===================================================================
---- sys/kern/vfs_syscalls.c.orig
-+++ sys/kern/vfs_syscalls.c
+--- src/sys/kern/vfs_syscalls.c.orig
++++ src/sys/kern/vfs_syscalls.c
@@ -2819,8 +2819,7 @@
int error;
Modified: trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -6,10 +6,10 @@
http://www.freebsd.org/cgi/query-pr.cgi?pr=126076
-Index: sys/sys/signal.h
+Index: src/sys/sys/signal.h
===================================================================
---- sys/sys/signal.h.orig
-+++ sys/sys/signal.h
+--- src/sys/sys/signal.h.orig
++++ src/sys/sys/signal.h
@@ -284,7 +284,7 @@
#define POLL_MSG 3 /* Input message available */
#define POLL_ERR 4 /* I/O Error */
Modified: trunk/kfreebsd-7/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/902_version.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/902_version.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,7 +1,7 @@
-Index: sys/conf/newvers.sh
+Index: src/sys/conf/newvers.sh
===================================================================
---- sys/conf/newvers.sh.orig
-+++ sys/conf/newvers.sh
+--- src/sys/conf/newvers.sh.orig
++++ src/sys/conf/newvers.sh
@@ -105,7 +105,7 @@
cat << EOF > vers.c
$COPYRIGHT
Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,7 +1,7 @@
-Index: sys/conf/files
+Index: src/sys/conf/files
===================================================================
---- sys/conf/files.orig
-+++ sys/conf/files
+--- src/sys/conf/files.orig
++++ src/sys/conf/files
@@ -472,18 +472,6 @@
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
@@ -21,10 +21,10 @@
dev/awi/am79c930.c optional awi
dev/awi/awi.c optional awi
dev/awi/if_awi_pccard.c optional awi pccard
-Index: sys/conf/files.i386
+Index: src/sys/conf/files.i386
===================================================================
---- sys/conf/files.i386.orig
-+++ sys/conf/files.i386
+--- src/sys/conf/files.i386.orig
++++ src/sys/conf/files.i386
@@ -46,42 +46,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
@@ -91,10 +91,10 @@
dev/nvram/nvram.c optional nvram isa
dev/pcf/pcf_isa.c optional pcf
dev/random/nehemiah.c optional random
-Index: sys/conf/kern.pre.mk
+Index: src/sys/conf/kern.pre.mk
===================================================================
---- sys/conf/kern.pre.mk.orig
-+++ sys/conf/kern.pre.mk
+--- src/sys/conf/kern.pre.mk.orig
++++ src/sys/conf/kern.pre.mk
@@ -67,9 +67,6 @@
# ... and the same for pf
INCLUDES+= -I$S/contrib/pf
@@ -105,10 +105,10 @@
# ... and the same for the NgATM stuff
INCLUDES+= -I$S/contrib/ngatm
-Index: sys/i386/conf/GENERIC
+Index: src/sys/i386/conf/GENERIC
===================================================================
---- sys/i386/conf/GENERIC.orig
-+++ sys/i386/conf/GENERIC
+--- src/sys/i386/conf/GENERIC.orig
++++ src/sys/i386/conf/GENERIC
@@ -130,8 +130,6 @@
device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
@@ -128,10 +128,10 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-Index: sys/modules/Makefile
+Index: src/sys/modules/Makefile
===================================================================
---- sys/modules/Makefile.orig
-+++ sys/modules/Makefile
+--- src/sys/modules/Makefile.orig
++++ src/sys/modules/Makefile
@@ -25,11 +25,6 @@
${_arl} \
${_asr} \
@@ -280,10 +280,10 @@
_auxio= auxio
_em= em
_i2c= i2c
-Index: sys/amd64/conf/GENERIC
+Index: src/sys/amd64/conf/GENERIC
===================================================================
---- sys/amd64/conf/GENERIC.orig
-+++ sys/amd64/conf/GENERIC
+--- src/sys/amd64/conf/GENERIC.orig
++++ src/sys/amd64/conf/GENERIC
@@ -123,8 +123,6 @@
device arcmsr # Areca SATA II RAID
device ciss # Compaq Smart RAID 5*
@@ -303,10 +303,10 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-Index: sys/conf/files.amd64
+Index: src/sys/conf/files.amd64
===================================================================
---- sys/conf/files.amd64.orig
-+++ sys/conf/files.amd64
+--- src/sys/conf/files.amd64.orig
++++ src/sys/conf/files.amd64
@@ -47,37 +47,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
Modified: trunk/kfreebsd-7/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/904_dev_full.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/904_dev_full.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,10 +1,10 @@
Status: Rejected in upstream (kern/68961)
-Index: sys/dev/null/null.c
+Index: src/sys/dev/null/null.c
===================================================================
---- sys/dev/null/null.c.orig
-+++ sys/dev/null/null.c
+--- src/sys/dev/null/null.c.orig
++++ src/sys/dev/null/null.c
@@ -43,13 +43,16 @@
/* For use with destroy_dev(9). */
Modified: trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -22,10 +22,10 @@
You might also want to configure your kernel to lock shared memory into RAM and prevent it from being paged out to swap. Use the sysctl setting kern.ipc.shm_use_phys.
</quote>
-Index: sys/i386/conf/GENERIC
+Index: src/sys/i386/conf/GENERIC
===================================================================
---- sys/i386/conf/GENERIC.orig
-+++ sys/i386/conf/GENERIC
+--- src/sys/i386/conf/GENERIC.orig
++++ src/sys/i386/conf/GENERIC
@@ -57,8 +57,14 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
@@ -41,10 +41,10 @@
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options ADAPTIVE_GIANT # Giant mutex is adaptive.
-Index: sys/amd64/conf/GENERIC
+Index: src/sys/amd64/conf/GENERIC
===================================================================
---- sys/amd64/conf/GENERIC.orig
-+++ sys/amd64/conf/GENERIC
+--- src/sys/amd64/conf/GENERIC.orig
++++ src/sys/amd64/conf/GENERIC
@@ -57,8 +57,14 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
Modified: trunk/kfreebsd-7/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/907_cpu_class.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/907_cpu_class.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,10 +1,10 @@
Status: Rejected in upstream (kern/77355).
-Index: sys/i386/i386/identcpu.c
+Index: src/sys/i386/i386/identcpu.c
===================================================================
---- sys/i386/i386/identcpu.c.orig
-+++ sys/i386/i386/identcpu.c
+--- src/sys/i386/i386/identcpu.c.orig
++++ src/sys/i386/i386/identcpu.c
@@ -626,6 +626,7 @@
#if defined(I486_CPU)
case CPUCLASS_486:
Modified: trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,7 +1,7 @@
-Index: sys/compat/linprocfs/linprocfs.c
+Index: src/sys/compat/linprocfs/linprocfs.c
===================================================================
---- sys/compat/linprocfs/linprocfs.c.orig
-+++ sys/compat/linprocfs/linprocfs.c
+--- src/sys/compat/linprocfs/linprocfs.c.orig
++++ src/sys/compat/linprocfs/linprocfs.c
@@ -336,10 +336,6 @@
/* determine fs type */
Modified: trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,7 +1,7 @@
-Index: sys/i386/conf/GENERIC.hints
+Index: src/sys/i386/conf/GENERIC.hints
===================================================================
---- sys/i386/conf/GENERIC.hints.orig
-+++ sys/i386/conf/GENERIC.hints
+--- src/sys/i386/conf/GENERIC.hints.orig
++++ src/sys/i386/conf/GENERIC.hints
@@ -27,6 +27,7 @@
hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
@@ -10,10 +10,10 @@
hint.vga.0.at="isa"
hint.sc.0.at="isa"
hint.sc.0.flags="0x100"
-Index: sys/amd64/conf/GENERIC.hints
+Index: src/sys/amd64/conf/GENERIC.hints
===================================================================
---- sys/amd64/conf/GENERIC.hints.orig
-+++ sys/amd64/conf/GENERIC.hints
+--- src/sys/amd64/conf/GENERIC.hints.orig
++++ src/sys/amd64/conf/GENERIC.hints
@@ -13,6 +13,7 @@
hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
Modified: trunk/kfreebsd-7/debian/patches/911_no_werror.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/911_no_werror.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/911_no_werror.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,9 +1,9 @@
-Index: sys/modules/hwpmc/Makefile
+Index: src/sys/modules/hwpmc/Makefile
===================================================================
---- sys/modules/hwpmc/Makefile.orig
-+++ sys/modules/hwpmc/Makefile
+--- src/sys/modules/hwpmc/Makefile.orig
++++ src/sys/modules/hwpmc/Makefile
@@ -9,6 +9,7 @@
SRCS= hwpmc_mod.c hwpmc_logging.c vnode_if.h
@@ -12,10 +12,10 @@
.if ${MACHINE_ARCH} == "amd64"
SRCS+= hwpmc_amd.c hwpmc_piv.c hwpmc_x86.c
-Index: sys/modules/geom/geom_eli/Makefile
+Index: src/sys/modules/geom/geom_eli/Makefile
===================================================================
---- sys/modules/geom/geom_eli/Makefile.orig
-+++ sys/modules/geom/geom_eli/Makefile
+--- src/sys/modules/geom/geom_eli/Makefile.orig
++++ src/sys/modules/geom/geom_eli/Makefile
@@ -12,5 +12,6 @@
SRCS+= pkcs5v2.c
SRCS+= vnode_if.h
Modified: trunk/kfreebsd-7/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/912_binutils.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/912_binutils.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,7 +1,7 @@
-Index: sys/conf/ldscript.amd64
+Index: src/sys/conf/ldscript.amd64
===================================================================
---- sys/conf/ldscript.amd64.orig
-+++ sys/conf/ldscript.amd64
+--- src/sys/conf/ldscript.amd64.orig
++++ src/sys/conf/ldscript.amd64
@@ -1,12 +1,12 @@
/* $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")
Modified: trunk/kfreebsd-7/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/913_uudecode.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/913_uudecode.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,7 +1,7 @@
-Index: sys/modules/ipwfw/ipw_bss/Makefile
+Index: src/sys/modules/ipwfw/ipw_bss/Makefile
===================================================================
---- sys/modules/ipwfw/ipw_bss/Makefile.orig
-+++ sys/modules/ipwfw/ipw_bss/Makefile
+--- src/sys/modules/ipwfw/ipw_bss/Makefile.orig
++++ src/sys/modules/ipwfw/ipw_bss/Makefile
@@ -9,7 +9,7 @@
CLEANFILES= ipw_bss
@@ -11,10 +11,10 @@
.include <bsd.kmod.mk>
-Index: sys/modules/ipwfw/ipw_ibss/Makefile
+Index: src/sys/modules/ipwfw/ipw_ibss/Makefile
===================================================================
---- sys/modules/ipwfw/ipw_ibss/Makefile.orig
-+++ sys/modules/ipwfw/ipw_ibss/Makefile
+--- src/sys/modules/ipwfw/ipw_ibss/Makefile.orig
++++ src/sys/modules/ipwfw/ipw_ibss/Makefile
@@ -9,7 +9,7 @@
CLEANFILES= ipw_ibss
@@ -24,10 +24,10 @@
.include <bsd.kmod.mk>
-Index: sys/modules/ipwfw/ipw_monitor/Makefile
+Index: src/sys/modules/ipwfw/ipw_monitor/Makefile
===================================================================
---- sys/modules/ipwfw/ipw_monitor/Makefile.orig
-+++ sys/modules/ipwfw/ipw_monitor/Makefile
+--- src/sys/modules/ipwfw/ipw_monitor/Makefile.orig
++++ src/sys/modules/ipwfw/ipw_monitor/Makefile
@@ -9,7 +9,7 @@
CLEANFILES= ipw_monitor
@@ -37,10 +37,10 @@
.include <bsd.kmod.mk>
-Index: sys/modules/iwifw/iwi_bss/Makefile
+Index: src/sys/modules/iwifw/iwi_bss/Makefile
===================================================================
---- sys/modules/iwifw/iwi_bss/Makefile.orig
-+++ sys/modules/iwifw/iwi_bss/Makefile
+--- src/sys/modules/iwifw/iwi_bss/Makefile.orig
++++ src/sys/modules/iwifw/iwi_bss/Makefile
@@ -9,7 +9,7 @@
CLEANFILES= iwi_bss
@@ -50,10 +50,10 @@
.include <bsd.kmod.mk>
-Index: sys/modules/iwifw/iwi_ibss/Makefile
+Index: src/sys/modules/iwifw/iwi_ibss/Makefile
===================================================================
---- sys/modules/iwifw/iwi_ibss/Makefile.orig
-+++ sys/modules/iwifw/iwi_ibss/Makefile
+--- src/sys/modules/iwifw/iwi_ibss/Makefile.orig
++++ src/sys/modules/iwifw/iwi_ibss/Makefile
@@ -9,7 +9,7 @@
CLEANFILES= iwi_fw
@@ -63,10 +63,10 @@
.include <bsd.kmod.mk>
-Index: sys/modules/iwifw/iwi_monitor/Makefile
+Index: src/sys/modules/iwifw/iwi_monitor/Makefile
===================================================================
---- sys/modules/iwifw/iwi_monitor/Makefile.orig
-+++ sys/modules/iwifw/iwi_monitor/Makefile
+--- src/sys/modules/iwifw/iwi_monitor/Makefile.orig
++++ src/sys/modules/iwifw/iwi_monitor/Makefile
@@ -9,7 +9,7 @@
CLEANFILES= iwi_monitor
@@ -76,10 +76,10 @@
.include <bsd.kmod.mk>
-Index: sys/modules/wpifw/Makefile
+Index: src/sys/modules/wpifw/Makefile
===================================================================
---- sys/modules/wpifw/Makefile.orig
-+++ sys/modules/wpifw/Makefile
+--- src/sys/modules/wpifw/Makefile.orig
++++ src/sys/modules/wpifw/Makefile
@@ -9,6 +9,6 @@
CLEANFILES= iwlwifi-3945-2.14.4.fw
Modified: trunk/kfreebsd-7/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/999_config.diff 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/999_config.diff 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,7 +1,7 @@
-Index: sys/amd64/conf/GENERIC
+Index: src/sys/amd64/conf/GENERIC
===================================================================
---- sys/amd64/conf/GENERIC.orig
-+++ sys/amd64/conf/GENERIC
+--- src/sys/amd64/conf/GENERIC.orig
++++ src/sys/amd64/conf/GENERIC
@@ -18,13 +18,13 @@
#
# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.10 2008/07/16 02:05:40 yongari Exp $
@@ -116,10 +116,10 @@
+options ALTQ_RIO # RED In/Out
+options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC)
+options ALTQ_PRIQ # Priority Queuing (PRIQ)
-Index: sys/i386/conf/GENERIC
+Index: src/sys/i386/conf/GENERIC
===================================================================
---- sys/i386/conf/GENERIC.orig
-+++ sys/i386/conf/GENERIC
+--- src/sys/i386/conf/GENERIC.orig
++++ src/sys/i386/conf/GENERIC
@@ -18,15 +18,15 @@
#
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.10 2008/07/16 02:05:40 yongari Exp $
Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series 2008-08-06 18:33:40 UTC (rev 2290)
+++ trunk/kfreebsd-7/debian/patches/series 2008-08-06 19:45:19 UTC (rev 2291)
@@ -1,24 +1,24 @@
-001_misc.diff -p0
-003_glibc_dev_aicasm.diff -p0
-004_xargs.diff -p0
-005_binutils.diff -p0
-007_clone_signals.diff -p0
-008_config.diff -p0
-009_disable_duped_modules.diff -p0
-010_ET_DYN.diff -p0
-013_ip_packed.diff -p0
-017_oss_compat.diff -p0
-020_linker.diff -p0
-101_subsecond_timestamp.diff -p0
-102_POLL_HUP.diff -p0
-902_version.diff -p0
-903_disable_non-free_drivers.diff -p0
-904_dev_full.diff -p0
-906_grow_sysv_ipc_limits.diff -p0
-907_cpu_class.diff -p0
-908_linprocfs_is_not_proc.diff -p0
-910_GENERIC_hints.diff -p0
-911_no_werror.diff -p0
-912_binutils.diff -p0
-913_uudecode.diff -p0
-999_config.diff -p0
+001_misc.diff -p1
+003_glibc_dev_aicasm.diff -p1
+004_xargs.diff -p1
+005_binutils.diff -p1
+007_clone_signals.diff -p1
+008_config.diff -p1
+009_disable_duped_modules.diff -p1
+010_ET_DYN.diff -p1
+013_ip_packed.diff -p1
+017_oss_compat.diff -p1
+020_linker.diff -p1
+101_subsecond_timestamp.diff -p1
+102_POLL_HUP.diff -p1
+902_version.diff -p1
+903_disable_non-free_drivers.diff -p1
+904_dev_full.diff -p1
+906_grow_sysv_ipc_limits.diff -p1
+907_cpu_class.diff -p1
+908_linprocfs_is_not_proc.diff -p1
+910_GENERIC_hints.diff -p1
+911_no_werror.diff -p1
+912_binutils.diff -p1
+913_uudecode.diff -p1
+999_config.diff -p1
More information about the Glibc-bsd-commits
mailing list