[Glibc-bsd-commits] r2311 - in trunk/kfreebsd-7/debian: . patches

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Mon Sep 1 10:38:03 UTC 2008


Author: ps-guest
Date: 2008-09-01 10:38:03 +0000 (Mon, 01 Sep 2008)
New Revision: 2311

Modified:
   trunk/kfreebsd-7/debian/changelog
   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/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/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:
* update some and refresh all kfreebsd-7 patches



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/changelog	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,10 +1,10 @@
-kfreebsd-7 (7.1~cvs20080819-1) EXPERIMENTAL; urgency=low
+kfreebsd-7 (7.1~cvs20080901-1) EXPERIMENTAL; urgency=low
 
   [ Petr Salinger ]
   * New upstream snapshot of RELENG_7
      - update of some patches
 
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 06 Aug 2008 20:34:46 +0200 
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 01 Sep 2008 11:34:46 +0200 
 
 kfreebsd-7 (7.1~cvs20080806-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-7/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/001_misc.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/001_misc.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -4,7 +4,7 @@
 
 Index: src/sys/conf/kern.mk
 ===================================================================
---- src/sys/conf/kern.mk.orig
+--- 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 $
@@ -49,10 +49,10 @@
  
 Index: src/sys/conf/kern.post.mk
 ===================================================================
---- src/sys/conf/kern.post.mk.orig
+--- 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 2007/03/23 21:55:59 imp Exp $
+ # $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
@@ -67,7 +67,7 @@
  # 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.
-@@ -208,11 +218,9 @@
+@@ -211,11 +221,9 @@
  .if exists(${DESTDIR}${KODIR})
  	-thiskernel=`sysctl -n kern.bootfile` ; \
  	if [ ! "`dirname "$$thiskernel"`" -ef ${DESTDIR}${KODIR} ] ; then \
@@ -79,7 +79,7 @@
  			rm -rf ${DESTDIR}${KODIR}.old ; \
  		fi ; \
  		mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \
-@@ -220,21 +228,21 @@
+@@ -223,21 +231,21 @@
  	fi
  .endif
  	mkdir -p ${DESTDIR}${KODIR}

Modified: trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,6 +1,6 @@
 Index: src/sys/dev/aic7xxx/aicasm/Makefile
 ===================================================================
---- src/sys/dev/aic7xxx/aicasm/Makefile.orig
+--- src.orig/sys/dev/aic7xxx/aicasm/Makefile
 +++ src/sys/dev/aic7xxx/aicasm/Makefile
 @@ -14,7 +14,7 @@
  SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
@@ -27,7 +27,7 @@
  .endif
 Index: src/sys/dev/aic7xxx/aicasm/aicasm.h
 ===================================================================
---- src/sys/dev/aic7xxx/aicasm/aicasm.h.orig
+--- src.orig/sys/dev/aic7xxx/aicasm/aicasm.h
 +++ 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 $
@@ -43,7 +43,7 @@
  #endif
 Index: src/sys/dev/aic7xxx/aicasm/aicasm_gram.y
 ===================================================================
---- src/sys/dev/aic7xxx/aicasm/aicasm_gram.y.orig
+--- src.orig/sys/dev/aic7xxx/aicasm/aicasm_gram.y
 +++ src/sys/dev/aic7xxx/aicasm/aicasm_gram.y
 @@ -52,8 +52,9 @@
  #include <string.h>
@@ -59,7 +59,7 @@
  #endif
 Index: src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
 ===================================================================
---- src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y.orig
+--- src.orig/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
 +++ src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
 @@ -52,8 +52,9 @@
  #include <string.h>
@@ -75,7 +75,7 @@
  #endif
 Index: src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
 ===================================================================
---- src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l.orig
+--- src.orig/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
 +++ src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
 @@ -51,8 +51,10 @@
  #include <stdio.h>
@@ -92,7 +92,7 @@
  #endif
 Index: src/sys/dev/aic7xxx/aicasm/aicasm_scan.l
 ===================================================================
---- src/sys/dev/aic7xxx/aicasm/aicasm_scan.l.orig
+--- src.orig/sys/dev/aic7xxx/aicasm/aicasm_scan.l
 +++ src/sys/dev/aic7xxx/aicasm/aicasm_scan.l
 @@ -51,8 +51,10 @@
  #include <stdio.h>
@@ -109,7 +109,7 @@
  #endif
 Index: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
 ===================================================================
---- src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c.orig
+--- src.orig/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
 +++ src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
 @@ -44,10 +44,11 @@
  
@@ -128,7 +128,7 @@
  #include <inttypes.h>
 Index: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
 ===================================================================
---- src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h.orig
+--- src.orig/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
 +++ 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-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/004_xargs.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -3,7 +3,7 @@
 
 Index: src/sys/conf/kmod.mk
 ===================================================================
---- src/sys/conf/kmod.mk.orig
+--- src.orig/sys/conf/kmod.mk
 +++ src/sys/conf/kmod.mk
 @@ -204,7 +204,7 @@
  	grep -v '^#' < ${EXPORT_SYMS} > export_syms
@@ -16,7 +16,7 @@
  .if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
 Index: src/sys/contrib/dev/acpica/acpica_prep.sh
 ===================================================================
---- src/sys/contrib/dev/acpica/acpica_prep.sh.orig
+--- src.orig/sys/contrib/dev/acpica/acpica_prep.sh
 +++ src/sys/contrib/dev/acpica/acpica_prep.sh
 @@ -55,12 +55,12 @@
  

Modified: trunk/kfreebsd-7/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/007_clone_signals.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/007_clone_signals.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,8 +1,8 @@
 Index: src/sys/kern/kern_fork.c
 ===================================================================
---- src/sys/kern/kern_fork.c.orig
+--- src.orig/sys/kern/kern_fork.c
 +++ src/sys/kern/kern_fork.c
-@@ -511,7 +511,11 @@
+@@ -523,7 +523,11 @@
  		p2->p_sigacts = newsigacts;
  	}
  	if (flags & RFLINUXTHPN) 
