svn commit: r230972 - in head: share/mk sys/amd64/conf sys/i386/conf sys/modules sys/modules/drm sys/modules/sound/driver sys/modules/usb tools/build/options

[Robert Millan]

El 11 de febrer de 2012 13:57, Robert Millan <rmh at freebsd.org> ha escrit:
> Another possibility (perhaps a better one) would be to move those
> files off sys/${MACHINE}/conf directories, then they won't be picked
> up by "universe".  Since they're not ${MACHINE}-specific, would
> sys/conf/ be a good location?
>
> Patch is attached.

Sorry, I noticed that "svn diff" didn't include moved files in the
patch.  Here's the complete diff.
-------------- next part --------------
diff -Nur -x .svn sys.old/amd64/conf/WITHOUT_SOURCELESS sys/amd64/conf/WITHOUT_SOURCELESS
--- sys.old/amd64/conf/WITHOUT_SOURCELESS	2012-02-11 15:31:49.297091556 +0100
+++ sys/amd64/conf/WITHOUT_SOURCELESS	1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-#
-# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code.
-#
-# $FreeBSD$
-
-include WITHOUT_SOURCELESS_HOST
-include WITHOUT_SOURCELESS_UCODE
diff -Nur -x .svn sys.old/amd64/conf/WITHOUT_SOURCELESS_HOST sys/amd64/conf/WITHOUT_SOURCELESS_HOST
--- sys.old/amd64/conf/WITHOUT_SOURCELESS_HOST	2012-02-11 15:31:49.294093347 +0100
+++ sys/amd64/conf/WITHOUT_SOURCELESS_HOST	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#
-# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
-# native code for host CPU.
-#
-# $FreeBSD$
-
-nodevice	hpt27xx
-nodevice	hptmv
-nodevice	hptrr
-nodevice	nve
diff -Nur -x .svn sys.old/amd64/conf/WITHOUT_SOURCELESS_UCODE sys/amd64/conf/WITHOUT_SOURCELESS_UCODE
--- sys.old/amd64/conf/WITHOUT_SOURCELESS_UCODE	2012-02-11 15:31:49.296093643 +0100
+++ sys/amd64/conf/WITHOUT_SOURCELESS_UCODE	1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-#
-# 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
diff -Nur -x .svn sys.old/conf/WITHOUT_SOURCELESS sys/conf/WITHOUT_SOURCELESS
--- sys.old/conf/WITHOUT_SOURCELESS	1970-01-01 01:00:00.000000000 +0100
+++ sys/conf/WITHOUT_SOURCELESS	2012-02-11 14:53:12.778164000 +0100
@@ -0,0 +1,7 @@
+#
+# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code.
+#
+# $FreeBSD$
+
+include WITHOUT_SOURCELESS_HOST
+include WITHOUT_SOURCELESS_UCODE
diff -Nur -x .svn sys.old/conf/WITHOUT_SOURCELESS_HOST sys/conf/WITHOUT_SOURCELESS_HOST
--- sys.old/conf/WITHOUT_SOURCELESS_HOST	1970-01-01 01:00:00.000000000 +0100
+++ sys/conf/WITHOUT_SOURCELESS_HOST	2012-02-11 14:53:12.782163000 +0100
@@ -0,0 +1,10 @@
+#
+# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
+# native code for host CPU.
+#
+# $FreeBSD$
+
+nodevice	hpt27xx
+nodevice	hptmv
+nodevice	hptrr
+nodevice	nve
diff -Nur -x .svn sys.old/conf/WITHOUT_SOURCELESS_UCODE sys/conf/WITHOUT_SOURCELESS_UCODE
--- sys.old/conf/WITHOUT_SOURCELESS_UCODE	1970-01-01 01:00:00.000000000 +0100
+++ sys/conf/WITHOUT_SOURCELESS_UCODE	2012-02-11 14:53:12.807164000 +0100
@@ -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
diff -Nur -x .svn sys.old/i386/conf/WITHOUT_SOURCELESS sys/i386/conf/WITHOUT_SOURCELESS
--- sys.old/i386/conf/WITHOUT_SOURCELESS	2012-02-11 15:31:49.302090900 +0100
+++ sys/i386/conf/WITHOUT_SOURCELESS	1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-#
-# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code.
-#
-# $FreeBSD$
-
-include WITHOUT_SOURCELESS_HOST
-include WITHOUT_SOURCELESS_UCODE
diff -Nur -x .svn sys.old/i386/conf/WITHOUT_SOURCELESS_HOST sys/i386/conf/WITHOUT_SOURCELESS_HOST
--- sys.old/i386/conf/WITHOUT_SOURCELESS_HOST	2012-02-11 15:31:49.300091162 +0100
+++ sys/i386/conf/WITHOUT_SOURCELESS_HOST	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#
-# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
-# native code for host CPU.
-#
-# $FreeBSD$
-
-nodevice	hpt27xx
-nodevice	hptmv
-nodevice	hptrr
-nodevice	nve
diff -Nur -x .svn sys.old/i386/conf/WITHOUT_SOURCELESS_UCODE sys/i386/conf/WITHOUT_SOURCELESS_UCODE
--- sys.old/i386/conf/WITHOUT_SOURCELESS_UCODE	2012-02-11 15:31:49.301091031 +0100
+++ sys/i386/conf/WITHOUT_SOURCELESS_UCODE	1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-#
-# 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