[Glibc-bsd-commits] r1953 - trunk/kfreebsd-7/debian/patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Wed May 30 16:27:01 UTC 2007
Author: ps-guest
Date: 2007-05-30 16:27:01 +0000 (Wed, 30 May 2007)
New Revision: 1953
Added:
trunk/kfreebsd-7/debian/patches/913_uudecode.diff
Modified:
trunk/kfreebsd-7/debian/patches/001_misc.diff
trunk/kfreebsd-7/debian/patches/004_xargs.diff
trunk/kfreebsd-7/debian/patches/005_binutils.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/903_disable_non-free_drivers.diff
trunk/kfreebsd-7/debian/patches/911_no_werror.diff
trunk/kfreebsd-7/debian/patches/999_config.diff
Log:
* update patches
Modified: trunk/kfreebsd-7/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/001_misc.diff 2007-05-30 16:23:15 UTC (rev 1952)
+++ trunk/kfreebsd-7/debian/patches/001_misc.diff 2007-05-30 16:27:01 UTC (rev 1953)
@@ -4,10 +4,10 @@
Index: sys/conf/kern.mk
===================================================================
---- sys/conf/kern.mk.orig 2005-04-01 00:53:58.000000000 +0200
-+++ sys/conf/kern.mk 2006-06-24 17:25:17.000000000 +0200
+--- sys/conf/kern.mk.orig 2007-05-30 12:30:16.000000000 +0200
++++ sys/conf/kern.mk 2007-05-30 12:45:13.000000000 +0200
@@ -1,5 +1,9 @@
- # $FreeBSD: src/sys/conf/kern.mk,v 1.45 2005/03/31 22:53:58 peter Exp $
+ # $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $
+.if !defined(OPSYS)
+OPSYS!= uname -s
@@ -21,39 +21,38 @@
#CWARNFLAGS= -w2 # use this if you are terribly bored
CWARNFLAGS=
-.else
--CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
-+.elif !defined(CWARNFLAGS)
-+CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
++elif !defined(CWARNFLAGS)
+ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-- -fformat-extensions -std=c99
-+ -std=c99
+- ${_wundef} ${_Wno_pointer_sign} -fformat-extensions
++ ${_wundef} ${_Wno_pointer_sign}
+.if ${OPSYS} == "FreeBSD"
+# FreeBSD extensions, not available in upstream GCC
-+CWARNFLAGS+= -fformat-extensions
++CWARNFLAGS+= -fformat-extensions
+.endif
+ .if !defined(WITH_GCC3)
+ _Wno_pointer_sign=-Wno-pointer-sign
.endif
- #
- # The following flags are next up for working on:
-@@ -30,8 +38,12 @@
+@@ -36,8 +44,12 @@
# reserved for user applications.
#
.if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 \
+CFLAGS+= -mpreferred-stack-boundary=2 \
- -mno-mmx -mno-3dnow -mno-sse -mno-sse2
+ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
+.if ${OPSYS} == "FreeBSD"
+# FreeBSD extensions, not available in upstream GCC
-+CFLAGS+= -mno-align-long-strings
++CFLAGS+= -mno-align-long-strings
+.endif
INLINE_LIMIT?= 8000
.endif
Index: sys/conf/kern.post.mk
===================================================================
---- sys/conf/kern.post.mk.orig 2005-11-16 11:03:02.000000000 +0100
-+++ sys/conf/kern.post.mk 2006-06-24 17:25:17.000000000 +0200
+--- sys/conf/kern.post.mk.orig 2007-05-30 12:30:16.000000000 +0200
++++ sys/conf/kern.post.mk 2007-05-30 12:44:43.000000000 +0200
@@ -1,5 +1,15 @@
- # $FreeBSD: src/sys/conf/kern.post.mk,v 1.83.2.1 2005/11/16 10:03:02 ru Exp $
+ # $FreeBSD: src/sys/conf/kern.post.mk,v 1.100 2007/03/23 21:55:59 imp Exp $
+.if !defined(OPSYS)
+OPSYS!= uname -s
@@ -68,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.
-@@ -189,11 +199,9 @@
+@@ -208,11 +218,9 @@
.if exists(${DESTDIR}${KODIR})
-thiskernel=`sysctl -n kern.bootfile` ; \
if [ ! "`dirname "$$thiskernel"`" -ef ${DESTDIR}${KODIR} ] ; then \
@@ -80,25 +79,30 @@
rm -rf ${DESTDIR}${KODIR}.old ; \
fi ; \
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \
-@@ -202,17 +210,16 @@
+@@ -220,21 +228,21 @@
+ fi
.endif
mkdir -p ${DESTDIR}${KODIR}
- .if defined(DEBUG) && defined(INSTALL_DEBUG)
-- ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}
-+ ${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${FULLKERNEL} ${DESTDIR}${KODIR}
- .else
- ${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}
- .if defined(DEBUG) && defined(INSTALL_DEBUG)
-- ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}
-+ ${INSTALL} -p -m 555 -o root -g ${WHEEL_GROUP} ${FULLKERNEL} ${DESTDIR}${KODIR}
- .else
+ @-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:
Modified: trunk/kfreebsd-7/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/004_xargs.diff 2007-05-30 16:23:15 UTC (rev 1952)
+++ trunk/kfreebsd-7/debian/patches/004_xargs.diff 2007-05-30 16:27:01 UTC (rev 1953)
@@ -3,9 +3,9 @@
Index: sys/conf/kmod.mk
===================================================================
---- sys/conf/kmod.mk.orig 2006-02-23 03:13:31.000000000 +0100
-+++ sys/conf/kmod.mk 2006-06-24 17:32:07.000000000 +0200
-@@ -206,7 +206,7 @@
+--- sys/conf/kmod.mk.orig 2007-05-30 12:30:16.000000000 +0200
++++ sys/conf/kmod.mk 2007-05-30 12:47:06.000000000 +0200
+@@ -204,7 +204,7 @@
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -16,20 +16,20 @@
.if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
Index: sys/contrib/dev/acpica/acpica_prep.sh
===================================================================
---- sys/contrib/dev/acpica/acpica_prep.sh.orig 2004-04-14 04:03:33.000000000 +0200
-+++ sys/contrib/dev/acpica/acpica_prep.sh 2006-06-24 17:32:07.000000000 +0200
-@@ -52,12 +52,12 @@
+--- sys/contrib/dev/acpica/acpica_prep.sh.orig 2007-05-30 12:30:17.000000000 +0200
++++ sys/contrib/dev/acpica/acpica_prep.sh 2007-05-30 12:48:27.000000000 +0200
+@@ -55,12 +55,12 @@
echo copying full dirs
for i in ${fulldirs}; do
-- find ${wrk} -name ${i} -type d | xargs -J % mv % ${dst}
-+ find ${wrk} -name ${i} -type d | xargs -I % mv % ${dst}
+- find ${wrk} -name ${i} -type d | xargs -J % mv % ${dst}
++ find ${wrk} -name ${i} -type d | xargs -I % mv % ${dst}
done
# move files to destination
echo copying flat dirs
-find ${wrk} -type f | xargs -J % mv % ${dst}
+find ${wrk} -type f | xargs -I % mv % ${dst}
- mv CHANGES.txt ${dst}
+ mv ${dst}/changes.txt ${dst}/CHANGES.txt
# update src/headers for appropriate paths
Modified: trunk/kfreebsd-7/debian/patches/005_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/005_binutils.diff 2007-05-30 16:23:15 UTC (rev 1952)
+++ trunk/kfreebsd-7/debian/patches/005_binutils.diff 2007-05-30 16:27:01 UTC (rev 1953)
@@ -148,39 +148,14 @@
===================================================================
--- sys/amd64/amd64/cpu_switch.S.orig 2005-11-15 01:25:59.000000000 +0100
+++ sys/amd64/amd64/cpu_switch.S 2006-06-24 17:33:03.000000000 +0200
-@@ -105,10 +105,10 @@
- jz 1f /* no, skip over */
-
- /* Save segment selector numbers */
-- movl %ds,PCB_DS(%r8)
-- movl %es,PCB_ES(%r8)
-- movl %fs,PCB_FS(%r8)
-- movl %gs,PCB_GS(%r8)
-+ movw %ds,PCB_DS(%r8)
-+ movw %es,PCB_ES(%r8)
-+ movw %fs,PCB_FS(%r8)
-+ movw %gs,PCB_GS(%r8)
- 1:
- /* Test if debug registers should be saved. */
- testl $PCB_DBREGS,PCB_FLAGS(%r8)
-@@ -174,14 +174,14 @@
- jz 1f /* no, skip over */
-
- /* Restore segment selector numbers */
-- 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
-
- /* Restore userland %gs while preserving kernel gsbase */
+@@ -204,7 +204,7 @@
+ movq %rbx,(%rax)
movl $MSR_GSBASE,%ecx
rdmsr
- movl PCB_GS(%r8),%gs
+ movw PCB_GS(%r8),%gs
wrmsr
- jmp 2f
+
1:
Index: sys/amd64/ia32/ia32_signal.c
===================================================================
@@ -319,31 +294,23 @@
===================================================================
--- sys/amd64/ia32/ia32_sigtramp.S.orig 2003-08-23 01:19:02.000000000 +0200
+++ sys/amd64/ia32/ia32_sigtramp.S 2006-06-24 17:32:27.000000000 +0200
-@@ -45,10 +45,10 @@
+@@ -45,8 +45,8 @@
calll *IA32_SIGF_HANDLER(%esp)
leal IA32_SIGF_UC(%esp),%eax /* get ucontext */
pushl %eax
-- movl IA32_UC_GS(%eax),%gs /* restore %gs */
-- movl IA32_UC_FS(%eax),%fs /* restore %fs */
- movl IA32_UC_ES(%eax),%es /* restore %es */
- movl IA32_UC_DS(%eax),%ds /* restore %ds */
-+ mov IA32_UC_GS(%eax),%gs /* restore %gs */
-+ mov IA32_UC_FS(%eax),%fs /* restore %fs */
+ 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 */
-@@ -62,10 +62,10 @@
+@@ -60,8 +60,8 @@
calll *IA32_SIGF_HANDLER(%esp)
leal IA32_SIGF_UC4(%esp),%eax/* get ucontext */
pushl %eax
-- movl IA32_UC4_GS(%eax),%gs /* restore %gs */
-- movl IA32_UC4_FS(%eax),%fs /* restore %fs */
- movl IA32_UC4_ES(%eax),%es /* restore %es */
- movl IA32_UC4_DS(%eax),%ds /* restore %ds */
-+ mov IA32_UC4_GS(%eax),%gs /* restore %gs */
-+ mov IA32_UC4_FS(%eax),%fs /* restore %fs */
+ mov IA32_UC4_ES(%eax),%es /* restore %es */
+ mov IA32_UC4_DS(%eax),%ds /* restore %ds */
movl $344,%eax /* 4.x SYS_sigreturn */
@@ -353,31 +320,23 @@
===================================================================
--- sys/amd64/linux32/linux32_locore.s.orig 2004-08-16 09:55:06.000000000 +0200
+++ sys/amd64/linux32/linux32_locore.s 2006-06-24 17:32:27.000000000 +0200
-@@ -11,10 +11,10 @@
+@@ -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_GS(%ebx),%gs
-- movl LINUX_SC_FS(%ebx),%fs
- movl LINUX_SC_ES(%ebx),%es
- movl LINUX_SC_DS(%ebx),%ds
-+ mov LINUX_SC_GS(%ebx),%gs
-+ mov LINUX_SC_FS(%ebx),%fs
+ 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() */
-@@ -25,10 +25,10 @@
+@@ -23,8 +23,8 @@
linux_rt_sigcode:
call *LINUX_RT_SIGF_HANDLER(%esp)
leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */
-- movl LINUX_SC_GS(%ebx),%gs
-- movl LINUX_SC_FS(%ebx),%fs
- movl LINUX_SC_ES(%ebx),%es
- movl LINUX_SC_DS(%ebx),%ds
-+ mov LINUX_SC_GS(%ebx),%gs
-+ mov LINUX_SC_FS(%ebx),%fs
+ mov LINUX_SC_ES(%ebx),%es
+ mov LINUX_SC_DS(%ebx),%ds
push %eax /* fake ret addr */
Modified: trunk/kfreebsd-7/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/008_config.diff 2007-05-30 16:23:15 UTC (rev 1952)
+++ trunk/kfreebsd-7/debian/patches/008_config.diff 2007-05-30 16:27:01 UTC (rev 1953)
@@ -5,11 +5,11 @@
Index: usr.sbin/config/Makefile
===================================================================
---- usr.sbin/config/Makefile.orig 2004-05-11 17:42:44.000000000 +0200
-+++ usr.sbin/config/Makefile 2006-06-24 17:33:24.000000000 +0200
-@@ -6,11 +6,11 @@
- SRCS= config.y main.c lang.l mkmakefile.c mkheaders.c \
- mkoptions.c y.tab.h
+--- usr.sbin/config/Makefile.orig 2007-05-30 17:48:56.000000000 +0200
++++ usr.sbin/config/Makefile 2007-05-30 17:52:41.000000000 +0200
+@@ -9,11 +9,11 @@
+ kernconf.c: kernconf.tmpl
+ file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
-WARNS?= 6
-CFLAGS+= -I. -I${.CURDIR}
@@ -17,37 +17,36 @@
+CFLAGS+= -I. -I${.CURDIR} -D_GNU_SOURCE
DPADD= ${LIBL}
--LDADD= -ll
+-LDADD= -ll -lsbuf
+LDADD= -ll -lbsd
- mkmakefile.o: configvers.h
+ CLEANFILES+= kernconf.c
Index: usr.sbin/config/main.c
===================================================================
---- usr.sbin/config/main.c.orig 2005-10-28 21:04:03.000000000 +0200
-+++ usr.sbin/config/main.c 2006-06-24 17:33:24.000000000 +0200
-@@ -45,13 +45,19 @@
+--- usr.sbin/config/main.c.orig 2007-05-30 17:48:56.000000000 +0200
++++ usr.sbin/config/main.c 2007-05-30 17:53:51.000000000 +0200
+@@ -41,12 +41,18 @@
+ "$FreeBSD: src/usr.sbin/config/main.c,v 1.76 2007/05/17 04:53:52 imp Exp $";
+ #endif /* not lint */
+
++#include <stdarg.h>
+ #include <sys/types.h>
#include <sys/stat.h>
+ #include <sys/sbuf.h>
#include <sys/file.h>
#include <sys/mman.h>
-#include <sys/param.h>
+#include <sys/param.h> /* BSD */
++
+#ifndef BSD
+#include <bsd/string.h> /* strlcpy, strlcat */
++#include "sbuf.c"
+#endif
+
+ #include <assert.h>
#include <ctype.h>
- #include <err.h>
- #include <stdio.h>
- #include <sysexits.h>
- #include <unistd.h>
- #include <dirent.h>
-+#ifndef _DIRENT_HAVE_D_NAMLEN
-+#include <string.h> /* strlen */
-+#endif
- #include "y.tab.h"
- #include "config.h"
- #include "configvers.h"
-@@ -455,7 +461,11 @@
+@@ -588,7 +594,11 @@
if ((dirp = opendir(p)) == NULL)
err(EX_OSERR, "opendir %s", p);
while ((dp = readdir(dirp)) != NULL) {
Modified: trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff 2007-05-30 16:23:15 UTC (rev 1952)
+++ trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff 2007-05-30 16:27:01 UTC (rev 1953)
@@ -1,19 +1,6 @@
Status: in upstream BTS
-Index: sys/conf/Makefile.alpha
-===================================================================
---- sys/conf/Makefile.alpha.orig 2005-10-28 21:04:02.000000000 +0200
-+++ sys/conf/Makefile.alpha 2006-06-24 17:33:28.000000000 +0200
-@@ -28,6 +28,8 @@
- .endif
- .include "$S/conf/kern.pre.mk"
-
-+%WITHOUT_MODULES
-+
- %BEFORE_DEPEND
-
- %OBJS
Index: sys/conf/Makefile.amd64
===================================================================
--- sys/conf/Makefile.amd64.orig 2005-10-28 21:04:03.000000000 +0200
Modified: trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff 2007-05-30 16:23:15 UTC (rev 1952)
+++ trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff 2007-05-30 16:27:01 UTC (rev 1953)
@@ -2,8 +2,8 @@
Index: sys/kern/imgact_elf.c
===================================================================
---- sys/kern/imgact_elf.c.orig 2006-03-16 01:25:31.000000000 +0100
-+++ sys/kern/imgact_elf.c 2006-06-24 17:37:23.000000000 +0200
+--- sys/kern/imgact_elf.c.orig 2007-05-30 12:31:15.000000000 +0200
++++ sys/kern/imgact_elf.c 2007-05-30 13:05:38.000000000 +0200
@@ -610,6 +610,8 @@
char *path;
struct thread *td = curthread;
@@ -13,35 +13,36 @@
/*
* Do we have a valid ELF header ?
-@@ -649,10 +651,26 @@
+@@ -649,11 +651,27 @@
hdr->e_ident[EI_OSABI]);
return (ENOEXEC);
}
+#if 0
- if (hdr->e_type == ET_DYN && brand_info->brand != ELFOSABI_LINUX)
+ if (hdr->e_type == ET_DYN &&
+ (brand_info->flags & BI_CAN_EXEC_DYN) == 0)
return (ENOEXEC);
+#endif
+ if (hdr->e_type == ET_DYN) {
+ for (i = 0; i < hdr->e_phnum; i++) {
+ if (phdr[i].p_type == PT_LOAD) {
+ if (phdr[i].p_vaddr == 0) {
-+ /* we have to load at base addr 0,
++ /* we have to load at base addr 0,
+ * so relocate somewhere (at 512 MB)
+ */
+ rbase = 512 * 1024 * 1024;
+ break;
-+ }
++ }
+ }
+ }
+ }
-+
++
sv = brand_info->sysvec;
- if (interp != NULL && brand_info->interp_newpath != NULL)
+ if (interp != NULL && brand_info->interp_newpath != NULL && !strcmp(interp, "/libexec/ld-elf.so.1") != NULL)
interp = brand_info->interp_newpath;
/*
-@@ -693,7 +711,7 @@
+@@ -695,7 +713,7 @@
if ((error = __elfN(load_section)(vmspace,
imgp->object, phdr[i].p_offset,
@@ -50,7 +51,7 @@
phdr[i].p_memsz, phdr[i].p_filesz, prot,
sv->sv_pagesize)) != 0)
return (error);
-@@ -707,11 +725,12 @@
+@@ -709,11 +727,12 @@
if (phdr[i].p_offset == 0 &&
hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize
<= phdr[i].p_filesz)
@@ -64,7 +65,7 @@
/*
* Is this .text or .data? We can't use
-@@ -733,7 +752,7 @@
+@@ -735,7 +754,7 @@
phdr[i].p_memsz)) {
text_size = seg_size;
text_addr = seg_addr;
@@ -73,7 +74,7 @@
} else {
data_size = seg_size;
data_addr = seg_addr;
-@@ -741,7 +760,7 @@
+@@ -743,7 +762,7 @@
total_size += seg_size;
break;
case PT_PHDR: /* Program header table info */
Modified: trunk/kfreebsd-7/debian/patches/013_ip_packed.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/013_ip_packed.diff 2007-05-30 16:23:15 UTC (rev 1952)
+++ trunk/kfreebsd-7/debian/patches/013_ip_packed.diff 2007-05-30 16:27:01 UTC (rev 1953)
@@ -1,13 +1,13 @@
Index: sys/netinet/ip.h
===================================================================
---- sys/netinet/ip.h.orig 2005-01-07 02:45:44.000000000 +0100
-+++ sys/netinet/ip.h 2006-06-24 17:38:11.000000000 +0200
-@@ -65,7 +65,7 @@
+--- sys/netinet/ip.h.orig 2007-05-30 12:31:30.000000000 +0200
++++ sys/netinet/ip.h 2007-05-30 13:08:18.000000000 +0200
+@@ -67,7 +67,7 @@
u_char ip_p; /* protocol */
u_short ip_sum; /* checksum */
struct in_addr ip_src,ip_dst; /* source and dest address */
--} __packed;
-+} __attribute__ ((packed));
+-} __packed __aligned(4);
++} __attribute__((__packed__)) __attribute__((__aligned__(4)));
#ifdef CTASSERT
CTASSERT(sizeof (struct ip) == 20);
Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2007-05-30 16:23:15 UTC (rev 1952)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2007-05-30 16:27:01 UTC (rev 1953)
@@ -1,15 +1,14 @@
Index: sys/conf/files
===================================================================
---- sys/conf/files.orig 2006-06-25 11:13:23.564594000 +0200
-+++ sys/conf/files 2006-06-25 11:13:30.000000000 +0200
-@@ -438,18 +437,6 @@
+--- sys/conf/files.orig 2007-05-30 17:46:31.000000000 +0200
++++ sys/conf/files 2007-05-30 17:54:16.000000000 +0200
+@@ -474,17 +474,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/amrr/amrr.c optional ath_rate_amrr
-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 \
@@ -23,8 +22,8 @@
dev/awi/if_awi_pccard.c optional awi pccard
Index: sys/conf/files.i386
===================================================================
---- sys/conf/files.i386.orig 2006-06-25 11:13:23.586857000 +0200
-+++ sys/conf/files.i386 2006-06-25 11:13:30.000000000 +0200
+--- sys/conf/files.i386.orig 2007-05-30 17:46:31.000000000 +0200
++++ sys/conf/files.i386 2007-05-30 17:54:16.000000000 +0200
@@ -46,42 +46,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
@@ -40,7 +39,7 @@
- no-implicit-rule
-opt_ah.h optional ath_hal \
- dependency "$S/contrib/dev/ath/public/i386-elf.opt_ah.h" \
-- compile-with "cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h 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"
-#
@@ -66,9 +65,9 @@
- no-implicit-rule
-#
#
- compat/linux/linux_file.c optional compat_linux
- compat/linux/linux_getcwd.c optional compat_linux
-@@ -181,11 +145,6 @@
+ compat/linprocfs/linprocfs.c optional linprocfs
+ compat/linsysfs/linsysfs.c optional linsysfs
+@@ -178,11 +142,6 @@
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
dev/fe/if_fe_isa.c optional fe isa
@@ -80,13 +79,12 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_pentium.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
-@@ -206,13 +165,9 @@
- dev/mem/memutil.c optional mem
+@@ -209,12 +168,8 @@
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
+ dev/nfe/if_nfe.c optional nfe pci
-dev/nve/if_nve.c optional nve pci
- dev/ppc/ppc.c optional ppc
- dev/ppc/ppc_puc.c optional ppc puc pci
+ dev/pcf/pcf_isa.c optional pcf
dev/random/nehemiah.c optional random
-dev/rr232x/os_bsd.c optional rr232x
-dev/rr232x/osm_bsd.c optional rr232x
@@ -96,9 +94,9 @@
dev/sbni/if_sbni_pci.c optional sbni pci
Index: sys/conf/kern.pre.mk
===================================================================
---- sys/conf/kern.pre.mk.orig 2006-06-25 11:13:23.609486000 +0200
-+++ sys/conf/kern.pre.mk 2006-06-25 11:13:30.000000000 +0200
-@@ -58,9 +58,6 @@
+--- sys/conf/kern.pre.mk.orig 2007-05-30 17:46:31.000000000 +0200
++++ sys/conf/kern.pre.mk 2007-05-30 17:54:16.000000000 +0200
+@@ -67,9 +67,6 @@
# ... and the same for pf
INCLUDES+= -I$S/contrib/pf
@@ -110,9 +108,9 @@
Index: sys/i386/conf/GENERIC
===================================================================
---- sys/i386/conf/GENERIC.orig 2006-06-25 11:13:23.666760000 +0200
-+++ sys/i386/conf/GENERIC 2006-06-25 11:16:32.056882000 +0200
-@@ -118,8 +118,6 @@
+--- sys/i386/conf/GENERIC.orig 2007-05-30 17:47:50.000000000 +0200
++++ sys/i386/conf/GENERIC 2007-05-30 17:54:16.000000000 +0200
+@@ -132,8 +132,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
@@ -121,115 +119,177 @@
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -199,7 +197,6 @@
- device fxp # Intel EtherExpress PRO/100B (82557, 82558)
+@@ -211,7 +209,7 @@
device lge # Level 1 LXT1001 gigabit Ethernet
+ device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
device nge # NatSemi DP83820 gigabit Ethernet
-device nve # nVidia nForce MCP on-board Ethernet Networking
- device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc')
++device nfe # nVidia nForce MCP on-board Ethernet Networking
+ device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
Index: sys/modules/Makefile
===================================================================
---- sys/modules/Makefile.orig 2006-06-25 11:13:23.693634000 +0200
-+++ sys/modules/Makefile 2006-06-25 11:13:30.000000000 +0200
-@@ -26,11 +26,6 @@
+--- sys/modules/Makefile.orig 2007-05-30 17:48:05.000000000 +0200
++++ sys/modules/Makefile 2007-05-30 17:55:09.000000000 +0200
+@@ -25,11 +25,6 @@
${_arl} \
${_asr} \
ata \
-- ath \
+- ${_ath} \
- ${_ath_hal} \
- ath_rate_amrr \
- ath_rate_onoe \
-- ath_rate_sample \
+- ${_ath_rate_sample} \
aue \
${_auxio} \
${_awi} \
@@ -94,7 +89,6 @@
- ${_hfa} \
hifn \
hme \
+ ${_hptiop} \
- ${_hptmv} \
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -175,9 +169,7 @@
+@@ -185,9 +179,7 @@
ntfs \
ntfs_iconv \
nullfs \
- ${_nve} \
${_nwfs} \
- ${_oltr} \
- ${_osf1} \
${_padlock} \
patm \
-@@ -328,7 +320,6 @@
+ ${_pccard} \
+@@ -217,7 +209,6 @@
+ reiserfs \
+ rl \
+ rp \
+- ${_rr232x} \
+ rue \
+ rum \
+ ${_s3} \
+@@ -305,7 +296,6 @@
+ ${_xe} \
+ xfs \
+ xl \
+- ${_zfs} \
+ zlib
+
+ .if ${MACHINE_ARCH} != "powerpc"
+@@ -349,9 +339,6 @@
_apm= apm
_ar= ar
_arcnet= arcnet
+-_ath= ath
-_ath_hal= ath_hal
+-_ath_rate_sample=ath_rate_sample
_awi= awi
_bktr= bktr
_cardbus= cardbus
-@@ -361,7 +352,6 @@
- _ndis= ndis
- _nsp= nsp
+@@ -389,7 +376,6 @@
+ .if ${MK_NCP} != "no"
_nwfs= nwfs
+ .endif
-_oltr= oltr
_pccard= pccard
_pcfclock= pcfclock
_pecoff= pecoff
-@@ -406,7 +396,6 @@
+@@ -409,9 +395,6 @@
+ _streams= streams
+ _wi= wi
+ _xe= xe
+-.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
+-_zfs= zfs
+-.endif
+ .if ${MACHINE} == "i386"
+ _aac= aac
+ _acpi= acpi
+@@ -427,7 +410,6 @@
_dpt= dpt
- _el= el
_ex= ex
+ _hptiop= hptiop
-_hptmv= hptmv
_ichwd= ichwd
_ida= ida
_idt= idt
-@@ -417,14 +406,12 @@
- _iwi= iwi
- _ixgb= ixgb
+@@ -442,13 +424,11 @@
_mly= mly
+ _mxge= mxge
+ _nfe= nfe
-_nve= nve
- .if !defined(NO_CRYPT) || defined(ALL_MODULES)
+ .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
.if exists(${.CURDIR}/../crypto/via)
_padlock= padlock
.endif
.endif
- _ppc= ppc
-_rr232x= rr232x
_s3= s3
_twa= twa
_vesa= vesa
-@@ -438,14 +426,12 @@
- #_acpi= acpi # doesn't work on amd64 yet
+@@ -466,9 +446,6 @@
_agp= agp
+ _an= an
_arcmsr= arcmsr
+-_ath= ath
-_ath_hal= ath_hal
+-_ath_rate_sample=ath_rate_sample
+ _cardbus= cardbus
+ _cbb= cbb
_ciss= ciss
- _cpufreq= cpufreq
- _digi= digi
- _drm= drm
- _em= em
+@@ -480,7 +457,6 @@
+ _exca= exca
_ext2fs= ext2fs
+ _hptiop= hptiop
-_hptmv= hptmv
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -476,7 +461,6 @@
- _mly= mly
+@@ -499,9 +475,7 @@
+ _mxge= mxge
_ndis= ndis
- _ppc= ppc
+ _nfe= nfe
+-_nve= nve
+ _pccard= pccard
-_rr232x= rr232x
_safe= safe
_scsi_low= scsi_low
_smbfs= smbfs
+@@ -510,9 +484,6 @@
+ _sppp= sppp
+ _twa= twa
+ _wi= wi
+-.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
+-_zfs= zfs
+-.endif
+ .endif
+
+ .if ${MACHINE_ARCH} == "ia64"
+@@ -553,18 +524,12 @@
+
+ .if ${MACHINE_ARCH} == "powerpc"
+ _an= an
+-_ath= ath
+-_ath_hal= ath_hal
+-_ath_rate_sample=ath_rate_sample
+ _gem= gem
+ _powermac_nvram= powermac_nvram
+ _smbfs= smbfs
+ .endif
+
+ .if ${MACHINE_ARCH} == "sparc64"
+-_ath= ath
+-_ath_hal= ath_hal
+-_ath_rate_sample=ath_rate_sample
+ _auxio= auxio
+ _em= em
+ _gem= gem
Index: sys/amd64/conf/GENERIC
===================================================================
---- sys/amd64/conf/GENERIC.orig 2006-06-25 11:13:23.731156000 +0200
-+++ sys/amd64/conf/GENERIC 2006-06-25 11:16:32.094195000 +0200
-@@ -117,8 +117,6 @@
+--- sys/amd64/conf/GENERIC.orig 2007-05-30 17:46:15.000000000 +0200
++++ sys/amd64/conf/GENERIC 2007-05-30 17:54:16.000000000 +0200
+@@ -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
@@ -238,18 +298,19 @@
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -189,7 +187,6 @@
- device fxp # Intel EtherExpress PRO/100B (82557, 82558)
+@@ -200,7 +198,7 @@
device lge # Level 1 LXT1001 gigabit Ethernet
+ device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
device nge # NatSemi DP83820 gigabit Ethernet
-device nve # nVidia nForce MCP on-board Ethernet Networking
- device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc')
++device nfe # nVidia nForce MCP on-board Ethernet Networking
+ device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
Index: sys/conf/files.amd64
===================================================================
---- sys/conf/files.amd64.orig 2006-06-25 11:13:23.636572000 +0200
-+++ sys/conf/files.amd64 2006-06-25 11:13:30.000000000 +0200
+--- sys/conf/files.amd64.orig 2007-05-30 17:46:31.000000000 +0200
++++ sys/conf/files.amd64 2007-05-30 17:54:16.000000000 +0200
@@ -47,35 +47,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
@@ -260,7 +321,7 @@
- no-implicit-rule
-opt_ah.h optional ath_hal \
- dependency "$S/contrib/dev/ath/public/x86_64-elf.opt_ah.h" \
-- compile-with "cp $S/contrib/dev/ath/public/x86_64-elf.opt_ah.h 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"
-#
@@ -286,7 +347,7 @@
#
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
-@@ -160,11 +131,6 @@
+@@ -173,21 +144,12 @@
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
@@ -298,14 +359,13 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
-@@ -172,10 +138,6 @@
- dev/kbd/kbd.c optional sc
- dev/kbd/kbd.c optional ukbd
+ dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/mem/memutil.c optional mem
+ dev/nfe/if_nfe.c optional nfe pci
-dev/nve/if_nve.c optional nve pci
-dev/rr232x/os_bsd.c optional rr232x
-dev/rr232x/osm_bsd.c optional rr232x
-dev/rr232x/rr232x_config.c optional rr232x
- dev/ppc/ppc.c optional ppc
- dev/ppc/ppc_puc.c optional ppc puc
dev/sio/sio.c optional sio
+ dev/sio/sio_isa.c optional sio isa
+ dev/sio/sio_pccard.c optional sio pccard
Modified: trunk/kfreebsd-7/debian/patches/911_no_werror.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/911_no_werror.diff 2007-05-30 16:23:15 UTC (rev 1952)
+++ trunk/kfreebsd-7/debian/patches/911_no_werror.diff 2007-05-30 16:27:01 UTC (rev 1953)
@@ -12,3 +12,14 @@
.if ${MACHINE_ARCH} == "alpha"
SRCS+= hwpmc_alpha.c
+Index: sys/modules/geom/geom_eli/Makefile
+===================================================================
+--- sys/modules/geom/geom_eli/Makefile 2007-05-30 18:49:24.000000000 +0200
++++ sys/modules/geom/geom_eli/Makefile 2007-05-30 18:49:24.000000000 +0200
+@@ -12,5 +12,6 @@
+ SRCS+= pkcs5v2.c
+ SRCS+= vnode_if.h
+ WARNS?= 2
++NO_WERROR?= 1
+
+ .include <bsd.kmod.mk>
Added: trunk/kfreebsd-7/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/913_uudecode.diff (rev 0)
+++ trunk/kfreebsd-7/debian/patches/913_uudecode.diff 2007-05-30 16:27:01 UTC (rev 1953)
@@ -0,0 +1,108 @@
+diff -ur sys.orig/modules/cxgb/Makefile sys/modules/cxgb/Makefile
+--- sys.orig/modules/cxgb/Makefile 2007-05-30 18:42:07.000000000 +0200
++++ sys/modules/cxgb/Makefile 2007-05-30 20:02:23.000000000 +0200
+@@ -16,7 +16,7 @@
+ .if ${MACHINE_ARCH} != "ia64"
+ # ld is broken on ia64
+ t3fw-4.0.0.bin: ${CXGB}/t3fw-4.0.0.bin.gz.uu
+- uudecode -p < ${CXGB}/t3fw-4.0.0.bin.gz.uu \
++ uudecode -o- < ${CXGB}/t3fw-4.0.0.bin.gz.uu \
+ | gzip -dc > ${.TARGET}
+
+ FIRMWS= t3fw-4.0.0.bin:t3fw400
+diff -ur sys.orig/modules/ipwfw/ipw_bss/Makefile sys/modules/ipwfw/ipw_bss/Makefile
+--- sys.orig/modules/ipwfw/ipw_bss/Makefile 2007-05-30 18:15:13.000000000 +0200
++++ sys/modules/ipwfw/ipw_bss/Makefile 2007-05-30 20:03:15.000000000 +0200
+@@ -9,7 +9,7 @@
+ CLEANFILES= ipw_bss
+
+ ipw_bss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu
+- uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu > ${.TARGET}
++ uudecode -o- ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu > ${.TARGET}
+
+ .include <bsd.kmod.mk>
+
+diff -ur sys.orig/modules/ipwfw/ipw_ibss/Makefile sys/modules/ipwfw/ipw_ibss/Makefile
+--- sys.orig/modules/ipwfw/ipw_ibss/Makefile 2007-05-30 18:15:13.000000000 +0200
++++ sys/modules/ipwfw/ipw_ibss/Makefile 2007-05-30 20:03:23.000000000 +0200
+@@ -9,7 +9,7 @@
+ CLEANFILES= ipw_ibss
+
+ ipw_ibss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu
+- uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu > ${.TARGET}
++ uudecode -o- ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu > ${.TARGET}
+
+ .include <bsd.kmod.mk>
+
+diff -ur sys.orig/modules/ipwfw/ipw_monitor/Makefile sys/modules/ipwfw/ipw_monitor/Makefile
+--- sys.orig/modules/ipwfw/ipw_monitor/Makefile 2007-05-30 18:15:13.000000000 +0200
++++ sys/modules/ipwfw/ipw_monitor/Makefile 2007-05-30 20:03:35.000000000 +0200
+@@ -9,7 +9,7 @@
+ CLEANFILES= ipw_monitor
+
+ ipw_monitor: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu
+- uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu > ${.TARGET}
++ uudecode -o- ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu > ${.TARGET}
+
+ .include <bsd.kmod.mk>
+
+diff -ur sys.orig/modules/iwifw/iwi_bss/Makefile sys/modules/iwifw/iwi_bss/Makefile
+--- sys.orig/modules/iwifw/iwi_bss/Makefile 2007-05-30 18:15:14.000000000 +0200
++++ sys/modules/iwifw/iwi_bss/Makefile 2007-05-30 20:03:56.000000000 +0200
+@@ -9,7 +9,7 @@
+ CLEANFILES= iwi_bss
+
+ iwi_bss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu
+- uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu > ${.TARGET}
++ uudecode -o- ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu > ${.TARGET}
+
+ .include <bsd.kmod.mk>
+
+diff -ur sys.orig/modules/iwifw/iwi_ibss/Makefile sys/modules/iwifw/iwi_ibss/Makefile
+--- sys.orig/modules/iwifw/iwi_ibss/Makefile 2007-05-30 18:15:14.000000000 +0200
++++ sys/modules/iwifw/iwi_ibss/Makefile 2007-05-30 20:04:05.000000000 +0200
+@@ -9,7 +9,7 @@
+ CLEANFILES= iwi_fw
+
+ iwi_ibss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu
+- uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu > ${.TARGET}
++ uudecode -o- ^${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu > ${.TARGET}
+
+ .include <bsd.kmod.mk>
+
+diff -ur sys.orig/modules/iwifw/iwi_monitor/Makefile sys/modules/iwifw/iwi_monitor/Makefile
+--- sys.orig/modules/iwifw/iwi_monitor/Makefile 2007-05-30 18:15:14.000000000 +0200
++++ sys/modules/iwifw/iwi_monitor/Makefile 2007-05-30 20:04:17.000000000 +0200
+@@ -9,7 +9,7 @@
+ CLEANFILES= iwi_monitor
+
+ iwi_monitor: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu
+- uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu > ${.TARGET}
++ uudecode -o- ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu > ${.TARGET}
+
+ .include <bsd.kmod.mk>
+
+diff -ur sys.orig/modules/mxge/mxge_eth_z8e/Makefile sys/modules/mxge/mxge_eth_z8e/Makefile
+--- sys.orig/modules/mxge/mxge_eth_z8e/Makefile 2007-05-30 18:15:15.000000000 +0200
++++ sys/modules/mxge/mxge_eth_z8e/Makefile 2007-05-30 20:02:39.000000000 +0200
+@@ -7,7 +7,7 @@
+ CLEANFILES+= eth_z8e.dat
+
+ eth_z8e.dat: ${MXGE}/eth_z8e.dat.gz.uu
+- uudecode -p < ${MXGE}/eth_z8e.dat.gz.uu \
++ uudecode -o- < ${MXGE}/eth_z8e.dat.gz.uu \
+ | gzip -dc > ${.TARGET}
+
+ .include <bsd.kmod.mk>
+diff -ur sys.orig/modules/mxge/mxge_ethp_z8e/Makefile sys/modules/mxge/mxge_ethp_z8e/Makefile
+--- sys.orig/modules/mxge/mxge_ethp_z8e/Makefile 2007-05-30 18:15:15.000000000 +0200
++++ sys/modules/mxge/mxge_ethp_z8e/Makefile 2007-05-30 20:02:48.000000000 +0200
+@@ -7,7 +7,7 @@
+ CLEANFILES+= ethp_z8e.dat
+
+ ethp_z8e.dat: ${MXGE}/ethp_z8e.dat.gz.uu
+- uudecode -p < ${MXGE}/ethp_z8e.dat.gz.uu \
++ uudecode -o- < ${MXGE}/ethp_z8e.dat.gz.uu \
+ | gzip -dc > ${.TARGET}
+
+ .include <bsd.kmod.mk>
Modified: trunk/kfreebsd-7/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/999_config.diff 2007-05-30 16:23:15 UTC (rev 1952)
+++ trunk/kfreebsd-7/debian/patches/999_config.diff 2007-05-30 16:27:01 UTC (rev 1953)
@@ -1,47 +1,40 @@
Index: sys/amd64/conf/GENERIC
===================================================================
---- sys/amd64/conf/GENERIC.orig 2006-06-24 17:57:48.000000000 +0200
-+++ sys/amd64/conf/GENERIC 2006-06-24 17:57:48.000000000 +0200
-@@ -19,13 +19,9 @@
- # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.9.2.2 2006/05/01 00:15:12 scottl Exp $
+--- sys/amd64/conf/GENERIC.orig 2007-05-30 13:26:20.000000000 +0200
++++ sys/amd64/conf/GENERIC 2007-05-30 13:31:16.000000000 +0200
+@@ -18,13 +18,8 @@
+ #
+ # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $
- machine amd64
-cpu HAMMER
-ident GENERIC
-
+-
# To statically compile in device wiring instead of /boot/device.hints
-#hints "GENERIC.hints" # Default places to look for devices.
-
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+hints "GENERIC.hints" # Default places to look for devices.
- #options SCHED_ULE # ULE scheduler
options SCHED_4BSD # 4BSD scheduler
-@@ -44,6 +40,7 @@
+ options PREEMPTION # Enable kernel thread preemption
+@@ -43,6 +38,7 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
+options LINPROCFS
options PSEUDOFS # Pseudo-filesystem framework
- options GEOM_GPT # GUID Partition Tables.
- options COMPAT_43 # Needed by COMPAT_LINUX32
-@@ -51,7 +48,7 @@
+ options GEOM_PART_GPT # GUID Partition Tables.
+ options GEOM_LABEL # Provides labelization
+@@ -51,7 +47,7 @@
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
- options COMPAT_LINUX32 # Compatible with i386 linux binaries
+ options COMPAT_FREEBSD6 # Compatible with FreeBSD6
-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
options SYSVSHM # SYSV-style shared memory
- options SYSVMSG # SYSV-style message queues
-@@ -67,16 +64,10 @@
- # Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
- device atpic # 8259A compatability
-
--# Linux 32-bit ABI support
--options LINPROCFS # Cannot be a module yet.
--
- # Bus support.
+ options SHMMAXPGS=4096
+@@ -83,9 +79,6 @@
device acpi
device pci
@@ -51,7 +44,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -84,6 +75,8 @@
+@@ -93,6 +86,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -60,7 +53,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -162,10 +155,6 @@
+@@ -175,10 +170,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -71,9 +64,9 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -215,9 +215,6 @@
- device wlan_ccmp # 802.11 CCMP support
+@@ -237,9 +228,6 @@
device wlan_tkip # 802.11 TKIP support
+ device wlan_amrr # AMRR transmit rate control algorithm
device an # Aironet 4500/4800 802.11 wireless NICs.
-device ath # Atheros pci/cardbus NIC's
-device ath_hal # Atheros HAL (Hardware Access Layer)
@@ -81,7 +74,7 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-@@ -228,13 +217,8 @@
+@@ -248,13 +236,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -92,10 +85,10 @@
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.
- # Be aware of the administrative consequences of enabling this!
-@@ -250,12 +234,8 @@
+@@ -271,12 +254,8 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -108,10 +101,10 @@
# USB Ethernet, requires miibus
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
-@@ -268,3 +248,11 @@
- device firewire # FireWire bus code
- device sbp # SCSI over FireWire (Requires scbus and da)
- device fwe # Ethernet over FireWire (non-standard!)
+@@ -292,3 +271,11 @@
+ device fwip # IP over FireWire (RFC 2734,3146)
+ device dcons # Dumb console driver
+ device dcons_crom # Configuration ROM for dcons
+
+# Alternate queueing
+options ALTQ
@@ -122,42 +115,44 @@
+options ALTQ_PRIQ # Priority Queuing (PRIQ)
Index: sys/i386/conf/GENERIC
===================================================================
---- sys/i386/conf/GENERIC.orig 2006-06-24 17:57:48.000000000 +0200
-+++ sys/i386/conf/GENERIC 2006-06-24 17:57:48.000000000 +0200
-@@ -19,15 +19,9 @@
- # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.7.2.2 2006/05/01 00:15:12 scottl Exp $
+--- sys/i386/conf/GENERIC.orig 2007-05-30 13:26:20.000000000 +0200
++++ sys/i386/conf/GENERIC 2007-05-30 13:35:14.000000000 +0200
+@@ -18,15 +18,8 @@
+ #
+ # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.468 2007/05/28 14:38:42 simokawa Exp $
- machine i386
-cpu I486_CPU
-cpu I586_CPU
-cpu I686_CPU
-ident GENERIC
-
+-
# To statically compile in device wiring instead of /boot/device.hints
-#hints "GENERIC.hints" # Default places to look for devices.
-
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+hints "GENERIC.hints" # Default places to look for devices.
- #options SCHED_ULE # ULE scheduler
options SCHED_4BSD # 4BSD scheduler
-@@ -45,12 +39,14 @@
+ options PREEMPTION # Enable kernel thread preemption
+@@ -44,6 +37,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
-+options LINPROCFS
-+options COMPAT_LINUX # Needed by LINPROCFS
++options LINPROCFS
++options COMPAT_LINUX # Needed by LINPROCFS
options PSEUDOFS # Pseudo-filesystem framework
- options GEOM_GPT # GUID Partition Tables.
- options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]
+ options GEOM_PART_GPT # GUID Partition Tables.
+ options GEOM_LABEL # Provides labelization
+@@ -51,7 +46,7 @@
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
+ options COMPAT_FREEBSD6 # Compatible with FreeBSD6
-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
options SYSVSHM # SYSV-style shared memory
options SHMMAXPGS=4096
-@@ -75,9 +71,6 @@
+@@ -84,9 +79,6 @@
device eisa
device pci
@@ -167,7 +162,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -85,6 +78,8 @@
+@@ -94,6 +86,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -176,7 +171,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -177,10 +172,6 @@
+@@ -186,10 +180,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -187,9 +182,9 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -228,9 +228,6 @@
- device wlan_ccmp # 802.11 CCMP support
+@@ -250,9 +240,6 @@
device wlan_tkip # 802.11 TKIP support
+ device wlan_amrr # AMRR transmit rate control algorithm
device an # Aironet 4500/4800 802.11 wireless NICs.
-device ath # Atheros pci/cardbus NIC's
-device ath_hal # Atheros HAL (Hardware Access Layer)
@@ -197,7 +192,7 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-@@ -243,13 +234,8 @@
+@@ -262,13 +249,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -208,10 +203,10 @@
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.
- # Be aware of the administrative consequences of enabling this!
-@@ -265,12 +251,8 @@
+@@ -285,13 +267,9 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -219,15 +214,16 @@
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 Ethernet, requires miibus
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
-@@ -283,3 +265,11 @@
- device firewire # FireWire bus code
- device sbp # SCSI over FireWire (Requires scbus and da)
- device fwe # Ethernet over FireWire (non-standard!)
+@@ -307,3 +285,11 @@
+ device fwip # IP over FireWire (RFC 2734,3146)
+ device dcons # Dumb console driver
+ device dcons_crom # Configuration ROM for dcons
+
+# Alternate queueing
+options ALTQ
More information about the Glibc-bsd-commits
mailing list