[Glibc-bsd-commits] r3953 - in trunk/kfreebsd-10/debian: . patches
Robert Millan
rmh at alioth.debian.org
Thu Dec 29 14:48:21 UTC 2011
Author: rmh
Date: 2011-12-29 14:48:21 +0000 (Thu, 29 Dec 2011)
New Revision: 3953
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/001_misc.diff
trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff
trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff
trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
trunk/kfreebsd-10/debian/patches/999_firmware.diff
Log:
New upstream snapshot
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2011-12-19 17:31:50 UTC (rev 3952)
+++ trunk/kfreebsd-10/debian/changelog 2011-12-29 14:48:21 UTC (rev 3953)
@@ -1,9 +1,12 @@
-kfreebsd-10 (10.0~svn228392-2) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn228940-1) experimental; urgency=low
+ * New upstream snapshot.
+
+ [ Robert Millan ]
* Enable SMP in -686 and turn -686-smp into a transitional package.
* Disable udebs for xen flavour on i386 (unbuildable).
- -- Robert Millan <rmh at debian.org> Sun, 18 Dec 2011 17:30:45 +0100
+ -- Robert Millan <rmh at debian.org> Thu, 29 Dec 2011 00:53:20 +0100
kfreebsd-10 (10.0~svn228392-1) experimental; urgency=low
Modified: trunk/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/001_misc.diff 2011-12-19 17:31:50 UTC (rev 3952)
+++ trunk/kfreebsd-10/debian/patches/001_misc.diff 2011-12-29 14:48:21 UTC (rev 3953)
@@ -1,10 +1,10 @@
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
-@@ -1,11 +1,21 @@
+@@ -1,11 +1,20 @@
# $FreeBSD$
+.if ${CC:T:Mclang} != "clang"
-+FREEBSD_GCC!= ${CC} --version | grep FreeBSD || true
++FREEBSD_GCC!= ${CC} --version | grep FreeBSD || true
+.endif
+
#
@@ -12,18 +12,17 @@
#
+.if ${FREEBSD_GCC}
+# FreeBSD extensions, not available in upstream GCC
-+format_extensions= -fformat-extensions
-+no_align_long_strings= -mno-align-long-strings
++format_extensions= -fformat-extensions
++no_align_long_strings= -mno-align-long-strings
+.endif
-+
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 ${format_extensions} \
- -Wmissing-include-dirs -fdiagnostics-show-option
+ -Wmissing-include-dirs -fdiagnostics-show-option \
+ ${CWARNEXTRA}
#
- # The following flags are next up for working on:
-@@ -32,7 +42,7 @@
+@@ -48,7 +57,7 @@
#
.if ${MACHINE_CPUARCH} == "i386"
.if ${CC:T:Mclang} != "clang"
Modified: trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff 2011-12-19 17:31:50 UTC (rev 3952)
+++ trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff 2011-12-29 14:48:21 UTC (rev 3953)
@@ -5,7 +5,7 @@
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
-@@ -41,6 +41,9 @@
+@@ -45,6 +45,9 @@
.if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
COPTFLAGS+= -fno-strict-aliasing
.endif
Modified: trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff 2011-12-19 17:31:50 UTC (rev 3952)
+++ trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff 2011-12-29 14:48:21 UTC (rev 3953)
@@ -1,56 +1,3 @@
---- a/sys/conf/files.i386
-+++ b/sys/conf/files.i386
-@@ -46,27 +46,6 @@
- no-obj no-implicit-rule before-depend \
- clean "ukbdmap.h"
- #
--nvenetlib.o optional nve pci \
-- dependency "$S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu" \
-- compile-with "uudecode $S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
-- no-implicit-rule
--#
--os+%DIKED-nve.h optional nve pci \
-- dependency "$S/contrib/dev/nve/os.h" \
-- compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \
-- no-implicit-rule no-obj before-depend \
-- clean "os+%DIKED-nve.h"
--#
--hptmvraid.o optional hptmv \
-- dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \
-- compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \
-- no-implicit-rule
--#
--hptrr_lib.o optional hptrr \
-- dependency "$S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
-- compile-with "uudecode < $S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
-- no-implicit-rule
--#
- compat/linprocfs/linprocfs.c optional linprocfs
- compat/linsysfs/linsysfs.c optional linsysfs
- compat/linux/linux_emul.c optional compat_linux
-@@ -174,14 +153,6 @@
- dev/glxiic/glxiic.c optional glxiic
- 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
--dev/hptmv/hptproc.c optional hptmv
--dev/hptmv/ioctl.c optional hptmv
--dev/hptrr/hptrr_os_bsd.c optional hptrr
--dev/hptrr/hptrr_osm_bsd.c optional hptrr
--dev/hptrr/hptrr_config.c optional hptrr
- dev/hwpmc/hwpmc_amd.c optional hwpmc
- dev/hwpmc/hwpmc_intel.c optional hwpmc
- dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -214,7 +185,6 @@
- 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/nvram/nvram.c optional nvram isa
- dev/pcf/pcf_isa.c optional pcf
- dev/random/nehemiah.c optional random
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -144,8 +144,6 @@
@@ -64,16 +11,18 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -108,8 +108,6 @@
+@@ -108,10 +108,7 @@
+ hatm \
hifn \
hme \
+- ${_hpt27xx} \
${_hptiop} \
- ${_hptmv} \
- ${_hptrr} \
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -229,7 +227,6 @@
+@@ -230,7 +227,6 @@
ntfs \
ntfs_iconv \
nullfs \
@@ -81,40 +30,6 @@
${_nvram} \
${_nwfs} \
${_nxge} \
-@@ -507,8 +504,6 @@
- _dpt= dpt
- _ex= ex
- _hptiop= hptiop
--_hptmv= hptmv
--_hptrr= hptrr
- _ichwd= ichwd
- _ida= ida
- _iir= iir
-@@ -524,7 +519,6 @@
- _ixgbe= ixgbe
- _mly= mly
- _nfe= nfe
--_nve= nve
- _nvram= nvram
- _nxge= nxge
- _tpm= tpm
-@@ -581,8 +575,6 @@
- _exca= exca
- _ext2fs= ext2fs
- _hptiop= hptiop
--_hptmv= hptmv
--_hptrr= hptrr
- _i2c= i2c
- _ichwd= ichwd
- _ida= ida
-@@ -613,7 +605,6 @@
- .endif
- _ndis= ndis
- _nfe= nfe
--_nve= nve
- _nvram= nvram
- _nxge= nxge
- .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -138,8 +138,6 @@
@@ -128,7 +43,7 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
-@@ -47,26 +47,6 @@
+@@ -47,30 +47,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -143,6 +58,10 @@
- no-implicit-rule no-obj before-depend \
- clean "os+%DIKED-nve.h"
-#
+-hpt27xx_lib.o optional hpt27xx \
+- dependency "$S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \
+- compile-with "uudecode < $S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \
+- no-implicit-rule
-hptmvraid.o optional hptmv \
- dependency "$S/dev/hptmv/amd64-elf.raid.o.uu" \
- compile-with "uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \
@@ -155,10 +74,13 @@
amd64/acpica/acpi_machdep.c optional acpi
amd64/acpica/acpi_switch.S optional acpi
acpi_wakecode.o optional acpi \
-@@ -187,14 +167,6 @@
+@@ -191,17 +167,6 @@
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
+-dev/hpt27xx/os_bsd.c optional hpt27xx
+-dev/hpt27xx/osm_bsd.c optional hpt27xx
+-dev/hpt27xx/hpt27xx_config.c optional hpt27xx
-dev/hptmv/entry.c optional hptmv
-dev/hptmv/mv.c optional hptmv
-dev/hptmv/gui_lib.c optional hptmv
@@ -170,7 +92,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -206,7 +178,6 @@
+@@ -213,7 +178,6 @@
dev/lindev/full.c optional lindev
dev/lindev/lindev.c optional lindev
dev/nfe/if_nfe.c optional nfe pci
@@ -178,3 +100,81 @@
dev/nvram/nvram.c optional nvram isa
dev/qlxgb/qla_dbg.c optional qlxgb pci
dev/qlxgb/qla_hw.c optional qlxgb pci
+--- a/sys/conf/files.i386
++++ b/sys/conf/files.i386
+@@ -46,31 +46,6 @@
+ no-obj no-implicit-rule before-depend \
+ clean "ukbdmap.h"
+ #
+-nvenetlib.o optional nve pci \
+- dependency "$S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu" \
+- compile-with "uudecode $S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
+- no-implicit-rule
+-#
+-os+%DIKED-nve.h optional nve pci \
+- dependency "$S/contrib/dev/nve/os.h" \
+- compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \
+- no-implicit-rule no-obj before-depend \
+- clean "os+%DIKED-nve.h"
+-#
+-hpt27xx_lib.o optional hpt27xx \
+- dependency "$S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu" \
+- compile-with "uudecode < $S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu" \
+- no-implicit-rule
+-hptmvraid.o optional hptmv \
+- dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \
+- compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \
+- no-implicit-rule
+-#
+-hptrr_lib.o optional hptrr \
+- dependency "$S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
+- compile-with "uudecode < $S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
+- no-implicit-rule
+-#
+ compat/linprocfs/linprocfs.c optional linprocfs
+ compat/linsysfs/linsysfs.c optional linsysfs
+ compat/linux/linux_emul.c optional compat_linux
+@@ -146,17 +121,9 @@
+ dev/atkbdc/atkbdc_isa.c optional atkbdc isa
+ dev/atkbdc/atkbdc_subr.c optional atkbdc
+ dev/atkbdc/psm.c optional psm atkbdc
+-dev/ce/ceddk.c optional ce
+-dev/ce/if_ce.c optional ce
+-dev/ce/tau32-ddk.c optional ce
+ dev/cm/if_cm_isa.c optional cm isa
+ dev/coretemp/coretemp.c optional coretemp
+-dev/cp/cpddk.c optional cp
+-dev/cp/if_cp.c optional cp
+ dev/cpuctl/cpuctl.c optional cpuctl
+-dev/ctau/ctau.c optional ctau
+-dev/ctau/ctddk.c optional ctau
+-dev/ctau/if_ct.c optional ctau
+ dev/cx/csigma.c optional cx
+ dev/cx/cxddk.c optional cx
+ dev/cx/if_cx.c optional cx
+@@ -178,17 +145,6 @@
+ dev/glxiic/glxiic.c optional glxiic
+ dev/glxsb/glxsb.c optional glxsb
+ dev/glxsb/glxsb_hash.c optional glxsb
+-dev/hpt27xx/os_bsd.c optional hpt27xx
+-dev/hpt27xx/osm_bsd.c optional hpt27xx
+-dev/hpt27xx/hpt27xx_config.c optional hpt27xx
+-dev/hptmv/entry.c optional hptmv
+-dev/hptmv/mv.c optional hptmv
+-dev/hptmv/gui_lib.c optional hptmv
+-dev/hptmv/hptproc.c optional hptmv
+-dev/hptmv/ioctl.c optional hptmv
+-dev/hptrr/hptrr_os_bsd.c optional hptrr
+-dev/hptrr/hptrr_osm_bsd.c optional hptrr
+-dev/hptrr/hptrr_config.c optional hptrr
+ dev/hwpmc/hwpmc_amd.c optional hwpmc
+ dev/hwpmc/hwpmc_intel.c optional hwpmc
+ dev/hwpmc/hwpmc_core.c optional hwpmc
+@@ -221,7 +177,6 @@
+ 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/nvram/nvram.c optional nvram isa
+ dev/pcf/pcf_isa.c optional pcf
+ dev/random/nehemiah.c optional random
Modified: trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff 2011-12-19 17:31:50 UTC (rev 3952)
+++ trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff 2011-12-29 14:48:21 UTC (rev 3953)
@@ -5,7 +5,7 @@
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
-@@ -97,6 +97,8 @@
+@@ -101,6 +101,8 @@
.endif
WERROR?= -Werror
Modified: trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff 2011-12-19 17:31:50 UTC (rev 3952)
+++ trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff 2011-12-29 14:48:21 UTC (rev 3953)
@@ -8,7 +8,7 @@
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
-@@ -132,6 +132,8 @@
+@@ -148,6 +148,8 @@
#
# GCC SSP support
#
Modified: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2011-12-19 17:31:50 UTC (rev 3952)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2011-12-29 14:48:21 UTC (rev 3953)
@@ -3,7 +3,7 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -362,12 +362,11 @@
+@@ -363,12 +363,11 @@
.endif
.endif
@@ -15,10 +15,10 @@
-.if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
- defined(ALL_MODULES)
+.if 1
- _if_carp= if_carp
+ _carp= carp
.endif
-@@ -375,7 +374,7 @@
+@@ -376,7 +375,7 @@
_ipfilter= ipfilter
.endif
@@ -27,7 +27,7 @@
_ipfw= ipfw
.endif
-@@ -383,11 +382,10 @@
+@@ -384,11 +383,10 @@
_netgraph= netgraph
.endif
@@ -41,7 +41,7 @@
_pfsync= pfsync
.endif
.endif
-@@ -442,7 +440,7 @@
+@@ -443,7 +441,7 @@
_linsysfs= linsysfs
_linux= linux
_mse= mse
@@ -50,7 +50,7 @@
_mlx4= mlx4
_mlx4ib= mlx4ib
_mlxen= mlxen
-@@ -595,7 +593,7 @@
+@@ -604,7 +602,7 @@
_linsysfs= linsysfs
_linux= linux
_mly= mly
@@ -59,17 +59,6 @@
_mlx4= mlx4
_mlx4ib= mlx4ib
_mlxen= mlxen
---- a/sys/modules/if_carp/Makefile
-+++ b/sys/modules/if_carp/Makefile
-@@ -9,7 +9,7 @@
- SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h vnode_if.h
-
- .if !defined(KERNBUILDDIR)
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- @echo "#define INET 1" > ${.TARGET}
- .endif
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -22,7 +22,7 @@
@@ -138,7 +127,7 @@
.if !defined(DEBUG)
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
-@@ -128,7 +128,7 @@
+@@ -132,7 +132,7 @@
NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
@@ -147,3 +136,14 @@
NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.elif ${MAKE_VERSION} >= 5201111300
NORMAL_CTFCONVERT=
+--- a/sys/modules/carp/Makefile
++++ b/sys/modules/carp/Makefile
+@@ -11,7 +11,7 @@
+ SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h
+
+ .if !defined(KERNBUILDDIR)
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ @echo "#define INET 1" > ${.TARGET}
+ .endif
Modified: trunk/kfreebsd-10/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_firmware.diff 2011-12-19 17:31:50 UTC (rev 3952)
+++ trunk/kfreebsd-10/debian/patches/999_firmware.diff 2011-12-29 14:48:21 UTC (rev 3953)
@@ -14,7 +14,7 @@
dev/ae/if_ae.c optional ae pci
dev/age/if_age.c optional age pci
dev/agp/agp.c optional agp pci
-@@ -855,7 +851,6 @@
+@@ -860,7 +856,6 @@
dev/ath/ath_dfs/null/dfs_null.c optional ath \
compile-with "${NORMAL_C} -I$S/dev/ath"
#
@@ -22,7 +22,7 @@
dev/bfe/if_bfe.c optional bfe
dev/bge/if_bge.c optional bge
dev/bktr/bktr_audio.c optional bktr pci
-@@ -893,34 +888,6 @@
+@@ -898,34 +893,6 @@
dev/cs/if_cs.c optional cs
dev/cs/if_cs_isa.c optional cs isa
dev/cs/if_cs_pccard.c optional cs pccard
@@ -57,7 +57,7 @@
dev/cxgbe/t4_main.c optional cxgbe pci \
compile-with "${NORMAL_C} -I$S/dev/cxgbe"
dev/cxgbe/t4_sge.c optional cxgbe pci \
-@@ -939,13 +906,6 @@
+@@ -944,13 +911,6 @@
dev/dcons/dcons_crom.c optional dcons_crom
dev/dcons/dcons_os.c optional dcons
dev/de/if_de.c optional de pci
@@ -71,7 +71,7 @@
dev/digi/digi.c optional digi
dev/digi/digi_isa.c optional digi isa
dev/digi/digi_pci.c optional digi pci
-@@ -981,26 +941,6 @@
+@@ -986,26 +946,6 @@
dev/drm/mach64_drv.c optional mach64drm
dev/drm/mach64_irq.c optional mach64drm
dev/drm/mach64_state.c optional mach64drm
@@ -98,7 +98,7 @@
dev/drm/savage_bci.c optional savagedrm
dev/drm/savage_drv.c optional savagedrm
dev/drm/savage_state.c optional savagedrm
-@@ -1097,8 +1037,6 @@
+@@ -1102,8 +1042,6 @@
dev/firewire/sbp_targ.c optional sbp_targ
dev/flash/at45d.c optional at45d
dev/flash/mx25l.c optional mx25l
@@ -107,7 +107,7 @@
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
dev/gem/if_gem_sbus.c optional gem sbus
-@@ -1155,49 +1093,6 @@
+@@ -1160,49 +1098,6 @@
dev/ips/ips_disk.c optional ips
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
@@ -157,7 +157,7 @@
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
-@@ -1210,163 +1105,6 @@
+@@ -1215,163 +1110,6 @@
dev/isp/isp_pci.c optional isp pci
dev/isp/isp_sbus.c optional isp sbus
dev/isp/isp_target.c optional isp
@@ -321,7 +321,7 @@
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
-@@ -1476,33 +1214,6 @@
+@@ -1481,33 +1219,6 @@
dev/mvs/mvs.c optional mvs
dev/mvs/mvs_if.m optional mvs
dev/mvs/mvs_pci.c optional mvs pci
@@ -355,7 +355,7 @@
dev/mxge/if_mxge.c optional mxge pci
dev/mxge/mxge_lro.c optional mxge pci
dev/mxge/mxge_eth_z8e.c optional mxge pci
-@@ -1593,65 +1304,6 @@
+@@ -1598,65 +1309,6 @@
dev/puc/puc_pci.c optional puc pci
dev/puc/pucdata.c optional puc pci
dev/quicc/quicc_core.c optional quicc
@@ -421,7 +421,7 @@
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
-@@ -1676,14 +1328,7 @@
+@@ -1681,14 +1333,7 @@
dev/scd/scd.c optional scd isa
dev/scd/scd_isa.c optional scd isa
dev/sdhci/sdhci.c optional sdhci pci
@@ -436,7 +436,7 @@
dev/siba/siba_bwn.c optional siba_bwn pci
dev/siba/siba_core.c optional siba_bwn pci
dev/siis/siis.c optional siis pci
-@@ -1694,9 +1339,6 @@
+@@ -1699,9 +1344,6 @@
dev/smbus/smbus.c optional smbus
dev/smbus/smbus_if.m optional smbus
dev/smc/if_smc.c optional smc
@@ -446,7 +446,7 @@
dev/snp/snp.c optional snp
dev/sound/clone.c optional sound
dev/sound/unit.c optional sound
-@@ -1712,10 +1354,6 @@
+@@ -1717,10 +1359,6 @@
dev/sound/pci/atiixp.c optional snd_atiixp pci
dev/sound/pci/cmi.c optional snd_cmi pci
dev/sound/pci/cs4281.c optional snd_cs4281 pci
@@ -457,7 +457,7 @@
dev/sound/pci/emu10k1.c optional snd_emu10k1 pci \
dependency "emu10k1-alsa%diked.h" \
warning "kernel contains GPL contaminated emu10k1 headers"
-@@ -1738,8 +1376,6 @@
+@@ -1743,8 +1381,6 @@
dev/sound/pci/fm801.c optional snd_fm801 pci
dev/sound/pci/ich.c optional snd_ich pci
dev/sound/pci/maestro.c optional snd_maestro pci
@@ -466,7 +466,7 @@
dev/sound/pci/neomagic.c optional snd_neomagic pci
dev/sound/pci/solo.c optional snd_solo pci
dev/sound/pci/spicds.c optional snd_spicds pci
-@@ -1819,7 +1455,6 @@
+@@ -1824,7 +1460,6 @@
dev/syscons/warp/warp_saver.c optional warp_saver
dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux
dev/tdfx/tdfx_pci.c optional tdfx pci
@@ -474,7 +474,7 @@
dev/tl/if_tl.c optional tl pci
dev/trm/trm.c optional trm
dev/twa/tw_cl_init.c optional twa \
-@@ -1842,7 +1477,6 @@
+@@ -1847,7 +1482,6 @@
dev/tws/tws_services.c optional tws
dev/tws/tws_user.c optional tws
dev/tx/if_tx.c optional tx
@@ -482,7 +482,7 @@
dev/uart/uart_bus_acpi.c optional uart acpi
#dev/uart/uart_bus_cbus.c optional uart cbus
dev/uart/uart_bus_ebus.c optional uart ebus
-@@ -1922,19 +1556,17 @@
+@@ -1927,19 +1561,17 @@
dev/usb/net/if_cdce.c optional cdce
dev/usb/net/if_cue.c optional cue
dev/usb/net/if_ipheth.c optional ipheth
@@ -503,7 +503,7 @@
dev/usb/wlan/if_run.c optional run
runfw.c optional runfw \
compile-with "${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw -c${.TARGET}" \
-@@ -1950,11 +1582,9 @@
+@@ -1955,11 +1587,9 @@
compile-with "uudecode -o ${.TARGET} $S/contrib/dev/run/rt2870.fw.uu" \
no-obj no-implicit-rule \
clean "runfw"
@@ -515,26 +515,6 @@
#
# USB serial and parallel port drivers
#
---- a/sys/conf/files.i386
-+++ b/sys/conf/files.i386
-@@ -121,17 +121,9 @@
- dev/atkbdc/atkbdc_isa.c optional atkbdc isa
- dev/atkbdc/atkbdc_subr.c optional atkbdc
- dev/atkbdc/psm.c optional psm atkbdc
--dev/ce/ceddk.c optional ce
--dev/ce/if_ce.c optional ce
--dev/ce/tau32-ddk.c optional ce
- dev/cm/if_cm_isa.c optional cm isa
- dev/coretemp/coretemp.c optional coretemp
--dev/cp/cpddk.c optional cp
--dev/cp/if_cp.c optional cp
- dev/cpuctl/cpuctl.c optional cpuctl
--dev/ctau/ctau.c optional ctau
--dev/ctau/ctddk.c optional ctau
--dev/ctau/if_ct.c optional ctau
- dev/cx/csigma.c optional cx
- dev/cx/cxddk.c optional cx
- dev/cx/if_cx.c optional cx
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
@@ -4,9 +4,6 @@
@@ -557,7 +537,7 @@
bfe \
bge \
${_bxe} \
-@@ -55,7 +54,6 @@
+@@ -56,7 +55,6 @@
cc \
cd9660 \
cd9660_iconv \
@@ -565,7 +545,7 @@
${_ciss} \
${_cm} \
${_cmx} \
-@@ -63,14 +61,11 @@
+@@ -64,14 +62,11 @@
coda5 \
${_coff} \
${_coretemp} \
@@ -580,7 +560,7 @@
cxgbe \
${_cyclic} \
dc \
-@@ -93,13 +88,11 @@
+@@ -94,13 +89,11 @@
${_ex} \
${_exca} \
${_ext2fs} \
@@ -664,7 +644,7 @@
uart \
ubsec \
udf \
-@@ -330,7 +312,6 @@
+@@ -331,7 +313,6 @@
wlan_wep \
wlan_xauth \
${_wpi} \
@@ -672,7 +652,7 @@
${_x86bios} \
${_xe} \
xfs \
-@@ -405,9 +386,7 @@
+@@ -406,9 +387,7 @@
_bxe= bxe
_cardbus= cardbus
_cbb= cbb
@@ -682,7 +662,7 @@
_cpuctl= cpuctl
_cpufreq= cpufreq
_cs= cs
-@@ -506,11 +485,8 @@
+@@ -510,11 +489,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -694,15 +674,15 @@
_ixgb= ixgb
_ixgbe= ixgbe
_mly= mly
-@@ -519,7 +495,6 @@
- _nxge= nxge
+@@ -525,7 +501,6 @@
_tpm= tpm
+ _viawd= viawd
_wpi= wpi
-_wpifw= wpifw
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_padlock= padlock
.endif
-@@ -581,11 +556,8 @@
+@@ -590,11 +565,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -714,7 +694,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_lindev= lindev
-@@ -629,7 +601,6 @@
+@@ -640,7 +612,6 @@
_x86bios= x86bios
_wi= wi
_wpi= wpi
@@ -739,7 +719,7 @@
@@ -27,11 +27,11 @@
SUBDIR = usb
- SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci}
+ SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} ${_avr32dci}
-SUBDIR += rum run uath upgt usie ural zyd ${_urtw}
+SUBDIR += run upgt usie ural ${_urtw}
SUBDIR += atp uhid ukbd ums udbp ufm uep
More information about the Glibc-bsd-commits
mailing list