Wed Dec 31 21:22:02 2008 UTC ()
Might as well install the dm devmapper module when we install the
other parts of the LVM tools - use the same MKLVM switch, though.


(agc)
diff -r1.2 -r1.3 src/distrib/sets/lists/base/module.mi
diff -r1.22 -r1.23 src/sys/modules/Makefile
cvs diff -r1.2 -r1.3 src/distrib/sets/lists/base/module.mi (expand / switch to unified diff)

--- src/distrib/sets/lists/base/module.mi 2008/12/05 13:05:37 1.2
+++ src/distrib/sets/lists/base/module.mi 2008/12/31 21:22:02 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: module.mi,v 1.2 2008/12/05 13:05:37 ad Exp $ 1# $NetBSD: module.mi,v 1.3 2008/12/31 21:22:02 agc Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./stand/@MACHINE@ base-kernel-modules 5./stand/@MACHINE@ base-kernel-modules
6./stand/@MACHINE@/@OSRELEASE@ base-kernel-modules 6./stand/@MACHINE@/@OSRELEASE@ base-kernel-modules
7./@MODULEDIR@ base-kernel-modules 7./@MODULEDIR@ base-kernel-modules
8./@MODULEDIR@/accf_dataready base-kernel-modules 8./@MODULEDIR@/accf_dataready base-kernel-modules
9./@MODULEDIR@/accf_dataready/accf_dataready.kmod base-kernel-modules 9./@MODULEDIR@/accf_dataready/accf_dataready.kmod base-kernel-modules
10./@MODULEDIR@/accf_httpready base-kernel-modules 10./@MODULEDIR@/accf_httpready base-kernel-modules
11./@MODULEDIR@/accf_httpready/accf_httpready.kmod base-kernel-modules 11./@MODULEDIR@/accf_httpready/accf_httpready.kmod base-kernel-modules
12./@MODULEDIR@/adosfs base-kernel-modules 12./@MODULEDIR@/adosfs base-kernel-modules
13./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules 13./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules
14./@MODULEDIR@/aio base-kernel-modules 14./@MODULEDIR@/aio base-kernel-modules
@@ -17,26 +17,28 @@ @@ -17,26 +17,28 @@
17./@MODULEDIR@/cd9660/cd9660.kmod base-kernel-modules 17./@MODULEDIR@/cd9660/cd9660.kmod base-kernel-modules
18./@MODULEDIR@/coda base-kernel-modules 18./@MODULEDIR@/coda base-kernel-modules
19./@MODULEDIR@/coda/coda.kmod base-kernel-modules 19./@MODULEDIR@/coda/coda.kmod base-kernel-modules
20./@MODULEDIR@/coda5 base-kernel-modules 20./@MODULEDIR@/coda5 base-kernel-modules
21./@MODULEDIR@/coda5/coda5.kmod base-kernel-modules 21./@MODULEDIR@/coda5/coda5.kmod base-kernel-modules
22./@MODULEDIR@/compat base-kernel-modules 22./@MODULEDIR@/compat base-kernel-modules
23./@MODULEDIR@/compat/compat.kmod base-kernel-modules 23./@MODULEDIR@/compat/compat.kmod base-kernel-modules
24./@MODULEDIR@/compat_ossaudio base-kernel-modules 24./@MODULEDIR@/compat_ossaudio base-kernel-modules
25./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod base-kernel-modules 25./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod base-kernel-modules
26./@MODULEDIR@/coredump base-kernel-modules 26./@MODULEDIR@/coredump base-kernel-modules
27./@MODULEDIR@/coredump/coredump.kmod base-kernel-modules 27./@MODULEDIR@/coredump/coredump.kmod base-kernel-modules
28./@MODULEDIR@/dirhash base-obsolete obsolete 28./@MODULEDIR@/dirhash base-obsolete obsolete
29./@MODULEDIR@/dirhash/dirhash.kmod base-obsolete obsolete 29./@MODULEDIR@/dirhash/dirhash.kmod base-obsolete obsolete
 30./@MODULEDIR@/dm base-kernel-modules lvm
 31./@MODULEDIR@/dm/dm.kmod base-kernel-modules lvm
