[Glibc-bsd-commits] r3285 - in trunk: . kfreebsd-9/debian kfreebsd-9/debian/patches
Petr Salinger
ps-guest at alioth.debian.org
Mon Mar 28 12:29:17 UTC 2011
Author: ps-guest
Date: 2011-03-28 12:29:15 +0000 (Mon, 28 Mar 2011)
New Revision: 3285
Added:
trunk/kfreebsd-9/
Modified:
trunk/kfreebsd-9/debian/changelog
trunk/kfreebsd-9/debian/patches/001_misc.diff
trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff
trunk/kfreebsd-9/debian/patches/008_config.diff
trunk/kfreebsd-9/debian/patches/020_linker.diff
trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-9/debian/patches/913_uudecode.diff
trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
trunk/kfreebsd-9/debian/patches/999_config.diff
trunk/kfreebsd-9/debian/patches/series
trunk/kfreebsd-9/debian/rules
Log:
track kfreebsd-9
Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/changelog 2011-03-28 12:29:15 UTC (rev 3285)
@@ -1,4 +1,4 @@
-kfreebsd-8 (8.2-2) UNRELEASED; urgency=low
+kfreebsd-9 (9.0~svn20110328-1) UNRELEASED; urgency=low
*
Modified: trunk/kfreebsd-9/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/001_misc.diff 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/patches/001_misc.diff 2011-03-28 12:29:15 UTC (rev 3285)
@@ -15,33 +15,32 @@
# Warning flags for compiling the kernel and components of the kernel.
#
@@ -9,10 +13,14 @@
- .if ${CC} == "icc"
+ .if ${CC:T:Micc} == "icc"
#CWARNFLAGS= -w2 # use this if you are terribly bored
CWARNFLAGS=
-.else
+elif !defined(CWARNFLAGS)
CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-- ${_wundef} ${_Wno_pointer_sign} -fformat-extensions
-+ ${_wundef} ${_Wno_pointer_sign}
+- -Wundef -Wno-pointer-sign -fformat-extensions
++ -Wundef -Wno-pointer-sign
+.if ${OPSYS} == "FreeBSD"
+# FreeBSD extensions, not available in upstream GCC
+CWARNFLAGS+= -fformat-extensions
+.endif
- .if !defined(WITH_GCC3)
- _Wno_pointer_sign=-Wno-pointer-sign
.endif
-@@ -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-sse3
+ # The following flags are next up for working on:
+@@ -31,7 +39,11 @@
+ #
+ .if ${MACHINE_CPUARCH} == "i386" && ${CC:T:Micc} != "icc"
+ .if ${CC:T:Mclang} != "clang"
+-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
+.if ${OPSYS} == "FreeBSD"
+# FreeBSD extensions, not available in upstream GCC
-+CFLAGS+= -mno-align-long-strings
++CFLAGS+= -mno-align-long-strings
+.endif
- INLINE_LIMIT?= 8000
++CFLAGS+= -mpreferred-stack-boundary=2
.endif
-
+ CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
+ INLINE_LIMIT?= 8000
Modified: trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff 2011-03-28 12:29:15 UTC (rev 3285)
@@ -6,7 +6,7 @@
DPADD= ${LIBL}
-LDADD= -ll
+LDADD= -ll -ldb
- WARNS?= 6
+ WARNS?= 5
+NO_WERROR?= 1
# Correct path for kernel builds
@@ -15,7 +15,7 @@
DEPENDFILE= .depend_aicasm
.endif
--.if ${CC} == "icc"
+-.if ${CC:T:Micc} == "icc"
-CFLAGS+= -restrict
-NOSTDINC= -X
-.else
Modified: trunk/kfreebsd-9/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/008_config.diff 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/patches/008_config.diff 2011-03-28 12:29:15 UTC (rev 3285)
@@ -35,7 +35,7 @@
#include <assert.h>
#include <ctype.h>
-@@ -607,7 +612,11 @@
+@@ -591,7 +596,11 @@
if ((dirp = opendir(p)) == NULL)
err(EX_OSERR, "opendir %s", p);
while ((dp = readdir(dirp)) != NULL) {
@@ -49,13 +49,11 @@
continue;
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
-@@ -9,11 +9,11 @@
+@@ -9,10 +9,10 @@
kernconf.c: kernconf.tmpl
file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
--WARNS?= 6
-CFLAGS+= -I. -I${.CURDIR}
-+#WARNS?= 6
+CFLAGS+= -I. -I${.CURDIR} -D_GNU_SOURCE
DPADD= ${LIBL} ${LIBSBUF}
Modified: trunk/kfreebsd-9/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/020_linker.diff 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/patches/020_linker.diff 2011-03-28 12:29:15 UTC (rev 3285)
@@ -6,7 +6,7 @@
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
-@@ -85,7 +85,9 @@
+@@ -93,7 +93,9 @@
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@rm -f ${.TARGET}
@echo linking ${.TARGET}
@@ -14,14 +14,14 @@
+ ${SYSTEM_LD} -o ${.TARGET}.tmp
+ gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt
+ ${SYSTEM_LD} "@${.TARGET}.lopt"
- .if defined(CTFMERGE)
- ${SYSTEM_CTFMERGE}
- .endif
+ @${SYSTEM_CTFMERGE}
+ .if !defined(DEBUG)
+ ${OBJCOPY} --strip-debug ${.TARGET}
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -176,7 +176,9 @@
+@@ -199,7 +199,9 @@
- .if ${MACHINE_ARCH} != amd64
+ .if ${__KLD_SHARED} == yes
${FULLPROG}: ${KMOD}.kld
- ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
+ gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
Modified: trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff 2011-03-28 12:29:15 UTC (rev 3285)
@@ -28,7 +28,7 @@
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
compat/linux/linux_emul.c optional compat_linux
-@@ -164,14 +143,6 @@
+@@ -173,14 +152,6 @@
dev/fe/if_fe_isa.c optional fe isa
dev/glxsb/glxsb.c optional glxsb
dev/glxsb/glxsb_hash.c optional glxsb
@@ -43,7 +43,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -202,7 +173,6 @@
+@@ -213,7 +184,6 @@
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
dev/nfe/if_nfe.c optional nfe pci
@@ -64,7 +64,7 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -97,8 +97,6 @@
+@@ -106,8 +106,6 @@
hifn \
hme \
${_hptiop} \
@@ -73,7 +73,7 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -203,7 +201,6 @@
+@@ -225,7 +223,6 @@
ntfs \
ntfs_iconv \
nullfs \
@@ -81,7 +81,7 @@
${_nvram} \
${_nwfs} \
${_nxge} \
-@@ -424,8 +421,6 @@
+@@ -478,8 +475,6 @@
_dpt= dpt
_ex= ex
_hptiop= hptiop
@@ -90,15 +90,15 @@
_ichwd= ichwd
_ida= ida
_iir= iir
-@@ -440,7 +435,6 @@
- _ixgb= ixgb
+@@ -495,7 +490,6 @@
+ _ixgbe= ixgbe
_mly= mly
_nfe= nfe
-_nve= nve
_nvram= nvram
_nxge= nxge
- _wpi= wpi
-@@ -489,8 +483,6 @@
+ _tpm= tpm
+@@ -549,8 +543,6 @@
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
@@ -107,8 +107,8 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -511,7 +503,6 @@
- _mly= mly
+@@ -581,7 +573,6 @@
+ .endif
_ndis= ndis
_nfe= nfe
-_nve= nve
@@ -117,7 +117,7 @@
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -135,8 +135,6 @@
+@@ -136,8 +136,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
@@ -152,10 +152,10 @@
- compile-with "uudecode < $S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \
- no-implicit-rule
-#
- amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
amd64/acpica/acpi_switch.S optional acpi
-@@ -190,14 +170,6 @@
+ acpi_wakecode.o optional acpi \
+@@ -188,14 +168,6 @@
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
@@ -171,8 +171,8 @@
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
@@ -207,7 +179,6 @@
- dev/kbd/kbd.c optional atkbd | sc | ukbd | usb2_input_kbd
- dev/mem/memutil.c optional mem
+ dev/lindev/full.c optional lindev
+ dev/lindev/lindev.c optional lindev
dev/nfe/if_nfe.c optional nfe pci
-dev/nve/if_nve.c optional nve pci
dev/nvram/nvram.c optional nvram isa
Modified: trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff 2011-03-28 12:29:15 UTC (rev 3285)
@@ -23,35 +23,31 @@
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -63,8 +63,14 @@
- options KTRACE # ktrace(1) support
- options STACK # stack(9) support
+@@ -55,6 +55,12 @@
options SYSVSHM # SYSV-style shared memory
-+options SHMMAXPGS=4096
-+options SHMSEG=256
options SYSVMSG # SYSV-style message queues
options SYSVSEM # SYSV-style semaphores
-+options SEMMNI=256
-+options SEMMNS=512
-+options SEMMNU=256
-+options SEMMAP=256
- options P1003_1B_SEMAPHORES # POSIX-style semaphores
++options SHMMAXPGS=4096
++options SHMSEG=256
++options SEMMNI=256
++options SEMMNS=512
++options SEMMNU=256
++options SEMMAP=256
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
+ options KBD_INSTALL_CDEV # install a CDEV entry in /dev
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -64,8 +64,14 @@
- options KTRACE # ktrace(1) support
- options STACK # stack(9) support
+@@ -56,6 +56,12 @@
options SYSVSHM # SYSV-style shared memory
-+options SHMMAXPGS=4096
-+options SHMSEG=256
options SYSVMSG # SYSV-style message queues
options SYSVSEM # SYSV-style semaphores
-+options SEMMNI=256
-+options SEMMNS=512
-+options SEMMNU=256
-+options SEMMAP=256
- options P1003_1B_SEMAPHORES # POSIX-style semaphores
++options SHMMAXPGS=4096
++options SHMSEG=256
++options SEMMNI=256
++options SEMMNS=512
++options SEMMNU=256
++options SEMMAP=256
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
+ options KBD_INSTALL_CDEV # install a CDEV entry in /dev
Modified: trunk/kfreebsd-9/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/913_uudecode.diff 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/patches/913_uudecode.diff 2011-03-28 12:29:15 UTC (rev 3285)
@@ -89,17 +89,17 @@
--- a/sys/modules/wpifw/Makefile
+++ b/sys/modules/wpifw/Makefile
@@ -8,6 +8,6 @@
- CLEANFILES= iwlwifi-3945-2.14.4.fw
+ CLEANFILES= iwlwifi-3945-15.32.2.9.fw
- iwlwifi-3945-2.14.4.fw: ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu
-- uudecode -p ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu > ${.TARGET}
-+ uudecode -o- ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu > ${.TARGET}
+ iwlwifi-3945-15.32.2.9.fw: ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu
+- uudecode -p ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu > ${.TARGET}
++ uudecode -o- ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu > ${.TARGET}
.include <bsd.kmod.mk>
--- a/sys/modules/iwnfw/Makefile.inc
+++ b/sys/modules/iwnfw/Makefile.inc
-@@ -10,4 +10,4 @@
- FIRMWS= ${_FIRM}:${KMOD}
+@@ -15,4 +15,4 @@
+ #FIRMWARE_LICENSE=
${_FIRM}: ${.CURDIR}/../../../contrib/dev/iwn/${_FIRM}.uu
- uudecode -p $? > ${.TARGET}
Modified: trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff 2011-03-28 12:29:15 UTC (rev 3285)
@@ -8,19 +8,19 @@
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
-@@ -111,6 +111,8 @@
+@@ -125,6 +125,8 @@
#
# GCC SSP support.
#
+# Disable stack protector as it causes kernel panic
-+MK_SSP= no
- .if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_ARCH} != "ia64" && \
- ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
- CFLAGS+= -fstack-protector
++MK_SSP= no
+ .if ${MK_SSP} != "no" && ${CC:T:Micc} != "icc" && \
+ ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" && \
+ ${MACHINE_CPUARCH} != "mips"
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -128,6 +128,9 @@
- CFLAGS+= -mlongcall -fno-omit-frame-pointer
+@@ -151,6 +151,9 @@
+ CTFFLAGS+= -g
.endif
+# Disable stack protector as it causes kernel panic
Modified: trunk/kfreebsd-9/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_config.diff 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/patches/999_config.diff 2011-03-28 12:29:15 UTC (rev 3285)
@@ -1,30 +1,22 @@
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -18,11 +18,11 @@
+@@ -18,10 +18,12 @@
#
# $FreeBSD$
-cpu HAMMER
-ident GENERIC
+#cpu HAMMER
-+#dent GENERIC
++#ident GENERIC
- # To statically compile in device wiring instead of /boot/device.hints
--#hints "GENERIC.hints" # Default places to look for devices.
-+hints "GENERIC.hints" # Default places to look for devices.
-
- # Use the following to compile in values accessible to the kernel
- # through getenv() (or kenv(1) in userland). The format of the file
-@@ -30,7 +30,7 @@
- #
- # env "GENERIC.env"
-
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
++hints "GENERIC.hints" # Default places to look for devices.
++
+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -59,7 +59,7 @@
+@@ -49,7 +51,7 @@
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -33,8 +25,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -84,7 +84,7 @@
- options INCLUDE_CONFIG_FILE # Include this file in kernel
+@@ -83,7 +85,7 @@
+ options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
# Make an SMP-capable kernel by default
-options SMP # Symmetric MultiProcessor Kernel
@@ -42,7 +34,7 @@
# CPU frequency control
device cpufreq
-@@ -93,9 +93,6 @@
+@@ -92,9 +94,6 @@
device acpi
device pci
@@ -52,7 +44,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -103,6 +100,8 @@
+@@ -102,6 +101,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -61,7 +53,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -122,7 +121,6 @@
+@@ -122,7 +123,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -69,7 +61,7 @@
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-@@ -185,10 +183,6 @@
+@@ -185,10 +185,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -80,7 +72,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -201,8 +195,6 @@
+@@ -202,8 +198,6 @@
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgbe # Intel PRO/10GbE PCIE Ethernet Family
device le # AMD Am7900 LANCE and Am79C9xx PCnet
@@ -89,7 +81,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -212,12 +204,10 @@
+@@ -213,12 +207,10 @@
device age # Attansic/Atheros L1 Gigabit Ethernet
device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
@@ -102,7 +94,7 @@
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -227,7 +217,6 @@
+@@ -228,7 +220,6 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -110,7 +102,7 @@
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -247,7 +236,6 @@
+@@ -248,7 +239,6 @@
device ex # Intel EtherExpress Pro/10 and Pro/10+
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
@@ -118,7 +110,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -272,11 +260,8 @@
+@@ -273,11 +263,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -130,15 +122,15 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -296,7 +281,6 @@
+@@ -297,7 +284,6 @@
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
-device urio # Diamond Rio 500 MP3 player
# USB Serial devices
+ device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
- device ubsa # Belkin F5U103 and compatible serial adapters
-@@ -315,10 +299,7 @@
+@@ -317,10 +303,7 @@
device rue # RealTek RTL8150 USB Ethernet
device udav # Davicom DM9601E USB
# USB Wireless
@@ -149,7 +141,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -327,3 +308,11 @@
+@@ -329,3 +312,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -163,7 +155,7 @@
+options ALTQ_PRIQ # Priority Queuing (PRIQ)
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -18,13 +18,13 @@
+@@ -18,12 +18,14 @@
#
# $FreeBSD$
@@ -176,22 +168,14 @@
+#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.
-+hints "GENERIC.hints" # Default places to look for devices.
-
- # Use the following to compile in values accessible to the kernel
- # through getenv() (or kenv(1) in userland). The format of the file
-@@ -32,7 +32,7 @@
- #
- # env "GENERIC.env"
-
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
++hints "GENERIC.hints" # Default places to look for devices.
++
+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -52,6 +52,8 @@
+@@ -43,6 +45,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -200,7 +184,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -60,7 +62,7 @@
+@@ -50,7 +54,7 @@
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -209,8 +193,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -84,7 +86,7 @@
- options INCLUDE_CONFIG_FILE # Include this file in kernel
+@@ -83,7 +87,7 @@
+ options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
# To make an SMP kernel, the next two lines are needed
-options SMP # Symmetric MultiProcessor Kernel
@@ -218,7 +202,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -95,9 +97,6 @@
+@@ -94,9 +98,6 @@
device eisa
device pci
@@ -228,7 +212,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -105,6 +104,8 @@
+@@ -104,6 +105,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -237,7 +221,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -125,7 +126,6 @@
+@@ -124,7 +127,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -245,7 +229,7 @@
device aha # Adaptec 154x SCSI adapters
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-@@ -196,10 +196,6 @@
+@@ -195,10 +197,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -256,7 +240,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -212,8 +208,6 @@
+@@ -212,8 +210,6 @@
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgb # Intel PRO/10GbE Ethernet Card
device le # AMD Am7900 LANCE and Am79C9xx PCnet
@@ -265,7 +249,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -223,12 +217,10 @@
+@@ -223,12 +219,10 @@
device age # Attansic/Atheros L1 Gigabit Ethernet
device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
@@ -278,7 +262,7 @@
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -238,7 +230,6 @@
+@@ -238,7 +232,6 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -286,7 +270,7 @@
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -259,7 +250,6 @@
+@@ -260,7 +253,6 @@
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -294,7 +278,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -285,11 +275,8 @@
+@@ -286,11 +278,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -306,7 +290,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -309,7 +296,6 @@
+@@ -310,7 +299,6 @@
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
@@ -314,7 +298,7 @@
# USB Serial devices
device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
-@@ -329,10 +315,7 @@
+@@ -330,10 +318,7 @@
device rue # RealTek RTL8150 USB Ethernet
device udav # Davicom DM9601E USB
# USB Wireless
@@ -325,7 +309,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -341,3 +324,11 @@
+@@ -342,3 +327,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/patches/series 2011-03-28 12:29:15 UTC (rev 3285)
@@ -1,5 +1,5 @@
-000_coda.diff
-000_t_delta_warning.diff
+#000_coda.diff
+#000_t_delta_warning.diff
001_misc.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
@@ -8,10 +8,10 @@
009_disable_duped_modules.diff
013_ip_packed.diff
020_linker.diff
-021_superpages_i386.diff
+#021_superpages_i386.diff
103_stat_pipe.diff
-105_apm_amd64.diff
-106_teken_op.diff
+#105_apm_amd64.diff
+#106_teken_op.diff
107_mount_update.diff
108_teken_utf8_table.diff
109_linprocfs_non_x86.diff
@@ -24,12 +24,12 @@
907_cpu_class.diff
908_linprocfs_is_not_proc.diff
910_GENERIC_hints.diff
-912_binutils.diff
+#912_binutils.diff
913_uudecode.diff
914_psm.diff
915_ip6.v6only.diff
916_NKPT_amd64.diff
-917_track_alignment.diff
+#917_track_alignment.diff
950_no_stack_protector.diff
999_config.diff
-999_firmware.diff
+#999_firmware.diff
Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules 2011-03-01 07:12:37 UTC (rev 3284)
+++ trunk/kfreebsd-9/debian/rules 2011-03-28 12:29:15 UTC (rev 3285)
@@ -16,7 +16,7 @@
config_files := $(wildcard debian/arch/$(cpu)/*.config)
flavours := $(config_files:debian/arch/$(cpu)/%.config=%)
configfile := DEBCUSTOM
-abiname := 1
+abiname := 0
ld_target := $(shell ld --help | sed -ne "s/^ld: supported targets: \([^ ]*\) .*/\1/p")
ifeq ($(cpu), mipsel)
@@ -25,9 +25,10 @@
kfreebsd_cpu := $(cpu)
endif
-SVN := http://svn.freebsd.org/base/release/$(version).0
+#SVN := http://svn.freebsd.org/base/release/$(version).0
#SVN := http://svn.freebsd.org/base/releng/$(version)
#SVN := http://svn.freebsd.org/base/stable/$(major)
+SVN := http://svn.freebsd.org/base/head
SOURCE_PACKAGE := $(CURDIR)/debian/kfreebsd-source-$(version)
IMAGE_PACKAGE := $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
HEADERS_PACKAGE := $(CURDIR)/debian/kfreebsd-headers-$(version)-$(abiname)
More information about the Glibc-bsd-commits
mailing list