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 (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,93 +1,95 @@ @@ -1,93 +1,95 @@
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
15./@MODULEDIR@/aio/aio.kmod base-kernel-modules 15./@MODULEDIR@/aio/aio.kmod base-kernel-modules
16./@MODULEDIR@/cd9660 base-kernel-modules 16./@MODULEDIR@/cd9660 base-kernel-modules
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
43./@MODULEDIR@/fss/fss.kmod base-kernel-modules 45./@MODULEDIR@/fss/fss.kmod base-kernel-modules
44./@MODULEDIR@/hfs base-kernel-modules 46./@MODULEDIR@/hfs base-kernel-modules
45./@MODULEDIR@/hfs/hfs.kmod base-kernel-modules 47./@MODULEDIR@/hfs/hfs.kmod base-kernel-modules
46./@MODULEDIR@/kernfs base-kernel-modules 48./@MODULEDIR@/kernfs base-kernel-modules
47./@MODULEDIR@/kernfs/kernfs.kmod base-kernel-modules 49./@MODULEDIR@/kernfs/kernfs.kmod base-kernel-modules
48./@MODULEDIR@/ksem base-kernel-modules 50./@MODULEDIR@/ksem base-kernel-modules
49./@MODULEDIR@/ksem/ksem.kmod base-kernel-modules 51./@MODULEDIR@/ksem/ksem.kmod base-kernel-modules
50./@MODULEDIR@/layerfs base-kernel-modules 52./@MODULEDIR@/layerfs base-kernel-modules
51./@MODULEDIR@/layerfs/layerfs.kmod base-kernel-modules 53./@MODULEDIR@/layerfs/layerfs.kmod base-kernel-modules
52./@MODULEDIR@/lfs base-kernel-modules 54./@MODULEDIR@/lfs base-kernel-modules
53./@MODULEDIR@/lfs/lfs.kmod base-kernel-modules 55./@MODULEDIR@/lfs/lfs.kmod base-kernel-modules
54./@MODULEDIR@/mfs base-kernel-modules 56./@MODULEDIR@/mfs base-kernel-modules
55./@MODULEDIR@/mfs/mfs.kmod base-kernel-modules 57./@MODULEDIR@/mfs/mfs.kmod base-kernel-modules
56./@MODULEDIR@/miniroot base-kernel-modules 58./@MODULEDIR@/miniroot base-kernel-modules
57./@MODULEDIR@/miniroot/miniroot.kmod base-kernel-modules 59./@MODULEDIR@/miniroot/miniroot.kmod base-kernel-modules
58./@MODULEDIR@/msdos base-kernel-modules 60./@MODULEDIR@/msdos base-kernel-modules
59./@MODULEDIR@/msdos/msdos.kmod base-kernel-modules 61./@MODULEDIR@/msdos/msdos.kmod base-kernel-modules
60./@MODULEDIR@/nfs base-kernel-modules 62./@MODULEDIR@/nfs base-kernel-modules
61./@MODULEDIR@/nfs/nfs.kmod base-kernel-modules 63./@MODULEDIR@/nfs/nfs.kmod base-kernel-modules
62./@MODULEDIR@/nfsserver base-kernel-modules 64./@MODULEDIR@/nfsserver base-kernel-modules
63./@MODULEDIR@/nfsserver/nfsserver.kmod base-kernel-modules 65./@MODULEDIR@/nfsserver/nfsserver.kmod base-kernel-modules
64./@MODULEDIR@/ntfs base-kernel-modules 66./@MODULEDIR@/ntfs base-kernel-modules
65./@MODULEDIR@/ntfs/ntfs.kmod base-kernel-modules 67./@MODULEDIR@/ntfs/ntfs.kmod base-kernel-modules
66./@MODULEDIR@/null base-kernel-modules 68./@MODULEDIR@/null base-kernel-modules
67./@MODULEDIR@/null/null.kmod base-kernel-modules 69./@MODULEDIR@/null/null.kmod base-kernel-modules
68./@MODULEDIR@/overlay base-kernel-modules 70./@MODULEDIR@/overlay base-kernel-modules
69./@MODULEDIR@/overlay/overlay.kmod base-kernel-modules 71./@MODULEDIR@/overlay/overlay.kmod base-kernel-modules
70./@MODULEDIR@/portal base-kernel-modules 72./@MODULEDIR@/portal base-kernel-modules
71./@MODULEDIR@/portal/portal.kmod base-kernel-modules 73./@MODULEDIR@/portal/portal.kmod base-kernel-modules
72./@MODULEDIR@/ppp_bsdcomp base-kernel-modules 74./@MODULEDIR@/ppp_bsdcomp base-kernel-modules
73./@MODULEDIR@/ppp_bsdcomp/ppp_bsdcomp.kmod base-kernel-modules 75./@MODULEDIR@/ppp_bsdcomp/ppp_bsdcomp.kmod base-kernel-modules
74./@MODULEDIR@/ppp_deflate base-kernel-modules 76./@MODULEDIR@/ppp_deflate base-kernel-modules
75./@MODULEDIR@/ppp_deflate/ppp_deflate.kmod base-kernel-modules 77./@MODULEDIR@/ppp_deflate/ppp_deflate.kmod base-kernel-modules
76./@MODULEDIR@/procfs base-kernel-modules 78./@MODULEDIR@/procfs base-kernel-modules
77./@MODULEDIR@/procfs/procfs.kmod base-kernel-modules 79./@MODULEDIR@/procfs/procfs.kmod base-kernel-modules
78./@MODULEDIR@/ptyfs base-kernel-modules 80./@MODULEDIR@/ptyfs base-kernel-modules
79./@MODULEDIR@/ptyfs/ptyfs.kmod base-kernel-modules 81./@MODULEDIR@/ptyfs/ptyfs.kmod base-kernel-modules
80./@MODULEDIR@/puffs base-kernel-modules 82./@MODULEDIR@/puffs base-kernel-modules
81./@MODULEDIR@/puffs/puffs.kmod base-kernel-modules 83./@MODULEDIR@/puffs/puffs.kmod base-kernel-modules
82./@MODULEDIR@/putter base-kernel-modules 84./@MODULEDIR@/putter base-kernel-modules
83./@MODULEDIR@/putter/putter.kmod base-kernel-modules 85./@MODULEDIR@/putter/putter.kmod base-kernel-modules
84./@MODULEDIR@/smbfs base-kernel-modules 86./@MODULEDIR@/smbfs base-kernel-modules
85./@MODULEDIR@/smbfs/smbfs.kmod base-kernel-modules 87./@MODULEDIR@/smbfs/smbfs.kmod base-kernel-modules
86./@MODULEDIR@/tmpfs base-kernel-modules 88./@MODULEDIR@/tmpfs base-kernel-modules
87./@MODULEDIR@/tmpfs/tmpfs.kmod base-kernel-modules 89./@MODULEDIR@/tmpfs/tmpfs.kmod base-kernel-modules
88./@MODULEDIR@/udf base-kernel-modules 90./@MODULEDIR@/udf base-kernel-modules
89./@MODULEDIR@/udf/udf.kmod base-kernel-modules 91./@MODULEDIR@/udf/udf.kmod base-kernel-modules
90./@MODULEDIR@/umap base-kernel-modules 92./@MODULEDIR@/umap base-kernel-modules
91./@MODULEDIR@/umap/umap.kmod base-kernel-modules 93./@MODULEDIR@/umap/umap.kmod base-kernel-modules
92./@MODULEDIR@/union base-kernel-modules 94./@MODULEDIR@/union base-kernel-modules
93./@MODULEDIR@/union/union.kmod base-kernel-modules 95./@MODULEDIR@/union/union.kmod base-kernel-modules
cvs diff -r1.22 -r1.23 src/sys/modules/Makefile (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,83 +1,90 @@ @@ -1,83 +1,90 @@
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
15SUBDIR+= efs 15SUBDIR+= efs
16SUBDIR+= ext2fs 16SUBDIR+= ext2fs
17SUBDIR+= exec_script 17SUBDIR+= exec_script
18SUBDIR+= fdesc 18SUBDIR+= fdesc
19SUBDIR+= ffs 19SUBDIR+= ffs
20SUBDIR+= filecore 20SUBDIR+= filecore
21SUBDIR+= fss 21SUBDIR+= fss
22SUBDIR+= hfs 22SUBDIR+= hfs
23SUBDIR+= kernfs 23SUBDIR+= kernfs
24SUBDIR+= ksem 24SUBDIR+= ksem
25SUBDIR+= layerfs 25SUBDIR+= layerfs
26SUBDIR+= lfs 26SUBDIR+= lfs
27SUBDIR+= mfs 27SUBDIR+= mfs
28SUBDIR+= msdos 28SUBDIR+= msdos
29SUBDIR+= nfs 29SUBDIR+= nfs
30SUBDIR+= nfsserver 30SUBDIR+= nfsserver
31SUBDIR+= ntfs 31SUBDIR+= ntfs
32SUBDIR+= null 32SUBDIR+= null
33SUBDIR+= overlay 33SUBDIR+= overlay
34SUBDIR+= portal 34SUBDIR+= portal
35SUBDIR+= ppp_bsdcomp 35SUBDIR+= ppp_bsdcomp
36SUBDIR+= ppp_deflate 36SUBDIR+= ppp_deflate
37SUBDIR+= procfs 37SUBDIR+= procfs
38SUBDIR+= ptyfs 38SUBDIR+= ptyfs
39SUBDIR+= puffs 39SUBDIR+= puffs
40SUBDIR+= putter 40SUBDIR+= putter
41SUBDIR+= miniroot 41SUBDIR+= miniroot
42SUBDIR+= smbfs 42SUBDIR+= smbfs
43SUBDIR+= tmpfs 43SUBDIR+= tmpfs
44SUBDIR+= udf 44SUBDIR+= udf
45SUBDIR+= umap 45SUBDIR+= umap
46SUBDIR+= union 46SUBDIR+= union
47.if (defined(NOTYET)) 47.if (defined(NOTYET))
48SUBDIR+= unionfs 48SUBDIR+= unionfs
49.endif 49.endif
50 50
51# Machine dependent section 51# Machine dependent section
52.if ${MACHINE_ARCH} != "alpha" 52.if ${MACHINE_ARCH} != "alpha"
53SUBDIR+= exec_elf32 53SUBDIR+= exec_elf32
54.endif 54.endif
55 55
56.if ${MACHINE_ARCH} == "alpha" || \ 56.if ${MACHINE_ARCH} == "alpha" || \
57 ${MACHINE_ARCH} == "sparc64" || \ 57 ${MACHINE_ARCH} == "sparc64" || \
58 ${MACHINE_ARCH} == "x86_64" 58 ${MACHINE_ARCH} == "x86_64"
59SUBDIR+= exec_elf64 59SUBDIR+= exec_elf64
60.endif 60.endif
61 61
62.if ${MACHINE} == "amd64" 62.if ${MACHINE} == "amd64"
63SUBDIR+= azalia 63SUBDIR+= azalia
64SUBDIR+= compat_linux 64SUBDIR+= compat_linux
65SUBDIR+= compat_linux32 65SUBDIR+= compat_linux32
66SUBDIR+= compat_netbsd32 66SUBDIR+= compat_netbsd32
67SUBDIR+= drm 67SUBDIR+= drm
68SUBDIR+= i915drm 68SUBDIR+= i915drm
69.endif 69.endif
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>