@@ -17,7 +17,7 @@
  
 Index: src/sys/sys/unistd.h
 ===================================================================
---- src/sys/sys/unistd.h.orig
+--- src.orig/sys/sys/unistd.h
 +++ src/sys/sys/unistd.h
 @@ -181,6 +181,10 @@
  #define	RFHIGHPID	(1<<18)	/* use a pid higher then 10 (idleproc) */

Modified: trunk/kfreebsd-7/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/008_config.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/008_config.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -5,7 +5,7 @@
 
 Index: src/usr.sbin/config/Makefile
 ===================================================================
---- src/usr.sbin/config/Makefile.orig
+--- src.orig/usr.sbin/config/Makefile
 +++ src/usr.sbin/config/Makefile
 @@ -9,11 +9,11 @@
  kernconf.c: kernconf.tmpl
@@ -24,7 +24,7 @@
  
 Index: src/usr.sbin/config/main.c
 ===================================================================
---- src/usr.sbin/config/main.c.orig
+--- src.orig/usr.sbin/config/main.c
 +++ 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 $";

Modified: trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -3,9 +3,9 @@
 
 Index: src/sys/conf/Makefile.amd64
 ===================================================================
---- src/sys/conf/Makefile.amd64.orig
+--- src.orig/sys/conf/Makefile.amd64
 +++ src/sys/conf/Makefile.amd64
-@@ -38,6 +38,8 @@
+@@ -39,6 +39,8 @@
  
  MKMODULESENV+= MACHINE=amd64
  
@@ -16,7 +16,7 @@
  %OBJS
 Index: src/sys/conf/Makefile.arm
 ===================================================================
---- src/sys/conf/Makefile.arm.orig
+--- src.orig/sys/conf/Makefile.arm
 +++ src/sys/conf/Makefile.arm
 @@ -109,6 +109,8 @@
  	rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
@@ -29,7 +29,7 @@
  %OBJS
 Index: src/sys/conf/Makefile.i386
 ===================================================================
---- src/sys/conf/Makefile.i386.orig
+--- src.orig/sys/conf/Makefile.i386
 +++ src/sys/conf/Makefile.i386
 @@ -34,6 +34,8 @@
  
@@ -42,7 +42,7 @@
  %OBJS
 Index: src/sys/conf/Makefile.ia64
 ===================================================================
---- src/sys/conf/Makefile.ia64.orig
+--- src.orig/sys/conf/Makefile.ia64
 +++ src/sys/conf/Makefile.ia64
 @@ -36,6 +36,8 @@
  
