Module Name: src
Committed By: pooka
Date: Wed Nov 19 01:08:42 UTC 2014
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/sys/rump/dev: Makefile.rumpdevcomp
Log Message:
On second thought, let's not build the rump kernel component for ac97
by default. The component is not used on a NetBSD target anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.724 -r1.725 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1922 -r1.1923 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.270 -r1.271 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/dev/Makefile.rumpdevcomp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.724 src/distrib/sets/lists/base/shl.mi:1.725
--- src/distrib/sets/lists/base/shl.mi:1.724 Tue Nov 18 09:12:30 2014
+++ src/distrib/sets/lists/base/shl.mi Wed Nov 19 01:08:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.724 2014/11/18 09:12:30 pooka Exp $
+# $NetBSD: shl.mi,v 1.725 2014/11/19 01:08:42 pooka Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -485,9 +485,9 @@
./usr/lib/librumpdev_audio.so base-rump-shlib rump
./usr/lib/librumpdev_audio.so.0 base-rump-shlib rump
./usr/lib/librumpdev_audio.so.0.0 base-rump-shlib rump
-./usr/lib/librumpdev_audio_ac97.so base-rump-shlib rump
-./usr/lib/librumpdev_audio_ac97.so.0 base-rump-shlib rump
-./usr/lib/librumpdev_audio_ac97.so.0.0 base-rump-shlib rump
+./usr/lib/librumpdev_audio_ac97.so base-obsolete obsolete
+./usr/lib/librumpdev_audio_ac97.so.0 base-obsolete obsolete
+./usr/lib/librumpdev_audio_ac97.so.0.0 base-obsolete obsolete
./usr/lib/librumpdev_bpf.so base-rump-shlib rump
./usr/lib/librumpdev_bpf.so.0 base-rump-shlib rump
./usr/lib/librumpdev_bpf.so.0.0 base-rump-shlib rump
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1922 src/distrib/sets/lists/comp/mi:1.1923
--- src/distrib/sets/lists/comp/mi:1.1922 Tue Nov 18 09:12:30 2014
+++ src/distrib/sets/lists/comp/mi Wed Nov 19 01:08:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1922 2014/11/18 09:12:30 pooka Exp $
+# $NetBSD: mi,v 1.1923 2014/11/19 01:08:42 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3748,8 +3748,8 @@
./usr/lib/librumpdev.a comp-c-lib rump
./usr/lib/librumpdev_audio.a comp-c-lib rump
./usr/lib/librumpdev_audio_p.a comp-c-proflib profile,rump
-./usr/lib/librumpdev_audio_ac97.a comp-c-lib rump
-./usr/lib/librumpdev_audio_ac97_p.a comp-c-proflib profile,rump
+./usr/lib/librumpdev_audio_ac97.a comp-obsolete obsolete
+./usr/lib/librumpdev_audio_ac97_p.a comp-obsolete obsolete
./usr/lib/librumpdev_bpf.a comp-c-lib rump
./usr/lib/librumpdev_bpf_p.a comp-c-proflib profile,rump
./usr/lib/librumpdev_cgd.a comp-c-lib rump
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.270 src/distrib/sets/lists/comp/shl.mi:1.271
--- src/distrib/sets/lists/comp/shl.mi:1.270 Tue Nov 18 09:12:30 2014
+++ src/distrib/sets/lists/comp/shl.mi Wed Nov 19 01:08:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.270 2014/11/18 09:12:30 pooka Exp $
+# $NetBSD: shl.mi,v 1.271 2014/11/19 01:08:42 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -150,7 +150,7 @@
./usr/lib/librumpclient_pic.a comp-c-piclib rump,picinstall
./usr/lib/librumpcrypto_pic.a comp-obsolete obsolete
./usr/lib/librumpdev_audio_pic.a comp-c-piclib rump,picinstall
-./usr/lib/librumpdev_audio_ac97_pic.a comp-c-piclib rump,picinstall
+./usr/lib/librumpdev_audio_ac97_pic.a comp-obsolete obsolete
./usr/lib/librumpdev_bpf_pic.a comp-c-piclib rump,picinstall
./usr/lib/librumpdev_cgd_pic.a comp-c-piclib rump,picinstall
./usr/lib/librumpdev_disk_pic.a comp-c-piclib rump,picinstall
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.92 src/distrib/sets/lists/debug/mi:1.93
--- src/distrib/sets/lists/debug/mi:1.92 Tue Nov 18 09:12:30 2014
+++ src/distrib/sets/lists/debug/mi Wed Nov 19 01:08:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.92 2014/11/18 09:12:30 pooka Exp $
+# $NetBSD: mi,v 1.93 2014/11/19 01:08:42 pooka Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib
@@ -138,7 +138,7 @@
./usr/lib/librumpclient_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpcrypto_g.a comp-obsolete obsolete
./usr/lib/librumpdev_audio_g.a comp-c-debuglib debuglib,rump
-./usr/lib/librumpdev_audio_ac97_g.a comp-c-debuglib debuglib,rump
+./usr/lib/librumpdev_audio_ac97_g.a comp-obsolete obsolete
./usr/lib/librumpdev_bpf_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpdev_cgd_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpdev_disk_g.a comp-c-debuglib debuglib,rump
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.84 src/distrib/sets/lists/debug/shl.mi:1.85
--- src/distrib/sets/lists/debug/shl.mi:1.84 Tue Nov 18 09:12:30 2014
+++ src/distrib/sets/lists/debug/shl.mi Wed Nov 19 01:08:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.84 2014/11/18 09:12:30 pooka Exp $
+# $NetBSD: shl.mi,v 1.85 2014/11/19 01:08:42 pooka Exp $
./usr/libdata/debug/lib/libc.so.12.196.debug comp-sys-debug debug
./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/lib/libcrypto.so.8.3.debug comp-sys-debug debug
@@ -167,7 +167,7 @@
./usr/libdata/debug/usr/lib/librumpclient.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpdev.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpdev_audio.so.0.0.debug comp-rump-debug debug,rump
-./usr/libdata/debug/usr/lib/librumpdev_audio_ac97.so.0.0.debug comp-rump-debug debug,rump
+./usr/libdata/debug/usr/lib/librumpdev_audio_ac97.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/librumpdev_bpf.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpdev_cgd.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpdev_disk.so.0.0.debug comp-rump-debug debug,rump
Index: src/sys/rump/dev/Makefile.rumpdevcomp
diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.18 src/sys/rump/dev/Makefile.rumpdevcomp:1.19
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.18 Wed Nov 19 00:18:58 2014
+++ src/sys/rump/dev/Makefile.rumpdevcomp Wed Nov 19 01:08:42 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.18 2014/11/19 00:18:58 pooka Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.19 2014/11/19 01:08:42 pooka Exp $
#
-RUMPDEVCOMP= audio audio_ac97 bpf cgd disk dm drvctl fss md netsmb \
+RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb \
pad pud putter raidframe rnd scsipi sysmon vnd wscons \
opencrypto
@@ -9,7 +9,7 @@ RUMPUSBDEVS= ubt ucom ugenhc ulpt umass
RUMPPCIDEVS= pci pci_if_iwn pci_if_pcn pci_if_wm
RUMPPCIDEVS+= pci_virtio virtio_if_vioif virtio_ld virtio_viornd
-RUMPPCIDEVS+= pci_eap pci_hdaudio hdaudio_hdafg
+RUMPPCIDEVS+= audio_ac97 pci_eap pci_hdaudio hdaudio_hdafg
# Not really a PCI device, but ....
RUMPPCIDEVS+= miiphy
