[Glibc-bsd-commits] r4130 - in trunk/kfreebsd-10/debian: . arch/amd64 arch/i386 arch/mipsel patches
Robert Millan
rmh at alioth.debian.org
Sun Feb 26 12:15:40 UTC 2012
Author: rmh
Date: 2012-02-26 12:15:40 +0000 (Sun, 26 Feb 2012)
New Revision: 4130
Modified:
trunk/kfreebsd-10/debian/arch/amd64/amd64.config
trunk/kfreebsd-10/debian/arch/i386/486.config
trunk/kfreebsd-10/debian/arch/i386/686.config
trunk/kfreebsd-10/debian/arch/i386/xen.config
trunk/kfreebsd-10/debian/arch/mipsel/malta.config
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
Factorize common options into a single file.
Modified: trunk/kfreebsd-10/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/amd64/amd64.config 2012-02-26 11:48:31 UTC (rev 4129)
+++ trunk/kfreebsd-10/debian/arch/amd64/amd64.config 2012-02-26 12:15:40 UTC (rev 4130)
@@ -7,11 +7,6 @@
options ALTQ_NOPCC # Required for SMP build
options COMPAT_LINUX32
-options LINPROCFS
-options LINSYSFS
-options FDESCFS
-options TMPFS
-options QUOTA
# UTF-8 console support
options VESA
@@ -21,13 +16,7 @@
# Needed for D-I, see #596577
options NKPT=240
-# Network options
-device carp
-device pf
-device pfsync
-device pflog
-
include GENERIC
-# Disable binary blobs
-include ../../conf/WITHOUT_SOURCELESS
+# Options used by all Debian kernels
+include DEBIAN
Modified: trunk/kfreebsd-10/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/486.config 2012-02-26 11:48:31 UTC (rev 4129)
+++ trunk/kfreebsd-10/debian/arch/i386/486.config 2012-02-26 12:15:40 UTC (rev 4130)
@@ -7,30 +7,18 @@
ident Debian-i486
options COMPAT_LINUX
-options LINPROCFS
-options LINSYSFS
-options FDESCFS
-options TMPFS
-options QUOTA
# UTF-8 console support
options VESA
options SC_PIXEL_MODE # add support for the raster text mode
options TEKEN_UTF8 # UTF-8 output handling
-# Network options
-device carp
-device pf
-device pfsync
-device pflog
-
# Xbox support
options XBOX
device xboxfb
device fb
-
include GENERIC
-# Disable binary blobs
-include ../../conf/WITHOUT_SOURCELESS
+# Options used by all Debian kernels
+include DEBIAN
Modified: trunk/kfreebsd-10/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/686.config 2012-02-26 11:48:31 UTC (rev 4129)
+++ trunk/kfreebsd-10/debian/arch/i386/686.config 2012-02-26 12:15:40 UTC (rev 4130)
@@ -8,30 +8,18 @@
options ALTQ_NOPCC # Required for SMP build
options COMPAT_LINUX
-options LINPROCFS
-options LINSYSFS
-options FDESCFS
-options TMPFS
-options QUOTA
# UTF-8 console support
options VESA
options SC_PIXEL_MODE # add support for the raster text mode
options TEKEN_UTF8 # UTF-8 output handling
-# Network options
-device carp
-device pf
-device pfsync
-device pflog
-
# Xbox support
options XBOX
device xboxfb
device fb
-
include GENERIC
-# Disable binary blobs
-include ../../conf/WITHOUT_SOURCELESS
+# Options used by all Debian kernels
+include DEBIAN
Modified: trunk/kfreebsd-10/debian/arch/i386/xen.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/xen.config 2012-02-26 11:48:31 UTC (rev 4129)
+++ trunk/kfreebsd-10/debian/arch/i386/xen.config 2012-02-26 12:15:40 UTC (rev 4130)
@@ -22,11 +22,6 @@
# kFreeBSD needs
options COMPAT_LINUX
-options LINPROCFS
-options LINSYSFS
-options FDESCFS
-options TMPFS
-options QUOTA
# raise shared memory limits
options SHMMAXPGS=4096
@@ -35,11 +30,5 @@
options SEMMNS=512
options SEMMNU=256
-# Network options
-device carp
-device pf
-device pfsync
-device pflog
-
-# Disable binary blobs
-include ../../conf/WITHOUT_SOURCELESS
+# Options used by all Debian kernels
+include DEBIAN
Modified: trunk/kfreebsd-10/debian/arch/mipsel/malta.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/mipsel/malta.config 2012-02-26 11:48:31 UTC (rev 4129)
+++ trunk/kfreebsd-10/debian/arch/mipsel/malta.config 2012-02-26 12:15:40 UTC (rev 4130)
@@ -5,17 +5,7 @@
makeoptions ARCH_FLAGS="-march=mips32 -mabi=32 -D__mips_o32"
options CPU_HAVEFPU
-
-options KTRACE
options EXT2FS
-options LINPROCFS
-options LINSYSFS
-options FDESCFS
-options TMPFS
-options QUOTA
-# Network options
-device carp
-device pf
-device pfsync
-device pflog
+# Options used by all Debian kernels
+include DEBIAN
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2012-02-26 11:48:31 UTC (rev 4129)
+++ trunk/kfreebsd-10/debian/changelog 2012-02-26 12:15:40 UTC (rev 4130)
@@ -1,3 +1,9 @@
+kfreebsd-10 (10.0~svn232158-2) UNRELEASED; urgency=low
+
+ * Factorize common options into a single file.
+
+ -- Robert Millan <rmh at debian.org> Sun, 26 Feb 2012 13:15:32 +0100
+
kfreebsd-10 (10.0~svn232158-1) experimental; urgency=low
* New upstream snapshot.
Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff 2012-02-26 11:48:31 UTC (rev 4129)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff 2012-02-26 12:15:40 UTC (rev 4130)
@@ -277,3 +277,22 @@
+options ALTQ_RIO # RED In/Out
+options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC)
+options ALTQ_PRIQ # Priority Queuing (PRIQ)
+--- /dev/null
++++ b/sys/conf/DEBIAN
+@@ -0,0 +1,16 @@
++# Common options to all Debian GNU/kFreeBSD kernels
++
++options LINPROCFS
++options LINSYSFS
++options FDESCFS
++options TMPFS
++options QUOTA
++
++# Network options
++device carp
++device pf
++device pfsync
++device pflog
++
++# Disable binary blobs
++include WITHOUT_SOURCELESS
More information about the Glibc-bsd-commits
mailing list