[Glibc-bsd-commits] r2478 - trunk/kfreebsd-8/debian/patches
Petr Salinger
ps-guest at alioth.debian.org
Tue Apr 21 12:49:54 UTC 2009
Author: ps-guest
Date: 2009-04-21 12:49:53 +0000 (Tue, 21 Apr 2009)
New Revision: 2478
Modified:
trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-8/debian/patches/999_config.diff
Log:
* update some patches
Modified: trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2009-04-21 08:03:30 UTC (rev 2477)
+++ trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2009-04-21 12:49:53 UTC (rev 2478)
@@ -2,7 +2,7 @@
===================================================================
--- src.orig/sys/conf/files.i386
+++ src/sys/conf/files.i386
-@@ -46,26 +46,5 @@
+@@ -46,27 +46,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -29,7 +29,8 @@
-#
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
-@@ -181,14 +145,6 @@
+ compat/linux/linux_emul.c optional compat_linux
+@@ -165,14 +144,6 @@
dev/fe/if_fe_isa.c optional fe isa
dev/glxsb/glxsb.c optional glxsb
dev/glxsb/glxsb_hash.c optional glxsb
@@ -42,9 +43,9 @@
-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_pentium.c optional hwpmc
- dev/hwpmc/hwpmc_piv.c optional hwpmc
-@@ -215,7 +171,6 @@
+ dev/hwpmc/hwpmc_intel.c optional hwpmc
+ dev/hwpmc/hwpmc_core.c optional hwpmc
+@@ -203,7 +174,6 @@
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
dev/nfe/if_nfe.c optional nfe pci
@@ -56,7 +57,7 @@
===================================================================
--- src.orig/sys/i386/conf/GENERIC
+++ src/sys/i386/conf/GENERIC
-@@ -131,8 +131,6 @@
+@@ -148,8 +148,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
@@ -69,7 +70,7 @@
===================================================================
--- src.orig/sys/modules/Makefile
+++ src/sys/modules/Makefile
-@@ -100,8 +95,6 @@
+@@ -94,8 +94,6 @@
hifn \
hme \
${_hptiop} \
@@ -78,7 +79,8 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -200,11 +193,9 @@
+@@ -194,11 +192,9 @@
+ ntfs \
ntfs_iconv \
nullfs \
- ${_nve} \
@@ -86,19 +88,18 @@
${_nwfs} \
${_nxge} \
- ${_opensolaris} \
- ohci \
${_padlock} \
patm \
${_pccard} \
-@@ -327,7 +317,6 @@
+@@ -288,7 +284,6 @@
${_xe} \
xfs \
xl \
- ${_zfs} \
zlib \
- zyd
-@@ -422,8 +406,5 @@
+ .if ${MACHINE_ARCH} != "powerpc"
+@@ -376,9 +371,6 @@
.if ${MK_NCP} != "no"
_nwfs= nwfs
.endif
@@ -107,8 +108,9 @@
-.endif
_pccard= pccard
_pcfclock= pcfclock
-@@ -447,9 +427,6 @@
- _tmpfs= tmpfs
+ _pst= pst
+@@ -397,9 +389,6 @@
+ _tmpfs= tmpfs
_wi= wi
_xe= xe
-.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
@@ -117,7 +119,7 @@
.if ${MACHINE} == "i386"
_aac= aac
_acpi= acpi
-@@ -467,8 +444,6 @@
+@@ -417,8 +406,6 @@
_dpt= dpt
_ex= ex
_hptiop= hptiop
@@ -126,15 +128,15 @@
_ichwd= ichwd
_ida= ida
_iir= iir
-@@ -481,7 +456,6 @@
- _ixgb= ixgb
+@@ -433,7 +420,6 @@
+ _ixgb= ixgb
_mly= mly
_nfe= nfe
-_nve= nve
_nvram= nvram
_nxge= nxge
_wpi= wpi
-@@ -533,8 +502,6 @@
+@@ -482,8 +468,6 @@
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
@@ -143,7 +145,7 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -554,12 +521,8 @@
+@@ -504,12 +488,8 @@
_mly= mly
_ndis= ndis
_nfe= nfe
@@ -156,7 +158,7 @@
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
.if exists(${.CURDIR}/../crypto/via)
_padlock= padlock
-@@ -573,9 +536,6 @@
+@@ -528,9 +508,6 @@
_wi= wi
_wpi= wpi
_wpifw= wpifw
@@ -170,8 +172,8 @@
===================================================================
--- src.orig/sys/amd64/conf/GENERIC
+++ src/sys/amd64/conf/GENERIC
-@@ -125,8 +125,6 @@
- device arcmsr # Areca SATA II RAID
+@@ -141,8 +141,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
-device hptmv # Highpoint RocketRAID 182x
@@ -209,8 +211,8 @@
-#
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
- amd64/acpica/acpi_wakeup.c optional acpi
-@@ -173,14 +153,6 @@
+ amd64/acpica/acpi_switch.S 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
@@ -223,10 +225,10 @@
-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_piv.c optional hwpmc
- dev/hwpmc/hwpmc_x86.c optional hwpmc
-@@ -191,7 +163,6 @@
- dev/kbd/kbd.c optional atkbd | sc | ukbd
+ dev/hwpmc/hwpmc_intel.c optional hwpmc
+ dev/hwpmc/hwpmc_core.c optional hwpmc
+@@ -205,7 +177,6 @@
+ dev/kbd/kbd.c optional atkbd | sc | ukbd | usb2_input_kbd
dev/mem/memutil.c optional mem
dev/nfe/if_nfe.c optional nfe pci
-dev/nve/if_nve.c optional nve pci
Modified: trunk/kfreebsd-8/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_config.diff 2009-04-21 08:03:30 UTC (rev 2477)
+++ trunk/kfreebsd-8/debian/patches/999_config.diff 2009-04-21 12:49:53 UTC (rev 2478)
@@ -2,9 +2,9 @@
===================================================================
--- src.orig/sys/amd64/conf/GENERIC
+++ src/sys/amd64/conf/GENERIC
-@@ -18,19 +18,19 @@
+@@ -18,11 +18,11 @@
#
- # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.518 2009/01/19 15:33:06 sobomax Exp $
+ # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.523 2009/04/10 00:40:48 jfv Exp $
-cpu HAMMER
-ident GENERIC
@@ -17,7 +17,7 @@
# Use the following to compile in values accessible to the kernel
# through getenv() (or kenv(1) in userland). The format of the file
- # is 'variable=value', see kenv(1)
+@@ -30,7 +30,7 @@
#
# env "GENERIC.env"
@@ -26,7 +26,7 @@
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -45,6 +45,8 @@
+@@ -50,6 +50,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -35,8 +35,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -53,8 +55,8 @@
- options COMPAT_FREEBSD4 # Compatible with FreeBSD4
+@@ -59,7 +61,7 @@
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -45,8 +44,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -74,7 +76,7 @@
- #options KDTRACE_HOOKS # Kernel DTrace hooks
+@@ -89,7 +91,7 @@
+ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
# Make an SMP-capable kernel by default
-options SMP # Symmetric MultiProcessor Kernel
@@ -54,7 +53,7 @@
# CPU frequency control
device cpufreq
-@@ -83,9 +85,6 @@
+@@ -98,9 +100,6 @@
device acpi
device pci
@@ -64,7 +63,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -93,6 +92,8 @@
+@@ -108,6 +107,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -73,7 +72,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -175,10 +176,6 @@
+@@ -190,10 +191,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -84,7 +83,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -252,11 +249,8 @@
+@@ -273,11 +270,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -96,8 +95,8 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -275,13 +267,10 @@
- device ugen # Generic
+@@ -293,12 +287,10 @@
+ #device udbp # USB Double Bulk Pipe devices
device uhid # "Human Interface Devices"
device ukbd # Keyboard
-device ulpt # Printer
@@ -106,11 +105,10 @@
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 Serial devices
- device ucom # Generic com ttys
device uark # Technologies ARK3116 based serial adapters
-@@ -307,3 +296,11 @@
+ device ubsa # Belkin F5U103 and compatible serial adapters
+@@ -324,3 +316,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -126,9 +124,9 @@
===================================================================
--- src.orig/sys/i386/conf/GENERIC
+++ src/sys/i386/conf/GENERIC
-@@ -18,21 +18,21 @@
+@@ -18,13 +18,13 @@
#
- # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.507 2009/01/19 17:20:09 sam Exp $
+ # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.511 2009/03/19 20:33:26 thompsa Exp $
-cpu I486_CPU
-cpu I586_CPU
@@ -145,7 +143,7 @@
# Use the following to compile in values accessible to the kernel
# through getenv() (or kenv(1) in userland). The format of the file
- # is 'variable=value', see kenv(1)
+@@ -32,7 +32,7 @@
#
# env "GENERIC.env"
@@ -154,7 +152,7 @@
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -46,6 +46,8 @@
+@@ -52,6 +52,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -163,8 +161,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -53,8 +55,8 @@
- options COMPAT_FREEBSD4 # Compatible with FreeBSD4
+@@ -60,7 +62,7 @@
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -173,8 +170,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -73,7 +75,7 @@
- #options KDTRACE_HOOKS # Kernel DTrace hooks
+@@ -89,7 +91,7 @@
+ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
# To make an SMP kernel, the next two lines are needed
-options SMP # Symmetric MultiProcessor Kernel
@@ -182,7 +179,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -83,9 +85,6 @@
+@@ -100,9 +102,6 @@
device eisa
device pci
@@ -192,7 +189,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -93,6 +92,8 @@
+@@ -110,6 +109,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -201,7 +198,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -185,10 +186,6 @@
+@@ -201,10 +202,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -212,7 +209,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -265,11 +262,8 @@
+@@ -286,11 +283,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -224,8 +221,8 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -288,15 +280,12 @@
- device ugen # Generic
+@@ -306,13 +300,11 @@
+ #device udbp # USB Double Bulk Pipe devices
device uhid # "Human Interface Devices"
device ukbd # Keyboard
-device ulpt # Printer
@@ -235,12 +232,10 @@
device rum # Ralink Technology RT2501USB wireless NICs
device zyd # ZyDAS zb1211/zb1211b wireless NICs
-device urio # Diamond Rio 500 MP3 player
--device uscanner # Scanners
# USB Serial devices
- device ucom # Generic com ttys
device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
-@@ -321,3 +310,11 @@
+@@ -339,3 +331,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
More information about the Glibc-bsd-commits
mailing list