@@ -55,7 +55,7 @@
  %OBJS
 Index: src/sys/conf/Makefile.pc98
 ===================================================================
---- src/sys/conf/Makefile.pc98.orig
+--- src.orig/sys/conf/Makefile.pc98
 +++ src/sys/conf/Makefile.pc98
 @@ -34,6 +34,8 @@
  
@@ -68,7 +68,7 @@
  %OBJS
 Index: src/sys/conf/Makefile.powerpc
 ===================================================================
---- src/sys/conf/Makefile.powerpc.orig
+--- src.orig/sys/conf/Makefile.powerpc
 +++ src/sys/conf/Makefile.powerpc
 @@ -37,6 +37,8 @@
  CFLAGS+=	-fno-omit-frame-pointer
@@ -81,7 +81,7 @@
  %OBJS
 Index: src/sys/conf/Makefile.sparc64
 ===================================================================
---- src/sys/conf/Makefile.sparc64.orig
+--- src.orig/sys/conf/Makefile.sparc64
 +++ src/sys/conf/Makefile.sparc64
 @@ -32,6 +32,8 @@
  
@@ -94,7 +94,7 @@
  %OBJS
 Index: src/usr.sbin/config/mkmakefile.c
 ===================================================================
---- src/usr.sbin/config/mkmakefile.c.orig
+--- src.orig/usr.sbin/config/mkmakefile.c
 +++ src/usr.sbin/config/mkmakefile.c
 @@ -70,6 +70,7 @@
  static void do_rules(FILE *);

Modified: trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -2,7 +2,7 @@
 
 Index: src/sys/kern/imgact_elf.c
 ===================================================================
---- src/sys/kern/imgact_elf.c.orig
+--- src.orig/sys/kern/imgact_elf.c
 +++ src/sys/kern/imgact_elf.c
 @@ -619,6 +619,8 @@
  	const char *note_name;

Modified: trunk/kfreebsd-7/debian/patches/013_ip_packed.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/013_ip_packed.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/013_ip_packed.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,6 +1,6 @@
 Index: src/sys/netinet/ip.h
 ===================================================================
---- src/sys/netinet/ip.h.orig
+--- src.orig/sys/netinet/ip.h
 +++ src/sys/netinet/ip.h
 @@ -67,7 +67,7 @@
  	u_char	ip_p;			/* protocol */

Modified: trunk/kfreebsd-7/debian/patches/017_oss_compat.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/017_oss_compat.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/017_oss_compat.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,6 +1,6 @@
 Index: src/sys/sys/soundcard.h
 ===================================================================
---- src/sys/sys/soundcard.h.orig
+--- 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 */

Modified: trunk/kfreebsd-7/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/020_linker.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/020_linker.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -6,7 +6,7 @@
 
 Index: src/sys/conf/kern.post.mk
 ===================================================================
---- src/sys/conf/kern.post.mk.orig
+--- src.orig/sys/conf/kern.post.mk
 +++ src/sys/conf/kern.post.mk
 @@ -95,7 +95,9 @@
  ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@@ -16,12 +16,12 @@
 +	${SYSTEM_LD} -o ${.TARGET}.tmp
 +	gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt
 +	${SYSTEM_LD} "@${.TARGET}.lopt"
- .if !defined(DEBUG)
- 	${OBJCOPY} --strip-debug ${.TARGET}
+ .if defined(CTFMERGE)
+ 	${SYSTEM_CTFMERGE}
  .endif
 Index: src/sys/conf/kmod.mk
 ===================================================================
---- src/sys/conf/kmod.mk.orig
+--- src.orig/sys/conf/kmod.mk
 +++ src/sys/conf/kmod.mk
 @@ -177,7 +177,8 @@
  

Modified: trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -19,9 +19,9 @@
 
 Index: src/sys/kern/vfs_syscalls.c
 ===================================================================
---- src/sys/kern/vfs_syscalls.c.orig
+--- src.orig/sys/kern/vfs_syscalls.c
 +++ src/sys/kern/vfs_syscalls.c
