[PC-BSD Commits] r2744 - pcbsd/trunk/system-overlay/PCBSD/conf

svn at pcbsd.org svn at pcbsd.org
Wed Sep 10 12:03:31 PDT 2008


Author: kris
Date: 2008-09-10 12:03:31 -0700 (Wed, 10 Sep 2008)
New Revision: 2744

Modified:
   pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64
Log:

Update the kernel config for PCBSD amd64 build



Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64	2008-09-10 18:42:43 UTC (rev 2743)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSD.amd64	2008-09-10 19:03:31 UTC (rev 2744)
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.11 2008/08/11 20:31:14 jfv Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.14 2008/08/29 18:54:35 jhb Exp $
 
 cpu		HAMMER
 ident		PCBSD
@@ -24,38 +24,34 @@
 # To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		# Default places to look for devices.
 
+#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options 	SCTP			# Stream Control Transmission Protocol
+options 	SCTP			# Stream Control Transmission Protocol 
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	UFS_ACL			# Support for access control lists
 options 	UFS_DIRHASH		# Improve performance on big directories
 options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
-options 	GEOM_JOURNAL		# Journaling via GEOM
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
+options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
-options		NTFS
+options 	NTFS			# NT File System
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
-options		LIBICONV
-options		LIBMCHAIN
-options		CD9660_ICONV
-options		MSDOSFS_ICONV
-options		NTFS_ICONV
-options		UDF
-options		UDF_ICONV
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
+options 	GEOM_JOURNAL		# Provides GJournal support
+options         GEOM_UZIP 		# UZIP Support
 options 	COMPAT_43TTY		# BSD 4.3 TTY compat [KEEP THIS!]
 options 	COMPAT_IA32		# Compatible with i386 binaries
-options		GEOM_UZIP		# Read-only compressed disks
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
@@ -70,7 +66,18 @@
 options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
 options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
 options 	AUDIT			# Security event auditing
+#options 	KDTRACE_FRAME		# Ensure frames are compiled in
+#options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 
+options		NTFS
+options		LIBICONV
+options		LIBMCHAIN
+options		CD9660_ICONV
+options		MSDOSFS_ICONV
+options		NTFS_ICONV
+options		UDF
+options		UDF_ICONV
+
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
 
@@ -92,7 +99,7 @@
 device		atapifd		# ATAPI floppy drives
 device		atapist		# ATAPI tape drives
 #options 	ATA_STATIC_ID	# Static device numbering
-device		atapicam	# Atapi CAM Support
+device		atapicam	# ATAPI Cam Support
 
 # SCSI Controllers
 device		ahc		# AHA2940 and onboard AIC7xxx devices
@@ -115,6 +122,7 @@
 device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
 device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
 
+
 # SCSI peripherals
 device		scbus		# SCSI bus (required for SCSI)
 device		ch		# SCSI media changers
@@ -142,6 +150,8 @@
 device		ida		# Compaq Smart RAID
 device		mfi		# LSI MegaRAID SAS
 device		mlx		# Mylex DAC960 family
+#XXX pointer/int warnings
+#device		pst		# Promise Supertrak SX6000
 device		twe		# 3ware ATA RAID
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
@@ -195,6 +205,7 @@
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
+device		ae		# Attansic/Atheros L2 FastEthernet
 device		age		# Attansic/Atheros L1 Gigabit Ethernet
 device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet
@@ -248,7 +259,7 @@
 device		awi		# BayStack 660 and others
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-#device		wl		# Older non 802.11 Wavelan wireless NIC.
+device		wl		# Older non 802.11 wavelan cards
 device		iwi		# Intel Wireless Adapters
 device		ipw		# Intel Wireless Adapters
 device		wpi		# Intel WPI adapters
@@ -266,6 +277,7 @@
 device		md		# Memory "disks"
 device		gif		# IPv6 and IPv4 tunneling
 device		faith		# IPv6-to-IPv4 relaying (translation)
+device		firmware	# firmware assist module
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
@@ -314,15 +326,14 @@
 device		dcons		# Dumb console driver
 device		dcons_crom	# Configuration ROM for dcons
 
-
 # Enable IPFIREWALL / IPDIVERT for natd to work properly
-options 	IPFIREWALL
-options 	IPFIREWALL_DEFAULT_TO_ACCEPT
+options		IPFIREWALL
+options		IPFIREWALL_DEFAULT_TO_ACCEPT
 options		IPDIVERT
 
-device 		pf
-device 		pflog
-device 		pfsync
+device		pf
+device		pflog
+device		pfsync
 
 options		ALTQ
 options		ALTQ_CBQ



More information about the Commits mailing list