30./@MODULEDIR@/efs base-kernel-modules 32./@MODULEDIR@/efs base-kernel-modules
31./@MODULEDIR@/efs/efs.kmod base-kernel-modules 33./@MODULEDIR@/efs/efs.kmod base-kernel-modules
32./@MODULEDIR@/exec_script base-kernel-modules 34./@MODULEDIR@/exec_script base-kernel-modules
33./@MODULEDIR@/exec_script/exec_script.kmod base-kernel-modules 35./@MODULEDIR@/exec_script/exec_script.kmod base-kernel-modules
34./@MODULEDIR@/ext2fs base-kernel-modules 36./@MODULEDIR@/ext2fs base-kernel-modules
35./@MODULEDIR@/ext2fs/ext2fs.kmod base-kernel-modules 37./@MODULEDIR@/ext2fs/ext2fs.kmod base-kernel-modules
36./@MODULEDIR@/fdesc base-kernel-modules 38./@MODULEDIR@/fdesc base-kernel-modules
37./@MODULEDIR@/fdesc/fdesc.kmod base-kernel-modules 39./@MODULEDIR@/fdesc/fdesc.kmod base-kernel-modules
38./@MODULEDIR@/ffs base-kernel-modules 40./@MODULEDIR@/ffs base-kernel-modules
39./@MODULEDIR@/ffs/ffs.kmod base-kernel-modules 41./@MODULEDIR@/ffs/ffs.kmod base-kernel-modules
40./@MODULEDIR@/filecore base-kernel-modules 42./@MODULEDIR@/filecore base-kernel-modules
41./@MODULEDIR@/filecore/filecore.kmod base-kernel-modules 43./@MODULEDIR@/filecore/filecore.kmod base-kernel-modules
42./@MODULEDIR@/fss base-kernel-modules 44./@MODULEDIR@/fss base-kernel-modules
cvs diff -r1.22 -r1.23 src/sys/modules/Makefile (expand / switch to unified diff)

--- src/sys/modules/Makefile 2008/12/05 13:05:37 1.22
+++ src/sys/modules/Makefile 2008/12/31 21:22:02 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.22 2008/12/05 13:05:37 ad Exp $ 1# $NetBSD: Makefile,v 1.23 2008/12/31 21:22:02 agc Exp $
2 2
3# For all platforms 3# For all platforms
4 4
5SUBDIR= accf_dataready 5SUBDIR= accf_dataready
6SUBDIR+= accf_httpready 6SUBDIR+= accf_httpready
7SUBDIR+= adosfs 7SUBDIR+= adosfs
8SUBDIR+= aio 8SUBDIR+= aio
9SUBDIR+= cd9660 9SUBDIR+= cd9660
10SUBDIR+= coda 10SUBDIR+= coda
11SUBDIR+= coda5 11SUBDIR+= coda5
12SUBDIR+= compat 12SUBDIR+= compat
13SUBDIR+= compat_ossaudio 13SUBDIR+= compat_ossaudio
14SUBDIR+= coredump 14SUBDIR+= coredump
@@ -70,14 +70,21 @@ SUBDIR+= i915drm @@ -70,14 +70,21 @@ SUBDIR+= i915drm
70 70
71.if ${MACHINE} == "i386" 71.if ${MACHINE} == "i386"
72SUBDIR+= azalia 72SUBDIR+= azalia
73SUBDIR+= compat_freebsd 73SUBDIR+= compat_freebsd
74SUBDIR+= compat_ibcs2 74SUBDIR+= compat_ibcs2
75SUBDIR+= compat_linux 75SUBDIR+= compat_linux
76SUBDIR+= compat_svr4 76SUBDIR+= compat_svr4
77SUBDIR+= drm 77SUBDIR+= drm
78SUBDIR+= exec_aout 78SUBDIR+= exec_aout
79SUBDIR+= i915drm 79SUBDIR+= i915drm
80SUBDIR+= radeondrm 80SUBDIR+= radeondrm
81.endif 81.endif
82 82
 83.include <bsd.own.mk>
 84
 85# we need our device mapper for LVM
 86.if (${MKLVM} != "no")
 87SUBDIR+= dm
 88.endif
 89
83.include <bsd.subdir.mk> 90.include <bsd.subdir.mk>