summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordyoung <dyoung@NetBSD.org>2009-08-30 01:49:41 +0000
committerdyoung <dyoung@NetBSD.org>2009-08-30 01:49:41 +0000
commit71fe64733eb6faa58e427b7dfa6bdc32149cb1dd (patch)
tree4b14677979d1e1f0fa9f95472fbc2917e330f3da
parent9ec52a2279aa50ee0507e90845640dafe6f17710 (diff)
Let us use MKKMOD=yes to leave the kernel modules out of the
distribution.
-rw-r--r--Makefile4
-rw-r--r--distrib/sets/lists/base/module.ad.arm6
-rw-r--r--distrib/sets/lists/base/module.ad.hppa6
-rw-r--r--distrib/sets/lists/base/module.ad.m68k6
-rw-r--r--distrib/sets/lists/base/module.ad.mipseb6
-rw-r--r--distrib/sets/lists/base/module.ad.mipsel6
-rw-r--r--distrib/sets/lists/base/module.ad.powerpc6
-rw-r--r--distrib/sets/lists/base/module.ad.sh36
-rw-r--r--distrib/sets/lists/base/module.alpha6
-rw-r--r--distrib/sets/lists/base/module.amd6438
-rw-r--r--distrib/sets/lists/base/module.i38646
-rw-r--r--distrib/sets/lists/base/module.mi200
-rw-r--r--distrib/sets/lists/base/module.sparc6
-rw-r--r--distrib/sets/lists/base/module.sparc6410
-rw-r--r--distrib/sets/lists/base/module.vax6
-rw-r--r--distrib/sets/sets.subr6
-rw-r--r--share/mk/bsd.own.mk3
17 files changed, 185 insertions, 182 deletions
diff --git a/Makefile b/Makefile
index 1b6ee6be743..a47aeb129f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.272 2009/07/03 22:20:27 pooka Exp $
+# $NetBSD: Makefile,v 1.273 2009/08/30 01:49:42 dyoung Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -237,7 +237,7 @@ BUILDTARGET+= do-libpcc
.endif
BUILDTARGETS+= do-lib-libc
BUILDTARGETS+= do-lib do-gnu-lib do-external-lib
-.if (${MACHINE} != "evbppc")
+.if (${MACHINE} != "evbppc") && ${MKKMOD} != "no"
BUILDTARGETS+= do-sys-modules
.endif
BUILDTARGETS+= do-sys-rump-fs-lib do-sys-rump-net-lib
diff --git a/distrib/sets/lists/base/module.ad.arm b/distrib/sets/lists/base/module.ad.arm
index 5916000e374..c72ec14bd6f 100644
--- a/distrib/sets/lists/base/module.ad.arm
+++ b/distrib/sets/lists/base/module.ad.arm
@@ -1,4 +1,4 @@
-# $NetBSD: module.ad.arm,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
+# $NetBSD: module.ad.arm,v 1.2 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.ad.hppa b/distrib/sets/lists/base/module.ad.hppa
index e8403ab1dd6..95e561a80b2 100644
--- a/distrib/sets/lists/base/module.ad.hppa
+++ b/distrib/sets/lists/base/module.ad.hppa
@@ -1,3 +1,3 @@
-# $NetBSD: module.ad.hppa,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
+# $NetBSD: module.ad.hppa,v 1.2 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.ad.m68k b/distrib/sets/lists/base/module.ad.m68k
index 77fae0c2d97..da0499abc19 100644
--- a/distrib/sets/lists/base/module.ad.m68k
+++ b/distrib/sets/lists/base/module.ad.m68k
@@ -1,3 +1,3 @@
-# $NetBSD: module.ad.m68k,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
+# $NetBSD: module.ad.m68k,v 1.2 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.ad.mipseb b/distrib/sets/lists/base/module.ad.mipseb
index e4c5db9bf30..4a22ce7963f 100644
--- a/distrib/sets/lists/base/module.ad.mipseb
+++ b/distrib/sets/lists/base/module.ad.mipseb
@@ -1,3 +1,3 @@
-# $NetBSD: module.ad.mipseb,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
+# $NetBSD: module.ad.mipseb,v 1.2 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.ad.mipsel b/distrib/sets/lists/base/module.ad.mipsel
index f5b5467a43e..2ca2b05440a 100644
--- a/distrib/sets/lists/base/module.ad.mipsel
+++ b/distrib/sets/lists/base/module.ad.mipsel
@@ -1,3 +1,3 @@
-# $NetBSD: module.ad.mipsel,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
+# $NetBSD: module.ad.mipsel,v 1.2 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.ad.powerpc b/distrib/sets/lists/base/module.ad.powerpc
index 96eeb41fb33..6c6b802d2dd 100644
--- a/distrib/sets/lists/base/module.ad.powerpc
+++ b/distrib/sets/lists/base/module.ad.powerpc
@@ -1,3 +1,3 @@
-# $NetBSD: module.ad.powerpc,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
+# $NetBSD: module.ad.powerpc,v 1.2 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.ad.sh3 b/distrib/sets/lists/base/module.ad.sh3
index f184bf3562d..460fd510c74 100644
--- a/distrib/sets/lists/base/module.ad.sh3
+++ b/distrib/sets/lists/base/module.ad.sh3
@@ -1,3 +1,3 @@
-# $NetBSD: module.ad.sh3,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
+# $NetBSD: module.ad.sh3,v 1.2 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.alpha b/distrib/sets/lists/base/module.alpha
index 09c301bc07f..0f9d032f1d3 100644
--- a/distrib/sets/lists/base/module.alpha
+++ b/distrib/sets/lists/base/module.alpha
@@ -1,3 +1,3 @@
-# $NetBSD: module.alpha,v 1.2 2008/11/29 18:41:06 tsutsui Exp $
-./@MODULEDIR@/exec_elf64 base-kernel-modules
-./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules
+# $NetBSD: module.alpha,v 1.3 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf64 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.amd64 b/distrib/sets/lists/base/module.amd64
index 0bc668f0b42..0f96551c937 100644
--- a/distrib/sets/lists/base/module.amd64
+++ b/distrib/sets/lists/base/module.amd64
@@ -1,19 +1,19 @@
-# $NetBSD: module.amd64,v 1.2 2009/03/10 14:59:19 yamt Exp $
-./@MODULEDIR@/azalia base-kernel-modules
-./@MODULEDIR@/azalia/azalia.kmod base-kernel-modules
-./@MODULEDIR@/compat_linux base-kernel-modules
-./@MODULEDIR@/compat_linux/compat_linux.kmod base-kernel-modules
-./@MODULEDIR@/compat_linux32 base-kernel-modules
-./@MODULEDIR@/compat_linux32/compat_linux32.kmod base-kernel-modules
-./@MODULEDIR@/compat_netbsd32 base-kernel-modules
-./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules
-./@MODULEDIR@/drm base-kernel-modules
-./@MODULEDIR@/drm/drm.kmod base-kernel-modules
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
-./@MODULEDIR@/exec_elf64 base-kernel-modules
-./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules
-./@MODULEDIR@/i915drm base-kernel-modules
-./@MODULEDIR@/i915drm/i915drm.kmod base-kernel-modules
-./@MODULEDIR@/tprof_pmi base-kernel-modules
-./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules
+# $NetBSD: module.amd64,v 1.3 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/azalia base-kernel-modules kmod
+./@MODULEDIR@/azalia/azalia.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat_linux base-kernel-modules kmod
+./@MODULEDIR@/compat_linux/compat_linux.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat_linux32 base-kernel-modules kmod
+./@MODULEDIR@/compat_linux32/compat_linux32.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod
+./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod
+./@MODULEDIR@/drm base-kernel-modules kmod
+./@MODULEDIR@/drm/drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
+./@MODULEDIR@/exec_elf64 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules kmod
+./@MODULEDIR@/i915drm base-kernel-modules kmod
+./@MODULEDIR@/i915drm/i915drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/tprof_pmi base-kernel-modules kmod
+./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.i386 b/distrib/sets/lists/base/module.i386
index 69eda6f1478..9d0787e1170 100644
--- a/distrib/sets/lists/base/module.i386
+++ b/distrib/sets/lists/base/module.i386
@@ -1,23 +1,23 @@
-# $NetBSD: module.i386,v 1.2 2009/03/10 14:59:19 yamt Exp $
-./@MODULEDIR@/azalia base-kernel-modules
-./@MODULEDIR@/azalia/azalia.kmod base-kernel-modules
-./@MODULEDIR@/compat_freebsd base-kernel-modules
-./@MODULEDIR@/compat_freebsd/compat_freebsd.kmod base-kernel-modules
-./@MODULEDIR@/compat_ibcs2 base-kernel-modules
-./@MODULEDIR@/compat_ibcs2/compat_ibcs2.kmod base-kernel-modules
-./@MODULEDIR@/compat_linux base-kernel-modules
-./@MODULEDIR@/compat_linux/compat_linux.kmod base-kernel-modules
-./@MODULEDIR@/compat_svr4 base-kernel-modules
-./@MODULEDIR@/compat_svr4/compat_svr4.kmod base-kernel-modules
-./@MODULEDIR@/drm base-kernel-modules
-./@MODULEDIR@/drm/drm.kmod base-kernel-modules
-./@MODULEDIR@/exec_aout base-kernel-modules
-./@MODULEDIR@/exec_aout/exec_aout.kmod base-kernel-modules
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
-./@MODULEDIR@/i915drm base-kernel-modules
-./@MODULEDIR@/i915drm/i915drm.kmod base-kernel-modules
-./@MODULEDIR@/radeondrm base-kernel-modules
-./@MODULEDIR@/radeondrm/radeondrm.kmod base-kernel-modules
-./@MODULEDIR@/tprof_pmi base-kernel-modules
-./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules
+# $NetBSD: module.i386,v 1.3 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/azalia base-kernel-modules kmod
+./@MODULEDIR@/azalia/azalia.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat_freebsd base-kernel-modules kmod
+./@MODULEDIR@/compat_freebsd/compat_freebsd.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat_ibcs2 base-kernel-modules kmod
+./@MODULEDIR@/compat_ibcs2/compat_ibcs2.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat_linux base-kernel-modules kmod
+./@MODULEDIR@/compat_linux/compat_linux.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat_svr4 base-kernel-modules kmod
+./@MODULEDIR@/compat_svr4/compat_svr4.kmod base-kernel-modules kmod
+./@MODULEDIR@/drm base-kernel-modules kmod
+./@MODULEDIR@/drm/drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/exec_aout base-kernel-modules kmod
+./@MODULEDIR@/exec_aout/exec_aout.kmod base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
+./@MODULEDIR@/i915drm base-kernel-modules kmod
+./@MODULEDIR@/i915drm/i915drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/radeondrm base-kernel-modules kmod
+./@MODULEDIR@/radeondrm/radeondrm.kmod base-kernel-modules kmod
+./@MODULEDIR@/tprof_pmi base-kernel-modules kmod
+./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.mi b/distrib/sets/lists/base/module.mi
index 82653728650..5b51ef2a75d 100644
--- a/distrib/sets/lists/base/module.mi
+++ b/distrib/sets/lists/base/module.mi
@@ -1,105 +1,105 @@
-# $NetBSD: module.mi,v 1.10 2009/07/19 02:50:44 rmind Exp $
+# $NetBSD: module.mi,v 1.11 2009/08/30 01:49:42 dyoung Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
-./stand/@MACHINE@ base-kernel-modules
-./stand/@MACHINE@/@OSRELEASE@ base-kernel-modules
-./@MODULEDIR@ base-kernel-modules
-./@MODULEDIR@/accf_dataready base-kernel-modules
-./@MODULEDIR@/accf_dataready/accf_dataready.kmod base-kernel-modules
-./@MODULEDIR@/accf_httpready base-kernel-modules
-./@MODULEDIR@/accf_httpready/accf_httpready.kmod base-kernel-modules
-./@MODULEDIR@/adosfs base-kernel-modules
-./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules
-./@MODULEDIR@/aio base-kernel-modules
-./@MODULEDIR@/aio/aio.kmod base-kernel-modules
-./@MODULEDIR@/cd9660 base-kernel-modules
-./@MODULEDIR@/cd9660/cd9660.kmod base-kernel-modules
-./@MODULEDIR@/coda base-kernel-modules
-./@MODULEDIR@/coda/coda.kmod base-kernel-modules
-./@MODULEDIR@/coda5 base-kernel-modules
-./@MODULEDIR@/coda5/coda5.kmod base-kernel-modules
-./@MODULEDIR@/compat base-kernel-modules
-./@MODULEDIR@/compat/compat.kmod base-kernel-modules
-./@MODULEDIR@/compat_ossaudio base-kernel-modules
-./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod base-kernel-modules
-./@MODULEDIR@/coredump base-kernel-modules
-./@MODULEDIR@/coredump/coredump.kmod base-kernel-modules
+./stand/@MACHINE@ base-kernel-modules kmod
+./stand/@MACHINE@/@OSRELEASE@ base-kernel-modules kmod
+./@MODULEDIR@ base-kernel-modules kmod
+./@MODULEDIR@/accf_dataready base-kernel-modules kmod
+./@MODULEDIR@/accf_dataready/accf_dataready.kmod base-kernel-modules kmod
+./@MODULEDIR@/accf_httpready base-kernel-modules kmod
+./@MODULEDIR@/accf_httpready/accf_httpready.kmod base-kernel-modules kmod
+./@MODULEDIR@/adosfs base-kernel-modules kmod
+./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/aio base-kernel-modules kmod
+./@MODULEDIR@/aio/aio.kmod base-kernel-modules kmod
+./@MODULEDIR@/cd9660 base-kernel-modules kmod
+./@MODULEDIR@/cd9660/cd9660.kmod base-kernel-modules kmod
+./@MODULEDIR@/coda base-kernel-modules kmod
+./@MODULEDIR@/coda/coda.kmod base-kernel-modules kmod
+./@MODULEDIR@/coda5 base-kernel-modules kmod
+./@MODULEDIR@/coda5/coda5.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat base-kernel-modules kmod
+./@MODULEDIR@/compat/compat.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat_ossaudio base-kernel-modules kmod
+./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod base-kernel-modules kmod
+./@MODULEDIR@/coredump base-kernel-modules kmod
+./@MODULEDIR@/coredump/coredump.kmod base-kernel-modules kmod
./@MODULEDIR@/dirhash base-obsolete obsolete
./@MODULEDIR@/dirhash/dirhash.kmod base-obsolete obsolete
-./@MODULEDIR@/dm base-kernel-modules lvm
-./@MODULEDIR@/dm/dm.kmod base-kernel-modules lvm
-./@MODULEDIR@/efs base-kernel-modules
-./@MODULEDIR@/efs/efs.kmod base-kernel-modules
-./@MODULEDIR@/exec_script base-kernel-modules
-./@MODULEDIR@/exec_script/exec_script.kmod base-kernel-modules
-./@MODULEDIR@/ext2fs base-kernel-modules
-./@MODULEDIR@/ext2fs/ext2fs.kmod base-kernel-modules
-./@MODULEDIR@/fdesc base-kernel-modules
-./@MODULEDIR@/fdesc/fdesc.kmod base-kernel-modules
-./@MODULEDIR@/ffs base-kernel-modules
-./@MODULEDIR@/ffs/ffs.kmod base-kernel-modules
-./@MODULEDIR@/filecore base-kernel-modules
-./@MODULEDIR@/filecore/filecore.kmod base-kernel-modules
-./@MODULEDIR@/fss base-kernel-modules
-./@MODULEDIR@/fss/fss.kmod base-kernel-modules
-./@MODULEDIR@/hfs base-kernel-modules
-./@MODULEDIR@/hfs/hfs.kmod base-kernel-modules
-./@MODULEDIR@/kernfs base-kernel-modules
-./@MODULEDIR@/kernfs/kernfs.kmod base-kernel-modules
-./@MODULEDIR@/ksem base-kernel-modules
-./@MODULEDIR@/ksem/ksem.kmod base-kernel-modules
-./@MODULEDIR@/layerfs base-kernel-modules
-./@MODULEDIR@/layerfs/layerfs.kmod base-kernel-modules
-./@MODULEDIR@/lfs base-kernel-modules
-./@MODULEDIR@/lfs/lfs.kmod base-kernel-modules
-./@MODULEDIR@/mfs base-kernel-modules
-./@MODULEDIR@/mfs/mfs.kmod base-kernel-modules
-./@MODULEDIR@/miniroot base-kernel-modules
-./@MODULEDIR@/miniroot/miniroot.kmod base-kernel-modules
-./@MODULEDIR@/mqueue base-kernel-modules
-./@MODULEDIR@/mqueue/mqueue.kmod base-kernel-modules
-./@MODULEDIR@/msdos base-kernel-modules
-./@MODULEDIR@/msdos/msdos.kmod base-kernel-modules
-./@MODULEDIR@/nfs base-kernel-modules
-./@MODULEDIR@/nfs/nfs.kmod base-kernel-modules
-./@MODULEDIR@/nfsserver base-kernel-modules
-./@MODULEDIR@/nfsserver/nfsserver.kmod base-kernel-modules
-./@MODULEDIR@/nilfs base-kernel-modules
-./@MODULEDIR@/nilfs/nilfs.kmod base-kernel-modules
-./@MODULEDIR@/ntfs base-kernel-modules
-./@MODULEDIR@/ntfs/ntfs.kmod base-kernel-modules
-./@MODULEDIR@/null base-kernel-modules
-./@MODULEDIR@/null/null.kmod base-kernel-modules
-./@MODULEDIR@/overlay base-kernel-modules
-./@MODULEDIR@/overlay/overlay.kmod base-kernel-modules
-./@MODULEDIR@/portal base-kernel-modules
-./@MODULEDIR@/portal/portal.kmod base-kernel-modules
-./@MODULEDIR@/ppp_bsdcomp base-kernel-modules
-./@MODULEDIR@/ppp_bsdcomp/ppp_bsdcomp.kmod base-kernel-modules
-./@MODULEDIR@/ppp_deflate base-kernel-modules
-./@MODULEDIR@/ppp_deflate/ppp_deflate.kmod base-kernel-modules
-./@MODULEDIR@/procfs base-kernel-modules
-./@MODULEDIR@/procfs/procfs.kmod base-kernel-modules
-./@MODULEDIR@/ptyfs base-kernel-modules
-./@MODULEDIR@/ptyfs/ptyfs.kmod base-kernel-modules
-./@MODULEDIR@/puffs base-kernel-modules
-./@MODULEDIR@/puffs/puffs.kmod base-kernel-modules
-./@MODULEDIR@/putter base-kernel-modules
-./@MODULEDIR@/putter/putter.kmod base-kernel-modules
-./@MODULEDIR@/smbfs base-kernel-modules
-./@MODULEDIR@/smbfs/smbfs.kmod base-kernel-modules
-./@MODULEDIR@/sysvbfs base-kernel-modules
-./@MODULEDIR@/sysvbfs/sysvbfs.kmod base-kernel-modules
-./@MODULEDIR@/tmpfs base-kernel-modules
-./@MODULEDIR@/tmpfs/tmpfs.kmod base-kernel-modules
-./@MODULEDIR@/tprof base-kernel-modules
-./@MODULEDIR@/tprof/tprof.kmod base-kernel-modules
-./@MODULEDIR@/udf base-kernel-modules
-./@MODULEDIR@/udf/udf.kmod base-kernel-modules
-./@MODULEDIR@/umap base-kernel-modules
-./@MODULEDIR@/umap/umap.kmod base-kernel-modules
-./@MODULEDIR@/union base-kernel-modules
-./@MODULEDIR@/union/union.kmod base-kernel-modules
-./@MODULEDIR@/vnd base-kernel-modules
-./@MODULEDIR@/vnd/vnd.kmod base-kernel-modules
+./@MODULEDIR@/dm base-kernel-modules lvm,kmod
+./@MODULEDIR@/dm/dm.kmod base-kernel-modules lvm,kmod
+./@MODULEDIR@/efs base-kernel-modules kmod
+./@MODULEDIR@/efs/efs.kmod base-kernel-modules kmod
+./@MODULEDIR@/exec_script base-kernel-modules kmod
+./@MODULEDIR@/exec_script/exec_script.kmod base-kernel-modules kmod
+./@MODULEDIR@/ext2fs base-kernel-modules kmod
+./@MODULEDIR@/ext2fs/ext2fs.kmod base-kernel-modules kmod
+./@MODULEDIR@/fdesc base-kernel-modules kmod
+./@MODULEDIR@/fdesc/fdesc.kmod base-kernel-modules kmod
+./@MODULEDIR@/ffs base-kernel-modules kmod
+./@MODULEDIR@/ffs/ffs.kmod base-kernel-modules kmod
+./@MODULEDIR@/filecore base-kernel-modules kmod
+./@MODULEDIR@/filecore/filecore.kmod base-kernel-modules kmod
+./@MODULEDIR@/fss base-kernel-modules kmod
+./@MODULEDIR@/fss/fss.kmod base-kernel-modules kmod
+./@MODULEDIR@/hfs base-kernel-modules kmod
+./@MODULEDIR@/hfs/hfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/kernfs base-kernel-modules kmod
+./@MODULEDIR@/kernfs/kernfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/ksem base-kernel-modules kmod
+./@MODULEDIR@/ksem/ksem.kmod base-kernel-modules kmod
+./@MODULEDIR@/layerfs base-kernel-modules kmod
+./@MODULEDIR@/layerfs/layerfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/lfs base-kernel-modules kmod
+./@MODULEDIR@/lfs/lfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/mfs base-kernel-modules kmod
+./@MODULEDIR@/mfs/mfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/miniroot base-kernel-modules kmod
+./@MODULEDIR@/miniroot/miniroot.kmod base-kernel-modules kmod
+./@MODULEDIR@/mqueue base-kernel-modules kmod
+./@MODULEDIR@/mqueue/mqueue.kmod base-kernel-modules kmod
+./@MODULEDIR@/msdos base-kernel-modules kmod
+./@MODULEDIR@/msdos/msdos.kmod base-kernel-modules kmod
+./@MODULEDIR@/nfs base-kernel-modules kmod
+./@MODULEDIR@/nfs/nfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/nfsserver base-kernel-modules kmod
+./@MODULEDIR@/nfsserver/nfsserver.kmod base-kernel-modules kmod
+./@MODULEDIR@/nilfs base-kernel-modules kmod
+./@MODULEDIR@/nilfs/nilfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/ntfs base-kernel-modules kmod
+./@MODULEDIR@/ntfs/ntfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/null base-kernel-modules kmod
+./@MODULEDIR@/null/null.kmod base-kernel-modules kmod
+./@MODULEDIR@/overlay base-kernel-modules kmod
+./@MODULEDIR@/overlay/overlay.kmod base-kernel-modules kmod
+./@MODULEDIR@/portal base-kernel-modules kmod
+./@MODULEDIR@/portal/portal.kmod base-kernel-modules kmod
+./@MODULEDIR@/ppp_bsdcomp base-kernel-modules kmod
+./@MODULEDIR@/ppp_bsdcomp/ppp_bsdcomp.kmod base-kernel-modules kmod
+./@MODULEDIR@/ppp_deflate base-kernel-modules kmod
+./@MODULEDIR@/ppp_deflate/ppp_deflate.kmod base-kernel-modules kmod
+./@MODULEDIR@/procfs base-kernel-modules kmod
+./@MODULEDIR@/procfs/procfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/ptyfs base-kernel-modules kmod
+./@MODULEDIR@/ptyfs/ptyfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/puffs base-kernel-modules kmod
+./@MODULEDIR@/puffs/puffs.kmod base-kernel-modules kmod
+./@MODULEDIR@/putter base-kernel-modules kmod
+./@MODULEDIR@/putter/putter.kmod base-kernel-modules kmod
+./@MODULEDIR@/smbfs base-kernel-modules kmod
+./@MODULEDIR@/smbfs/smbfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/sysvbfs base-kernel-modules kmod
+./@MODULEDIR@/sysvbfs/sysvbfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/tmpfs base-kernel-modules kmod
+./@MODULEDIR@/tmpfs/tmpfs.kmod base-kernel-modules kmod
+./@MODULEDIR@/tprof base-kernel-modules kmod
+./@MODULEDIR@/tprof/tprof.kmod base-kernel-modules kmod
+./@MODULEDIR@/udf base-kernel-modules kmod
+./@MODULEDIR@/udf/udf.kmod base-kernel-modules kmod
+./@MODULEDIR@/umap base-kernel-modules kmod
+./@MODULEDIR@/umap/umap.kmod base-kernel-modules kmod
+./@MODULEDIR@/union base-kernel-modules kmod
+./@MODULEDIR@/union/union.kmod base-kernel-modules kmod
+./@MODULEDIR@/vnd base-kernel-modules kmod
+./@MODULEDIR@/vnd/vnd.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.sparc b/distrib/sets/lists/base/module.sparc
index 0306cd506d0..2ac18d8c75b 100644
--- a/distrib/sets/lists/base/module.sparc
+++ b/distrib/sets/lists/base/module.sparc
@@ -1,3 +1,3 @@
-# $NetBSD: module.sparc,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
+# $NetBSD: module.sparc,v 1.2 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.sparc64 b/distrib/sets/lists/base/module.sparc64
index efb709b6f57..90d4af01295 100644
--- a/distrib/sets/lists/base/module.sparc64
+++ b/distrib/sets/lists/base/module.sparc64
@@ -1,5 +1,5 @@
-# $NetBSD: module.sparc64,v 1.2 2008/11/29 18:41:06 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
-./@MODULEDIR@/exec_elf64 base-kernel-modules
-./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules
+# $NetBSD: module.sparc64,v 1.3 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
+./@MODULEDIR@/exec_elf64 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules kmod
diff --git a/distrib/sets/lists/base/module.vax b/distrib/sets/lists/base/module.vax
index 77698c869ca..d44681f13c7 100644
--- a/distrib/sets/lists/base/module.vax
+++ b/distrib/sets/lists/base/module.vax
@@ -1,3 +1,3 @@
-# $NetBSD: module.vax,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
+# $NetBSD: module.vax,v 1.2 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
diff --git a/distrib/sets/sets.subr b/distrib/sets/sets.subr
index e851ba2235a..d5b6c1cc7aa 100644
--- a/distrib/sets/sets.subr
+++ b/distrib/sets/sets.subr
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.84 2009/06/18 21:05:35 mrg Exp $
+# $NetBSD: sets.subr,v 1.85 2009/08/30 01:49:41 dyoung Exp $
#
#
@@ -44,6 +44,7 @@ MKVARS="\
MKIPFILTER \
MKISCSI \
MKKERBEROS \
+ MKKMOD \
MKLDAP \
MKLINT \
MKLVM \
@@ -228,7 +229,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.84 2009/06/18 21:05:35 mrg Exp $
+# # $NetBSD: sets.subr,v 1.85 2009/08/30 01:49:41 dyoung Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -270,6 +271,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
# ipfilter ${MKIPFILTER} != no
# iscsi ${MKISCSI} != no
# kerberos ${MKKERBEROS} != no
+# kmod ${MKKMOD} != no
# ldap ${MKLDAP} != no
# lint ${MKLINT} != no
# lvm ${MKLVM} != no
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 4e9524a8fa3..26a827f605a 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.569 2009/08/20 03:49:34 macallan Exp $
+# $NetBSD: bsd.own.mk,v 1.570 2009/08/30 01:49:42 dyoung Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -661,6 +661,7 @@ MKCOMPAT:= no
MKHESIOD MKHTML \
MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
MKKERBEROS \
+ MKKMOD \
MKLDAP MKLINKLIB MKLINT \
MKMAN \
MKNLS \