[Glibc-bsd-commits] r4249 - in trunk/kfreebsd-9/debian: arch/amd64 arch/i386 arch/mipsel patches

[Robert Millan]

Author: rmh
Date: 2012-04-30 22:54:00 +0000 (Mon, 30 Apr 2012)
New Revision: 4249

Modified:
   trunk/kfreebsd-9/debian/arch/amd64/amd64.config
   trunk/kfreebsd-9/debian/arch/i386/486.config
   trunk/kfreebsd-9/debian/arch/i386/686.config
   trunk/kfreebsd-9/debian/arch/i386/xen.config
   trunk/kfreebsd-9/debian/arch/mipsel/malta.config
   trunk/kfreebsd-9/debian/patches/999_firmware.diff
Log:
Oops, disable non-free drivers again.

Modified: trunk/kfreebsd-9/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/amd64/amd64.config	2012-04-29 19:37:25 UTC (rev 4248)
+++ trunk/kfreebsd-9/debian/arch/amd64/amd64.config	2012-04-30 22:54:00 UTC (rev 4249)
@@ -28,3 +28,4 @@
 device		pflog
 
 include         GENERIC
+include		DEBIAN

Modified: trunk/kfreebsd-9/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/i386/486.config	2012-04-29 19:37:25 UTC (rev 4248)
+++ trunk/kfreebsd-9/debian/arch/i386/486.config	2012-04-30 22:54:00 UTC (rev 4249)
@@ -31,3 +31,4 @@
 
 
 include		GENERIC
+include		DEBIAN

Modified: trunk/kfreebsd-9/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/i386/686.config	2012-04-29 19:37:25 UTC (rev 4248)
+++ trunk/kfreebsd-9/debian/arch/i386/686.config	2012-04-30 22:54:00 UTC (rev 4249)
@@ -32,3 +32,4 @@
 
 
 include		GENERIC
+include		DEBIAN

Modified: trunk/kfreebsd-9/debian/arch/i386/xen.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/i386/xen.config	2012-04-29 19:37:25 UTC (rev 4248)
+++ trunk/kfreebsd-9/debian/arch/i386/xen.config	2012-04-30 22:54:00 UTC (rev 4249)
@@ -40,3 +40,4 @@
 device		pf
 device		pfsync
 device		pflog
+include		DEBIAN

Modified: trunk/kfreebsd-9/debian/arch/mipsel/malta.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/mipsel/malta.config	2012-04-29 19:37:25 UTC (rev 4248)
+++ trunk/kfreebsd-9/debian/arch/mipsel/malta.config	2012-04-30 22:54:00 UTC (rev 4249)
@@ -19,3 +19,4 @@
 device		pf
 device		pfsync
 device		pflog
+include		DEBIAN

Modified: trunk/kfreebsd-9/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_firmware.diff	2012-04-29 19:37:25 UTC (rev 4248)
+++ trunk/kfreebsd-9/debian/patches/999_firmware.diff	2012-04-30 22:54:00 UTC (rev 4249)
@@ -166,3 +166,77 @@
  SUBDIR += usfs umass urio
  SUBDIR += quirk template
  
+--- /dev/null
++++ b/sys/conf/DEBIAN
+@@ -0,0 +1,4 @@
++# Common options to all Debian GNU/kFreeBSD kernels
++
++# Disable binary blobs
++include		WITHOUT_SOURCELESS
+--- /dev/null
++++ b/sys/conf/WITHOUT_SOURCELESS
+@@ -0,0 +1,7 @@
++#
++# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code.
++#
++# $FreeBSD$
++
++include WITHOUT_SOURCELESS_HOST
++include WITHOUT_SOURCELESS_UCODE
+--- /dev/null
++++ b/sys/conf/WITHOUT_SOURCELESS_HOST
+@@ -0,0 +1,10 @@
++#
++# WITHOUT_SOURCELESS_HOST -- Disable drivers that include sourceless
++# native code for host CPU.
++#
++# $FreeBSD$
++
++nodevice	hpt27xx
++nodevice	hptmv
++nodevice	hptrr
++nodevice	nve
+--- /dev/null
++++ b/sys/conf/WITHOUT_SOURCELESS_UCODE
+@@ -0,0 +1,41 @@
++#
++# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
++# microcode.
++#
++# $FreeBSD$
++
++nodevice	adw
++nodevice	bce
++nodevice	fatm
++nodevice	fxp
++nodevice	ispfw
++nodevice	mwlfw
++nodevice	ralfw
++nodevice	runfw
++nodevice	sf
++nodevice	sn
++nodevice	ti
++nodevice	txp
++nodevice	ce
++nodevice	cp
++nodevice	ctau
++nodevice	ipwfw
++nodevice	iwifw
++nodevice	iwnfw
++nodevice	wpifw
++
++# drm
++nodevice	mga
++nodevice	r128
++nodevice	radeon
++
++# sound
++nodevice	csa
++nodevice	ds1
++nodevice	maestro3
++
++# usb
++nodevice	rum
++nodevice	uath
++nodevice	zyd
++nodevice	kue