-@@ -2819,8 +2819,7 @@
+@@ -2831,8 +2831,7 @@
  	int error;
  
  	if (usrtvp == NULL) {
@@ -31,6 +31,3 @@
  		tsp[1] = tsp[0];
  	} else {
  		if (tvpseg == UIO_SYSSPACE) {
-
-
-

Modified: trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -8,7 +8,7 @@
 
 Index: src/sys/sys/signal.h
 ===================================================================
---- src/sys/sys/signal.h.orig
+--- src.orig/sys/sys/signal.h
 +++ src/sys/sys/signal.h
 @@ -284,7 +284,7 @@
  #define POLL_MSG	3	/* Input message available		*/

Modified: trunk/kfreebsd-7/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/902_version.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/902_version.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,6 +1,6 @@
 Index: src/sys/conf/newvers.sh
 ===================================================================
---- src/sys/conf/newvers.sh.orig
+--- src.orig/sys/conf/newvers.sh
 +++ src/sys/conf/newvers.sh
 @@ -105,7 +105,7 @@
  cat << EOF > vers.c

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-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,8 +1,8 @@
 Index: src/sys/conf/files
 ===================================================================
---- src/sys/conf/files.orig
+--- src.orig/sys/conf/files
 +++ src/sys/conf/files
-@@ -472,18 +472,6 @@
+@@ -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
@@ -23,7 +23,7 @@
  dev/awi/if_awi_pccard.c		optional awi pccard
 Index: src/sys/conf/files.i386
 ===================================================================
---- src/sys/conf/files.i386.orig
+--- src.orig/sys/conf/files.i386
 +++ src/sys/conf/files.i386
 @@ -46,42 +46,6 @@
  	no-obj no-implicit-rule before-depend				\
@@ -68,10 +68,10 @@
  #
  compat/linprocfs/linprocfs.c	optional linprocfs
  compat/linsysfs/linsysfs.c	optional linsysfs
-@@ -179,14 +143,6 @@
- dev/fdc/fdc_isa.c		optional fdc isa
- dev/fdc/fdc_pccard.c		optional fdc pccard
+@@ -181,14 +145,6 @@
  dev/fe/if_fe_isa.c		optional fe isa
+ dev/glxsb/glxsb.c		optional glxsb
+ dev/glxsb/glxsb_hash.c		optional glxsb
 -dev/hptmv/entry.c		optional hptmv
 -dev/hptmv/mv.c			optional hptmv
 -dev/hptmv/gui_lib.c		optional hptmv
@@ -83,7 +83,7 @@
  dev/hwpmc/hwpmc_amd.c		optional hwpmc
  dev/hwpmc/hwpmc_pentium.c	optional hwpmc
  dev/hwpmc/hwpmc_piv.c		optional hwpmc
-@@ -213,7 +169,6 @@
+@@ -215,7 +171,6 @@
  dev/mse/mse.c			optional mse
  dev/mse/mse_isa.c		optional mse isa
  dev/nfe/if_nfe.c		optional nfe pci
@@ -93,7 +93,7 @@
  dev/random/nehemiah.c		optional random
 Index: src/sys/conf/kern.pre.mk
 ===================================================================
---- src/sys/conf/kern.pre.mk.orig
+--- src.orig/sys/conf/kern.pre.mk
 +++ src/sys/conf/kern.pre.mk
 @@ -67,9 +67,6 @@
  # ... and the same for pf
@@ -107,9 +107,9 @@
  
 Index: src/sys/i386/conf/GENERIC
 ===================================================================
---- src/sys/i386/conf/GENERIC.orig
+--- src.orig/sys/i386/conf/GENERIC
 +++ src/sys/i386/conf/GENERIC
-@@ -130,8 +130,6 @@
+@@ -131,8 +131,6 @@
  device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
  device		ciss		# Compaq Smart RAID 5*
  device		dpt		# DPT Smartcache III, IV - See NOTES for options
@@ -118,7 +118,7 @@
  device		iir		# Intel Integrated RAID
  device		ips		# IBM (Adaptec) ServeRAID
  device		mly		# Mylex AcceleRAID/eXtremeRAID
-@@ -252,9 +242,6 @@
+@@ -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.
@@ -130,9 +130,9 @@
  device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 Index: src/sys/modules/Makefile
 ===================================================================
---- src/sys/modules/Makefile.orig
+--- src.orig/sys/modules/Makefile
 +++ src/sys/modules/Makefile
-@@ -25,11 +25,6 @@
+@@ -26,11 +26,6 @@
  	${_arl} \
  	${_asr} \
  	ata \
@@ -144,7 +144,7 @@
  	aue \
  	${_auxio} \
  	${_awi} \
-@@ -97,8 +92,6 @@
+@@ -100,8 +95,6 @@
  	hifn \
  	hme \
  	${_hptiop} \
@@ -153,7 +153,7 @@
  	hwpmc \
  	${_i2c} \
  	${_ibcs2} \
-@@ -197,10 +190,8 @@
+@@ -200,11 +193,8 @@
  	ntfs_iconv \
  	${_nxge} \
  	nullfs \
@@ -161,10 +161,11 @@
  	${_nvram} \
  	${_nwfs} \
 -	${_oltr} \
+-	${_opensolaris} \
  	${_padlock} \
  	patm \
  	${_pccard} \
-@@ -322,7 +313,6 @@
+@@ -327,7 +317,6 @@
  	${_xe} \
  	xfs \
  	xl \
@@ -172,7 +173,7 @@
  	zlib \
  	zyd
  
-@@ -372,11 +362,6 @@
+@@ -372,11 +361,6 @@
  _apm=		apm
  _ar=		ar
  _arcnet=	arcnet
@@ -184,15 +185,18 @@
  _awi=		awi
  _bktr=		bktr
  _cardbus=	cardbus
-@@ -417,7 +402,6 @@
+@@ -422,10 +406,6 @@
  .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
-@@ -438,9 +422,6 @@
+@@ -447,9 +427,6 @@
  _tmpfs= 	tmpfs
  _wi=		wi
  _xe=		xe
@@ -202,7 +206,7 @@
  .if ${MACHINE} == "i386"
  _aac=		aac
  _acpi=		acpi
-@@ -458,8 +439,6 @@
+@@ -467,8 +444,6 @@
  _dpt=		dpt
  _ex=		ex
  _hptiop=	hptiop
@@ -210,8 +214,8 @@
 -_hptrr=		hptrr
  _ichwd=		ichwd
  _ida=		ida
- # Disabled due to non-MPSAFEty in 7.0
-@@ -474,7 +453,6 @@
+ _iir=		iir
+@@ -481,7 +456,6 @@
  _ixgb=   	ixgb
  _mly=		mly
  _nfe=		nfe
@@ -219,7 +223,7 @@
  _nvram=		nvram
  _nxge=		nxge
  _wpi=		wpi
-@@ -501,11 +479,6 @@
+@@ -508,11 +482,6 @@
  _agp=		agp
  _an=		an
  _arcmsr=	arcmsr
@@ -231,7 +235,7 @@
  _cardbus=	cardbus
  _cbb=		cbb
  _cmx=		cmx
-@@ -520,8 +493,6 @@
+@@ -533,8 +502,6 @@
  _exca=		exca
  _ext2fs=	ext2fs
  _hptiop=	hptiop
@@ -240,15 +244,20 @@
  _i2c=		i2c
  _ichwd=		ichwd
  _ida=		ida
-@@ -541,7 +512,6 @@
+@@ -554,12 +521,8 @@
  _mly=		mly
  _ndis=		ndis
  _nfe=		nfe
 -_nve=		nve
  _nvram=		nvram
  _nxge=		nxge
+-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+-_opensolaris=	opensolaris
+-.endif
  _pccard=	pccard
-@@ -556,9 +526,6 @@
+ _rdma=		rdma	
+ _safe=		safe
+@@ -573,9 +536,6 @@
  _wi=		wi
  _wpi=		wpi
  _wpifw=		wpifw
@@ -258,7 +267,7 @@
  .endif
  
  .if ${MACHINE_ARCH} == "ia64"
-@@ -601,21 +568,11 @@
+@@ -617,22 +577,12 @@
  
  .if ${MACHINE_ARCH} == "powerpc"
  _an=		an
@@ -267,6 +276,7 @@
 -_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
@@ -282,9 +292,9 @@
  _i2c=		i2c
 Index: src/sys/amd64/conf/GENERIC
 ===================================================================
---- src/sys/amd64/conf/GENERIC.orig
+--- src.orig/sys/amd64/conf/GENERIC
 +++ src/sys/amd64/conf/GENERIC
-@@ -123,8 +123,6 @@
+@@ -125,8 +125,6 @@
  device		arcmsr		# Areca SATA II RAID
  device		ciss		# Compaq Smart RAID 5*
  device		dpt		# DPT Smartcache III, IV - See NOTES for options
@@ -293,7 +303,7 @@
  device		iir		# Intel Integrated RAID
  device		ips		# IBM (Adaptec) ServeRAID
  device		mly		# Mylex AcceleRAID/eXtremeRAID
-@@ -239,9 +231,6 @@
+@@ -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.
@@ -305,7 +315,7 @@
  device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 Index: src/sys/conf/files.amd64
 ===================================================================
---- src/sys/conf/files.amd64.orig
+--- src.orig/sys/conf/files.amd64
 +++ src/sys/conf/files.amd64
 @@ -47,37 +47,6 @@
  	no-obj no-implicit-rule before-depend				\

Modified: trunk/kfreebsd-7/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/904_dev_full.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/904_dev_full.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -3,7 +3,7 @@
 
 Index: src/sys/dev/null/null.c
 ===================================================================
---- src/sys/dev/null/null.c.orig
+--- src.orig/sys/dev/null/null.c
 +++ src/sys/dev/null/null.c
 @@ -43,13 +43,16 @@
  

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-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -24,7 +24,7 @@
 
 Index: src/sys/i386/conf/GENERIC
 ===================================================================
---- src/sys/i386/conf/GENERIC.orig
+--- src.orig/sys/i386/conf/GENERIC
 +++ src/sys/i386/conf/GENERIC
 @@ -57,8 +57,14 @@
  options 	KTRACE			# ktrace(1) support
@@ -43,7 +43,7 @@
  options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
 Index: src/sys/amd64/conf/GENERIC
 ===================================================================
---- src/sys/amd64/conf/GENERIC.orig
+--- src.orig/sys/amd64/conf/GENERIC
 +++ src/sys/amd64/conf/GENERIC
 @@ -57,8 +57,14 @@
  options 	KTRACE			# ktrace(1) support

Modified: trunk/kfreebsd-7/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/907_cpu_class.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/907_cpu_class.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -3,7 +3,7 @@
 
 Index: src/sys/i386/i386/identcpu.c
 ===================================================================
---- src/sys/i386/i386/identcpu.c.orig
+--- src.orig/sys/i386/i386/identcpu.c
 +++ src/sys/i386/i386/identcpu.c
 @@ -626,6 +626,7 @@
  #if defined(I486_CPU)

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-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,6 +1,6 @@
 Index: src/sys/compat/linprocfs/linprocfs.c
 ===================================================================
---- src/sys/compat/linprocfs/linprocfs.c.orig
+--- src.orig/sys/compat/linprocfs/linprocfs.c
 +++ src/sys/compat/linprocfs/linprocfs.c
 @@ -336,10 +336,6 @@
  

Modified: trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,6 +1,6 @@
 Index: src/sys/i386/conf/GENERIC.hints
 ===================================================================
---- src/sys/i386/conf/GENERIC.hints.orig
+--- src.orig/sys/i386/conf/GENERIC.hints
 +++ src/sys/i386/conf/GENERIC.hints
 @@ -27,6 +27,7 @@
  hint.atkbd.0.irq="1"
@@ -12,7 +12,7 @@
  hint.sc.0.flags="0x100"
 Index: src/sys/amd64/conf/GENERIC.hints
 ===================================================================
---- src/sys/amd64/conf/GENERIC.hints.orig
+--- src.orig/sys/amd64/conf/GENERIC.hints
 +++ src/sys/amd64/conf/GENERIC.hints
 @@ -13,6 +13,7 @@
  hint.atkbd.0.irq="1"

Modified: trunk/kfreebsd-7/debian/patches/911_no_werror.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/911_no_werror.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/911_no_werror.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -2,7 +2,7 @@
 
 Index: src/sys/modules/hwpmc/Makefile
 ===================================================================
---- src/sys/modules/hwpmc/Makefile.orig
+--- 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
@@ -14,7 +14,7 @@
  SRCS+=	hwpmc_amd.c hwpmc_piv.c hwpmc_x86.c
 Index: src/sys/modules/geom/geom_eli/Makefile
 ===================================================================
---- src/sys/modules/geom/geom_eli/Makefile.orig
+--- src.orig/sys/modules/geom/geom_eli/Makefile
 +++ src/sys/modules/geom/geom_eli/Makefile
 @@ -12,5 +12,6 @@
  SRCS+=	pkcs5v2.c

Modified: trunk/kfreebsd-7/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/912_binutils.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/912_binutils.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,6 +1,6 @@
 Index: src/sys/conf/ldscript.amd64
 ===================================================================
---- src/sys/conf/ldscript.amd64.orig
+--- src.orig/sys/conf/ldscript.amd64
 +++ 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 $ */

Modified: trunk/kfreebsd-7/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/913_uudecode.diff	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/913_uudecode.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,6 +1,6 @@
 Index: src/sys/modules/ipwfw/ipw_bss/Makefile
 ===================================================================
---- src/sys/modules/ipwfw/ipw_bss/Makefile.orig
+--- src.orig/sys/modules/ipwfw/ipw_bss/Makefile
 +++ src/sys/modules/ipwfw/ipw_bss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	ipw_bss
@@ -13,7 +13,7 @@
  
 Index: src/sys/modules/ipwfw/ipw_ibss/Makefile
 ===================================================================
---- src/sys/modules/ipwfw/ipw_ibss/Makefile.orig
+--- src.orig/sys/modules/ipwfw/ipw_ibss/Makefile
 +++ src/sys/modules/ipwfw/ipw_ibss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	ipw_ibss
@@ -26,7 +26,7 @@
  
 Index: src/sys/modules/ipwfw/ipw_monitor/Makefile
 ===================================================================
---- src/sys/modules/ipwfw/ipw_monitor/Makefile.orig
+--- src.orig/sys/modules/ipwfw/ipw_monitor/Makefile
 +++ src/sys/modules/ipwfw/ipw_monitor/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	ipw_monitor
@@ -39,7 +39,7 @@
  
 Index: src/sys/modules/iwifw/iwi_bss/Makefile
 ===================================================================
---- src/sys/modules/iwifw/iwi_bss/Makefile.orig
+--- src.orig/sys/modules/iwifw/iwi_bss/Makefile
 +++ src/sys/modules/iwifw/iwi_bss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_bss
@@ -52,7 +52,7 @@
  
 Index: src/sys/modules/iwifw/iwi_ibss/Makefile
 ===================================================================
---- src/sys/modules/iwifw/iwi_ibss/Makefile.orig
+--- src.orig/sys/modules/iwifw/iwi_ibss/Makefile
 +++ src/sys/modules/iwifw/iwi_ibss/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_fw
@@ -65,7 +65,7 @@
  
 Index: src/sys/modules/iwifw/iwi_monitor/Makefile
 ===================================================================
---- src/sys/modules/iwifw/iwi_monitor/Makefile.orig
+--- src.orig/sys/modules/iwifw/iwi_monitor/Makefile
 +++ src/sys/modules/iwifw/iwi_monitor/Makefile
 @@ -9,7 +9,7 @@
  CLEANFILES=	iwi_monitor
@@ -78,7 +78,7 @@
  
 Index: src/sys/modules/wpifw/Makefile
 ===================================================================
---- src/sys/modules/wpifw/Makefile.orig
+--- src.orig/sys/modules/wpifw/Makefile
 +++ 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-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/999_config.diff	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,10 +1,10 @@
 Index: src/sys/amd64/conf/GENERIC
 ===================================================================
---- src/sys/amd64/conf/GENERIC.orig
+--- src.orig/sys/amd64/conf/GENERIC
 +++ 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 $
+ # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.14 2008/08/29 18:54:35 jhb Exp $
  
 -cpu		HAMMER
 -ident		GENERIC
@@ -38,8 +38,8 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -72,7 +74,7 @@
- options 	AUDIT			# Security event auditing
+@@ -74,7 +76,7 @@
+ #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
  
  # Make an SMP-capable kernel by default
 -options 	SMP			# Symmetric MultiProcessor Kernel
@@ -47,7 +47,7 @@
  
  # CPU frequency control
  device		cpufreq
-@@ -81,9 +83,6 @@
+@@ -83,9 +85,6 @@
  device		acpi
  device		pci
  
@@ -57,7 +57,7 @@
  # ATA and ATAPI devices
  device		ata
  device		atadisk		# ATA disk drives
-@@ -91,6 +90,8 @@
+@@ -93,6 +92,8 @@
  device		atapicd		# ATAPI CDROM drives
  device		atapifd		# ATAPI floppy drives
  device		atapist		# ATAPI tape drives
@@ -66,7 +66,7 @@
  options 	ATA_STATIC_ID	# Static device numbering
  
  # SCSI Controllers
-@@ -173,10 +174,6 @@
+@@ -175,10 +176,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -77,7 +77,7 @@
  
  # If you've got a "dumb" serial or parallel PCI card that is
  # supported by the puc(4) glue driver, uncomment the following
-@@ -249,13 +246,8 @@
+@@ -252,13 +249,8 @@
  device		loop		# Network loopback
  device		random		# Entropy device
  device		ether		# Ethernet support
@@ -91,7 +91,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -272,12 +264,9 @@
+@@ -275,12 +267,9 @@
  device		ugen		# Generic
  device		uhid		# "Human Interface Devices"
  device		ukbd		# Keyboard
@@ -104,7 +104,7 @@
  # USB Serial devices
  device		ucom		# Generic com ttys
  device		uark		# Technologies ARK3116 based serial adapters
-@@ -304,3 +293,11 @@
+@@ -307,3 +296,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
@@ -118,11 +118,11 @@
 +options		ALTQ_PRIQ	# Priority Queuing (PRIQ)
 Index: src/sys/i386/conf/GENERIC
 ===================================================================
---- src/sys/i386/conf/GENERIC.orig
+--- src.orig/sys/i386/conf/GENERIC
 +++ 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 $
+ # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.14 2008/08/29 18:54:35 jhb Exp $
  
 -cpu		I486_CPU
 -cpu		I586_CPU
@@ -160,8 +160,8 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -72,7 +74,7 @@
- options 	AUDIT			# Security event auditing
+@@ -73,7 +75,7 @@
+ #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
  
  # To make an SMP kernel, the next two lines are needed
 -options 	SMP			# Symmetric MultiProcessor Kernel
@@ -169,7 +169,7 @@
  device		apic			# I/O APIC
  
  # CPU frequency control
-@@ -82,9 +84,6 @@
+@@ -83,9 +85,6 @@
  device		eisa
  device		pci
  
@@ -179,7 +179,7 @@
  # ATA and ATAPI devices
  device		ata
  device		atadisk		# ATA disk drives
-@@ -92,6 +91,8 @@
+@@ -93,6 +92,8 @@
  device		atapicd		# ATAPI CDROM drives
  device		atapifd		# ATAPI floppy drives
  device		atapist		# ATAPI tape drives
@@ -188,7 +188,7 @@
  options 	ATA_STATIC_ID	# Static device numbering
  
  # SCSI Controllers
-@@ -184,10 +185,6 @@
+@@ -185,10 +186,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -199,7 +199,7 @@
  
  # If you've got a "dumb" serial or parallel PCI card that is
  # supported by the puc(4) glue driver, uncomment the following
-@@ -263,13 +260,8 @@
+@@ -265,13 +262,8 @@
  device		loop		# Network loopback
  device		random		# Entropy device
  device		ether		# Ethernet support
@@ -213,7 +213,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -286,13 +278,10 @@
+@@ -288,13 +280,10 @@
  device		ugen		# Generic
  device		uhid		# "Human Interface Devices"
  device		ukbd		# Keyboard
@@ -227,7 +227,7 @@
  # USB Serial devices
  device		ucom		# Generic com ttys
  device		uark		# Technologies ARK3116 based serial adapters
-@@ -319,3 +308,11 @@
+@@ -321,3 +310,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons

Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series	2008-08-28 08:20:31 UTC (rev 2310)
+++ trunk/kfreebsd-7/debian/patches/series	2008-09-01 10:38:03 UTC (rev 2311)
@@ -1,24 +1,24 @@
-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
+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
+902_version.diff
+903_disable_non-free_drivers.diff 
+904_dev_full.diff
+906_grow_sysv_ipc_limits.diff
+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