[Glibc-bsd-commits] r2174 - in trunk/kfreebsd-7: . debian debian/patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Tue Jun 10 13:07:15 UTC 2008
Author: ps-guest
Date: 2008-06-10 13:07:14 +0000 (Tue, 10 Jun 2008)
New Revision: 2174
Modified:
trunk/kfreebsd-7/debian/changelog
trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-7/debian/patches/913_uudecode.diff
trunk/kfreebsd-7/debian/patches/999_config.diff
trunk/kfreebsd-7/debian/patches/series
trunk/kfreebsd-7/fetch
Log:
* FreeBSD 7.1 snapshot
Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog 2008-06-09 16:11:21 UTC (rev 2173)
+++ trunk/kfreebsd-7/debian/changelog 2008-06-10 13:07:14 UTC (rev 2174)
@@ -1,3 +1,12 @@
+kfreebsd-7 (7.1~cvs20080610-1) EXPERIMENTAL; urgency=low
+
+ [ Petr Salinger ]
+ * New upstream snapshot of RELENG_7
+ - update of some patches
+ - 030_abi_cld.diff applied upstream
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 10 Jun 2008 11:11:11 +0200
+
kfreebsd-7 (7.0-3) unstable; urgency=low
* Build by gcc-4.3
Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2008-06-09 16:11:21 UTC (rev 2173)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2008-06-10 13:07:14 UTC (rev 2174)
@@ -2,13 +2,14 @@
===================================================================
--- sys/conf/files.orig
+++ sys/conf/files
-@@ -469,17 +469,6 @@
+@@ -472,18 +472,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
+-dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr \
+- compile-with "${NORMAL_C} -I$S/dev/ath"
-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 \
@@ -108,7 +109,7 @@
===================================================================
--- sys/i386/conf/GENERIC.orig
+++ sys/i386/conf/GENERIC
-@@ -128,8 +128,6 @@
+@@ -130,8 +130,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
@@ -133,7 +134,7 @@
aue \
${_auxio} \
${_awi} \
-@@ -95,8 +90,6 @@
+@@ -96,8 +91,6 @@
hifn \
hme \
${_hptiop} \
@@ -142,7 +143,7 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -189,10 +182,8 @@
+@@ -195,10 +188,8 @@
ntfs_iconv \
${_nxge} \
nullfs \
@@ -153,7 +154,7 @@
${_padlock} \
patm \
${_pccard} \
-@@ -313,7 +304,6 @@
+@@ -320,7 +311,6 @@
${_xe} \
xfs \
xl \
@@ -161,7 +162,7 @@
zlib \
zyd
-@@ -363,11 +353,6 @@
+@@ -370,11 +360,6 @@
_apm= apm
_ar= ar
_arcnet= arcnet
@@ -173,7 +174,7 @@
_awi= awi
_bktr= bktr
_cardbus= cardbus
-@@ -406,7 +391,6 @@
+@@ -414,7 +399,6 @@
.if ${MK_NCP} != "no"
_nwfs= nwfs
.endif
@@ -181,7 +182,7 @@
_pccard= pccard
_pcfclock= pcfclock
_pecoff= pecoff
-@@ -427,9 +411,6 @@
+@@ -435,9 +419,6 @@
_tmpfs= tmpfs
_wi= wi
_xe= xe
@@ -191,7 +192,7 @@
.if ${MACHINE} == "i386"
_aac= aac
_acpi= acpi
-@@ -446,8 +427,6 @@
+@@ -455,8 +436,6 @@
_dpt= dpt
_ex= ex
_hptiop= hptiop
@@ -200,7 +201,7 @@
_ichwd= ichwd
_ida= ida
# Disabled due to non-MPSAFEty in 7.0
-@@ -462,7 +441,6 @@
+@@ -471,7 +450,6 @@
_ixgb= ixgb
_mly= mly
_nfe= nfe
@@ -208,7 +209,7 @@
_nvram= nvram
_nxge= nxge
_wpi= wpi
-@@ -489,11 +467,6 @@
+@@ -498,11 +476,6 @@
_agp= agp
_an= an
_arcmsr= arcmsr
@@ -219,8 +220,8 @@
-_ath_rate_sample=ath_rate_sample
_cardbus= cardbus
_cbb= cbb
- _ciss= ciss
-@@ -506,8 +479,6 @@
+ _cmx= cmx
+@@ -516,8 +489,6 @@
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
@@ -229,7 +230,7 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -525,7 +496,6 @@
+@@ -536,7 +507,6 @@
_mly= mly
_ndis= ndis
_nfe= nfe
@@ -237,7 +238,7 @@
_nvram= nvram
_nxge= nxge
_pccard= pccard
-@@ -540,9 +510,6 @@
+@@ -551,9 +521,6 @@
_wi= wi
_wpi= wpi
_wpifw= wpifw
@@ -247,7 +248,7 @@
.endif
.if ${MACHINE_ARCH} == "ia64"
-@@ -583,21 +550,11 @@
+@@ -596,21 +563,11 @@
.if ${MACHINE_ARCH} == "powerpc"
_an= an
@@ -273,7 +274,7 @@
===================================================================
--- sys/amd64/conf/GENERIC.orig
+++ sys/amd64/conf/GENERIC
-@@ -121,8 +121,6 @@
+@@ -123,8 +123,6 @@
device arcmsr # Areca SATA II RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
@@ -324,7 +325,7 @@
#
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
-@@ -175,21 +144,12 @@
+@@ -176,21 +145,12 @@
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
Modified: trunk/kfreebsd-7/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/913_uudecode.diff 2008-06-09 16:11:21 UTC (rev 2173)
+++ trunk/kfreebsd-7/debian/patches/913_uudecode.diff 2008-06-10 13:07:14 UTC (rev 2174)
@@ -1,32 +1,3 @@
-Index: sys/modules/cxgb/Makefile
-===================================================================
---- sys/modules/cxgb/Makefile.orig
-+++ sys/modules/cxgb/Makefile
-@@ -18,21 +18,21 @@
- .if ${MACHINE_ARCH} != "ia64"
- # ld is broken on ia64
- t3fw-4.7.0.bin: ${CXGB}/t3fw-4.7.0.bin.gz.uu
-- uudecode -p < ${CXGB}/t3fw-4.7.0.bin.gz.uu \
-+ uudecode -o- < ${CXGB}/t3fw-4.7.0.bin.gz.uu \
- | gzip -dc > ${.TARGET}
-
- FIRMWS= t3fw-4.7.0.bin:t3fw470
- CLEANFILES+= t3fw-4.7.0.bin
-
- t3b_protocol_sram-1.1.0.bin: ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu
-- uudecode -p < ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu \
-+ uudecode -o- < ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu \
- | gzip -dc > ${.TARGET}
-
- FIRMWS+= t3b_protocol_sram-1.1.0.bin:t3bps110
- CLEANFILES+= t3b_protocol_sram-1.1.0.bin
-
- t3b_tp_eeprom-1.1.0.bin: ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu
-- uudecode -p < ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu \
-+ uudecode -o- < ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu \
- | gzip -dc > ${.TARGET}
-
- FIRMWS+= t3b_tp_eeprom-1.1.0.bin:t3btpe110
Index: sys/modules/ipwfw/ipw_bss/Makefile
===================================================================
--- sys/modules/ipwfw/ipw_bss/Makefile.orig
Modified: trunk/kfreebsd-7/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/999_config.diff 2008-06-09 16:11:21 UTC (rev 2173)
+++ trunk/kfreebsd-7/debian/patches/999_config.diff 2008-06-10 13:07:14 UTC (rev 2174)
@@ -4,7 +4,7 @@
+++ sys/amd64/conf/GENERIC
@@ -18,13 +18,8 @@
#
- # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.1 2007/10/11 06:20:26 kensmith Exp $
+ # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.7 2008/04/10 22:09:21 rwatson Exp $
-cpu HAMMER
-ident GENERIC
@@ -15,9 +15,9 @@
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+hints "GENERIC.hints" # Default places to look for devices.
- options SCHED_4BSD # 4BSD scheduler
+ options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -44,6 +39,8 @@
+@@ -45,6 +40,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -26,16 +26,16 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -52,7 +49,7 @@
+@@ -53,7 +50,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 STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
- options SHMMAXPGS=4096
-@@ -79,9 +76,6 @@
+@@ -81,9 +78,6 @@
device acpi
device pci
@@ -45,7 +45,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -89,6 +83,8 @@
+@@ -91,6 +85,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -54,7 +54,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -171,10 +167,6 @@
+@@ -173,10 +169,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -65,7 +65,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -236,9 +228,6 @@
+@@ -238,9 +230,6 @@
device wlan_scan_ap # 802.11 AP mode scanning
device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
@@ -75,7 +75,7 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-@@ -247,13 +236,8 @@
+@@ -249,13 +238,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -89,7 +89,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -270,12 +254,8 @@
+@@ -272,12 +256,8 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -99,10 +99,10 @@
device ural # Ralink Technology RT2500USB 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
-@@ -291,3 +271,11 @@
+ # USB Serial devices
+ device ucom # Generic com ttys
+ device uark # Technologies ARK3116 based serial adapters
+@@ -304,3 +284,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -120,7 +120,7 @@
+++ sys/i386/conf/GENERIC
@@ -18,15 +18,8 @@
#
- # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.1 2007/10/11 06:20:26 kensmith Exp $
+ # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.7 2008/04/10 22:09:22 rwatson Exp $
-cpu I486_CPU
-cpu I586_CPU
@@ -133,9 +133,9 @@
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+hints "GENERIC.hints" # Default places to look for devices.
- options SCHED_4BSD # 4BSD scheduler
+ options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -45,6 +38,8 @@
+@@ -46,6 +39,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -144,16 +144,16 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -52,7 +47,7 @@
+@@ -53,7 +48,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 STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
- options SHMMAXPGS=4096
-@@ -80,9 +75,6 @@
+@@ -82,9 +77,6 @@
device eisa
device pci
@@ -163,7 +163,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -90,6 +82,8 @@
+@@ -92,6 +84,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -172,7 +172,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -182,10 +176,6 @@
+@@ -184,10 +178,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -183,7 +183,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -249,9 +239,6 @@
+@@ -251,9 +241,6 @@
device wlan_scan_ap # 802.11 AP mode scanning
device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
@@ -193,7 +193,7 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-@@ -261,13 +248,8 @@
+@@ -263,13 +250,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -207,7 +207,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -284,13 +266,9 @@
+@@ -286,13 +268,9 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -218,10 +218,10 @@
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
-@@ -306,3 +284,11 @@
+ # USB Serial devices
+ device ucom # Generic com ttys
+ device uark # Technologies ARK3116 based serial adapters
+@@ -319,3 +297,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series 2008-06-09 16:11:21 UTC (rev 2173)
+++ trunk/kfreebsd-7/debian/patches/series 2008-06-10 13:07:14 UTC (rev 2174)
@@ -9,7 +9,6 @@
013_ip_packed.diff -p0
017_oss_compat.diff -p0
020_linker.diff -p0
-030_abi_cld.diff -p0
902_version.diff -p0
903_disable_non-free_drivers.diff -p0
904_dev_full.diff -p0
Modified: trunk/kfreebsd-7/fetch
===================================================================
--- trunk/kfreebsd-7/fetch 2008-06-09 16:11:21 UTC (rev 2173)
+++ trunk/kfreebsd-7/fetch 2008-06-10 13:07:14 UTC (rev 2174)
@@ -2,7 +2,7 @@
set -ex
ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_7_0_0_RELEASE
+RELENG=RELENG_7
rm -rf src
More information about the Glibc-bsd-commits
mailing list