[Glibc-bsd-commits] r4141 - in trunk/kfreebsd-10/debian: . patches
Robert Millan
rmh at alioth.debian.org
Fri Mar 9 21:57:48 UTC 2012
Author: rmh
Date: 2012-03-09 21:57:47 +0000 (Fri, 09 Mar 2012)
New Revision: 4141
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/control.in
trunk/kfreebsd-10/debian/patches/001_misc.diff
trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff
trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff
trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
* New upstream snapshot.
- Removes most USB drivers from main kernel image (reduces our
sys/*/conf/GENERIC delta).
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2012-03-09 21:32:42 UTC (rev 4140)
+++ trunk/kfreebsd-10/debian/changelog 2012-03-09 21:57:47 UTC (rev 4141)
@@ -1,8 +1,13 @@
-kfreebsd-10 (10.0~svn232158-2) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn232747-1) experimental; urgency=low
+ * New upstream snapshot.
+ - Removes most USB drivers from main kernel image (reduces our
+ sys/*/conf/GENERIC delta).
+
+ [ Robert Millan ]
* Factorize common options into a single file.
- -- Robert Millan <rmh at debian.org> Sun, 26 Feb 2012 13:15:32 +0100
+ -- Robert Millan <rmh at debian.org> Fri, 09 Mar 2012 22:19:14 +0100
kfreebsd-10 (10.0~svn232158-1) experimental; urgency=low
Modified: trunk/kfreebsd-10/debian/control.in
===================================================================
--- trunk/kfreebsd-10/debian/control.in 2012-03-09 21:32:42 UTC (rev 4140)
+++ trunk/kfreebsd-10/debian/control.in 2012-03-09 21:57:47 UTC (rev 4141)
@@ -6,7 +6,7 @@
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
- freebsd-buildutils (>= 9.0-4~),
+ freebsd-buildutils (>= 9.0-9~),
gcc- at gcc_version@, libdb-dev,
libbsd-dev (>= 0.3.0), pkg-config,
libsbuf-dev, libsbuf-dev (>= 8.2-2) | kfreebsd-kernel-headers (<< 0.56),
Modified: trunk/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/001_misc.diff 2012-03-09 21:32:42 UTC (rev 4140)
+++ trunk/kfreebsd-10/debian/patches/001_misc.diff 2012-03-09 21:57:47 UTC (rev 4141)
@@ -28,7 +28,7 @@
@@ -51,7 +60,7 @@
#
.if ${MACHINE_CPUARCH} == "i386"
- .if ${CC:T:Mclang} != "clang"
+ .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse
+CFLAGS+= ${no_align_long_strings} -mpreferred-stack-boundary=2 -mno-sse
.else
Modified: trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff 2012-03-09 21:32:42 UTC (rev 4140)
+++ trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff 2012-03-09 21:57:47 UTC (rev 4141)
@@ -3,7 +3,7 @@
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
-@@ -236,6 +236,8 @@
+@@ -246,6 +246,8 @@
xp->null_vnode = vp;
xp->null_lowervp = lowervp;
vp->v_type = lowervp->v_type;
Modified: trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff 2012-03-09 21:32:42 UTC (rev 4140)
+++ trunk/kfreebsd-10/debian/patches/109_linprocfs_non_x86.diff 2012-03-09 21:57:47 UTC (rev 4141)
@@ -1,6 +1,6 @@
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
-@@ -56,6 +56,9 @@
+@@ -59,6 +59,9 @@
TICK_USE_YAMON_FREQ opt_global.h
TICK_USE_MALTA_RTC opt_global.h
Modified: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2012-03-09 21:32:42 UTC (rev 4140)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff 2012-03-09 21:57:47 UTC (rev 4141)
@@ -14,7 +14,7 @@
.if !defined(DEBUG)
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
-@@ -132,7 +132,7 @@
+@@ -136,7 +136,7 @@
NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff 2012-03-09 21:32:42 UTC (rev 4140)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff 2012-03-09 21:57:47 UTC (rev 4141)
@@ -44,7 +44,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -185,10 +184,6 @@
+@@ -186,10 +185,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -55,7 +55,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -279,11 +274,8 @@
+@@ -280,11 +275,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -67,47 +67,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -298,39 +290,9 @@
- device ehci # EHCI PCI->USB interface (USB 2.0)
- device xhci # XHCI PCI->USB interface (USB 3.0)
- device usb # USB Bus (required)
--#device udbp # USB Double Bulk Pipe devices (needs netgraph)
--device uhid # "Human Interface Devices"
- device ukbd # Keyboard
--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
--device uftdi # For FTDI usb serial adapters
--device uipaq # Some WinCE based devices
--device uplcom # Prolific PL-2303 serial adapters
--device uslcom # SI Labs CP2101/CP2102 serial adapters
--device uvisor # Visor and Palm devices
--device uvscom # USB serial support for DDI pocket's PHS
--# USB Ethernet, requires miibus
--device aue # ADMtek USB Ethernet
--device axe # ASIX Electronics USB Ethernet
--device cdce # Generic USB over Ethernet
--device cue # CATC USB Ethernet
--device kue # Kawasaki LSI USB Ethernet
--device rue # RealTek RTL8150 USB Ethernet
--device udav # Davicom DM9601E USB
--# USB Wireless
--device rum # Ralink Technology RT2501USB wireless NICs
--device run # Ralink Technology RT2700/RT2800/RT3000 NICs.
--device uath # Atheros AR5523 wireless NICs
--device upgt # Conexant/Intersil PrismGT wireless NICs.
--device ural # Ralink Technology RT2500USB wireless NICs
--device urtw # Realtek RTL8187B/L wireless NICs
--device zyd # ZyDAS zd1211/zd1211b wireless NICs
-
- # FireWire support
- device firewire # FireWire bus code
-@@ -341,14 +303,6 @@
+@@ -311,13 +303,6 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -116,7 +76,6 @@
-device snd_es137x # Ensoniq AudioPCI ES137x
-device snd_hda # Intel High Definition Audio
-device snd_ich # Intel, NVidia and other ICH AC'97 Audio
--device snd_uaudio # USB Audio
-device snd_via8233 # VIA VT8233x Audio
-
# MMC/SD
@@ -181,7 +140,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -195,10 +196,6 @@
+@@ -196,10 +197,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -192,7 +151,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -292,11 +289,8 @@
+@@ -293,11 +290,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -204,47 +163,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -311,39 +305,9 @@
- device ehci # EHCI PCI->USB interface (USB 2.0)
- device xhci # XHCI PCI->USB interface (USB 3.0)
- device usb # USB Bus (required)
--#device udbp # USB Double Bulk Pipe devices (needs netgraph)
--device uhid # "Human Interface Devices"
- device ukbd # Keyboard
--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
--device uftdi # For FTDI usb serial adapters
--device uipaq # Some WinCE based devices
--device uplcom # Prolific PL-2303 serial adapters
--device uslcom # SI Labs CP2101/CP2102 serial adapters
--device uvisor # Visor and Palm devices
--device uvscom # USB serial support for DDI pocket's PHS
--# USB Ethernet, requires miibus
--device aue # ADMtek USB Ethernet
--device axe # ASIX Electronics USB Ethernet
--device cdce # Generic USB over Ethernet
--device cue # CATC USB Ethernet
--device kue # Kawasaki LSI USB Ethernet
--device rue # RealTek RTL8150 USB Ethernet
--device udav # Davicom DM9601E USB
--# USB Wireless
--device rum # Ralink Technology RT2501USB wireless NICs
--device run # Ralink Technology RT2700/RT2800/RT3000 NICs.
--device uath # Atheros AR5523 wireless NICs
--device upgt # Conexant/Intersil PrismGT wireless NICs.
--device ural # Ralink Technology RT2500USB wireless NICs
--device urtw # Realtek RTL8187B/L wireless NICs
--device zyd # ZyDAS zd1211/zd1211b wireless NICs
-
- # FireWire support
- device firewire # FireWire bus code
-@@ -354,14 +318,6 @@
+@@ -324,13 +318,6 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -253,7 +172,6 @@
-device snd_es137x # Ensoniq AudioPCI ES137x
-device snd_hda # Intel High Definition Audio
-device snd_ich # Intel, NVidia and other ICH AC'97 Audio
--device snd_uaudio # USB Audio
-device snd_via8233 # VIA VT8233x Audio
-
# MMC/SD
More information about the Glibc-bsd-commits
mailing list