Module Name: src
Committed By: pgoyette
Date: Tue Sep 27 20:52:43 UTC 2016
Modified Files:
src/distrib/sets/lists/modules: md.alpha md.amd64 md.hppa md.i386
md.prep md.sgimips mi
src/sys/modules: Makefile
Log Message:
For now, disable all the newly-created ld(4) related modules. We need
to come up with a better way to handle attachment-specific modules, and
possibly a better directory structure for modules in general, as the
current mechanism doesn't scale.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/modules/md.alpha \
src/distrib/sets/lists/modules/md.hppa
cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/modules/md.prep \
src/distrib/sets/lists/modules/md.sgimips
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.178 -r1.179 src/sys/modules/Makefile
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/modules/md.alpha
diff -u src/distrib/sets/lists/modules/md.alpha:1.4 src/distrib/sets/lists/modules/md.alpha:1.5
--- src/distrib/sets/lists/modules/md.alpha:1.4 Tue Sep 27 04:00:33 2016
+++ src/distrib/sets/lists/modules/md.alpha Tue Sep 27 20:52:43 2016
@@ -1,7 +1,7 @@
-# $NetBSD: md.alpha,v 1.4 2016/09/27 04:00:33 pgoyette Exp $
-./@MODULEDIR@/cac_eisa base-kernel-modules kmod
-./@MODULEDIR@/cac_eisa/cac_eisa.kmod base-kernel-modules kmod
+# $NetBSD: md.alpha,v 1.5 2016/09/27 20:52:43 pgoyette Exp $
+./@MODULEDIR@/cac_eisa base-obsolete obsolete
+./@MODULEDIR@/cac_eisa/cac_eisa.kmod base-obsolete obsolete
./@MODULEDIR@/exec_elf64 base-kernel-modules kmod
./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules kmod
-./@MODULEDIR@/mlx_eisa base-kernel-modules kmod
-./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod base-kernel-modules kmod
+./@MODULEDIR@/mlx_eisa base-obsolete obsolete
+./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod base-obsolete obsolete
Index: src/distrib/sets/lists/modules/md.hppa
diff -u src/distrib/sets/lists/modules/md.hppa:1.4 src/distrib/sets/lists/modules/md.hppa:1.5
--- src/distrib/sets/lists/modules/md.hppa:1.4 Tue Sep 27 04:00:33 2016
+++ src/distrib/sets/lists/modules/md.hppa Tue Sep 27 20:52:43 2016
@@ -1,8 +1,8 @@
-# $NetBSD: md.hppa,v 1.4 2016/09/27 04:00:33 pgoyette Exp $
-./@MODULEDIR@/cac_eisa base-kernel-modules kmod
-./@MODULEDIR@/cac_eisa/cac_eisa.kmod base-kernel-modules kmod
+# $NetBSD: md.hppa,v 1.5 2016/09/27 20:52:43 pgoyette Exp $
+./@MODULEDIR@/cac_eisa base-obsolete obsolete
+./@MODULEDIR@/cac_eisa/cac_eisa.kmod base-obsolete obsolete
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
-./@MODULEDIR@/mlx_eisa base-kernel-modules kmod
-./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod base-kernel-modules kmod
+./@MODULEDIR@/mlx_eisa base-obsolete obsolete
+./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod base-obsolete obsolete
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.68 src/distrib/sets/lists/modules/md.amd64:1.69
--- src/distrib/sets/lists/modules/md.amd64:1.68 Tue Sep 27 04:00:33 2016
+++ src/distrib/sets/lists/modules/md.amd64 Tue Sep 27 20:52:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.68 2016/09/27 04:00:33 pgoyette Exp $
+# $NetBSD: md.amd64,v 1.69 2016/09/27 20:52:43 pgoyette Exp $
#
# NOTE that there are two sets of files here:
# @MODULEDIR@ and amd64-xen
@@ -111,8 +111,8 @@
./@MODULEDIR@/i915drmkms/i915drmkms.kmod base-kernel-modules kmod
./@MODULEDIR@/itesio base-kernel-modules kmod
./@MODULEDIR@/itesio/itesio.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_nvme base-kernel-modules kmod
-./@MODULEDIR@/ld_nvme/ld_nvme.kmod base-kernel-modules kmod
+./@MODULEDIR@/ld_nvme base-obsolete obsolete
+./@MODULEDIR@/ld_nvme/ld_nvme.kmod base-obsolete obsolete
./@MODULEDIR@/lg3303 base-kernel-modules kmod
./@MODULEDIR@/lg3303/lg3303.kmod base-kernel-modules kmod
./@MODULEDIR@/lm base-kernel-modules kmod
@@ -125,8 +125,8 @@
./@MODULEDIR@/lm_wbsio/lm_wbsio.kmod base-kernel-modules kmod
./@MODULEDIR@/mt2131 base-kernel-modules kmod
./@MODULEDIR@/mt2131/mt2131.kmod base-kernel-modules kmod
-./@MODULEDIR@/nvme base-kernel-modules kmod
-./@MODULEDIR@/nvme/nvme.kmod base-kernel-modules kmod
+./@MODULEDIR@/nvme base-obsolete obsolete
+./@MODULEDIR@/nvme/nvme.kmod base-obsolete obsolete
./@MODULEDIR@/nxt2k base-kernel-modules kmod
./@MODULEDIR@/nxt2k/nxt2k.kmod base-kernel-modules kmod
./@MODULEDIR@/odcm base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.70 src/distrib/sets/lists/modules/md.i386:1.71
--- src/distrib/sets/lists/modules/md.i386:1.70 Tue Sep 27 04:00:33 2016
+++ src/distrib/sets/lists/modules/md.i386 Tue Sep 27 20:52:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.70 2016/09/27 04:00:33 pgoyette Exp $
+# $NetBSD: md.i386,v 1.71 2016/09/27 20:52:43 pgoyette Exp $
#
# NOTE that there are three sets of files here:
# @MODULEDIR@, i386-xen, and i386pae-xen
@@ -47,8 +47,8 @@
./@MODULEDIR@/azalia/azalia.kmod base-kernel-modules kmod
./@MODULEDIR@/bpfjit base-kernel-modules kmod,sljit
./@MODULEDIR@/bpfjit/bpfjit.kmod base-kernel-modules kmod,sljit
-./@MODULEDIR@/cac_eisa base-kernel-modules kmod
-./@MODULEDIR@/cac_eisa/cac_eisa.kmod base-kernel-modules kmod
+./@MODULEDIR@/cac_eisa base-obsolete obsolete
+./@MODULEDIR@/cac_eisa/cac_eisa.kmod base-obsolete obsolete
./@MODULEDIR@/compat_freebsd base-kernel-modules kmod
./@MODULEDIR@/compat_freebsd/compat_freebsd.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_ibcs2 base-kernel-modules kmod
@@ -107,8 +107,8 @@
./@MODULEDIR@/i915drmkms/i915drmkms.kmod base-kernel-modules kmod
./@MODULEDIR@/itesio base-kernel-modules kmod
./@MODULEDIR@/itesio/itesio.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_nvme base-kernel-modules kmod
-./@MODULEDIR@/ld_nvme/ld_nvme.kmod base-kernel-modules kmod
+./@MODULEDIR@/ld_nvme base-obsolete obsolete
+./@MODULEDIR@/ld_nvme/ld_nvme.kmod base-obsolete obsolete
./@MODULEDIR@/lg3303 base-kernel-modules kmod
./@MODULEDIR@/lg3303/lg3303.kmod base-kernel-modules kmod
./@MODULEDIR@/lm base-kernel-modules kmod
@@ -121,16 +121,16 @@
./@MODULEDIR@/lm_wbsio/lm_wbsio.kmod base-kernel-modules kmod
./@MODULEDIR@/mach64drm base-kernel-modules kmod
./@MODULEDIR@/mach64drm/mach64drm.kmod base-kernel-modules kmod
-./@MODULEDIR@/mlx_eisa base-kernel-modules kmod
-./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod base-kernel-modules kmod
+./@MODULEDIR@/mlx_eisa base-obsolete obsolete
+./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod base-obsolete obsolete
./@MODULEDIR@/mgadrm base-kernel-modules kmod
./@MODULEDIR@/mgadrm/mgadrm.kmod base-kernel-modules kmod
./@MODULEDIR@/mt2131 base-kernel-modules kmod
./@MODULEDIR@/mt2131/mt2131.kmod base-kernel-modules kmod
./@MODULEDIR@/nsclpcsio base-kernel-modules kmod
./@MODULEDIR@/nsclpcsio/nsclpcsio.kmod base-kernel-modules kmod
-./@MODULEDIR@/nvme base-kernel-modules kmod
-./@MODULEDIR@/nvme/nvme.kmod base-kernel-modules kmod
+./@MODULEDIR@/nvme base-obsolete obsolete
+./@MODULEDIR@/nvme/nvme.kmod base-obsolete obsolete
./@MODULEDIR@/nxt2k base-kernel-modules kmod
./@MODULEDIR@/nxt2k/nxt2k.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.prep
diff -u src/distrib/sets/lists/modules/md.prep:1.1 src/distrib/sets/lists/modules/md.prep:1.2
--- src/distrib/sets/lists/modules/md.prep:1.1 Tue Sep 27 04:00:33 2016
+++ src/distrib/sets/lists/modules/md.prep Tue Sep 27 20:52:43 2016
@@ -1,5 +1,5 @@
-# $NetBSD: md.prep,v 1.1 2016/09/27 04:00:33 pgoyette Exp $
-./@MODULEDIR@/cac_eisa base-kernel-modules kmod
-./@MODULEDIR@/cac_eisa/cac_eisa.kmod base-kernel-modules kmod
-./@MODULEDIR@/mlx_eisa base-kernel-modules kmod
-./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod base-kernel-modules kmod
+# $NetBSD: md.prep,v 1.2 2016/09/27 20:52:43 pgoyette Exp $
+./@MODULEDIR@/cac_eisa base-obsolete obsolete
+./@MODULEDIR@/cac_eisa/cac_eisa.kmod base-obsolete obsolete
+./@MODULEDIR@/mlx_eisa base-obsolete obsolete
+./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod base-obsolete obsolete
Index: src/distrib/sets/lists/modules/md.sgimips
diff -u src/distrib/sets/lists/modules/md.sgimips:1.1 src/distrib/sets/lists/modules/md.sgimips:1.2
--- src/distrib/sets/lists/modules/md.sgimips:1.1 Tue Sep 27 04:00:33 2016
+++ src/distrib/sets/lists/modules/md.sgimips Tue Sep 27 20:52:43 2016
@@ -1,5 +1,5 @@
-# $NetBSD: md.sgimips,v 1.1 2016/09/27 04:00:33 pgoyette Exp $
-./@MODULEDIR@/cac_eisa base-kernel-modules kmod
-./@MODULEDIR@/cac_eisa/cac_eisa.kmod base-kernel-modules kmod
-./@MODULEDIR@/mlx_eisa base-kernel-modules kmod
-./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod base-kernel-modules kmod
+# $NetBSD: md.sgimips,v 1.2 2016/09/27 20:52:43 pgoyette Exp $
+./@MODULEDIR@/cac_eisa base-obsolete obsolete
+./@MODULEDIR@/cac_eisa/cac_eisa.kmod base-obsolete obsolete
+./@MODULEDIR@/mlx_eisa base-obsolete obsolete
+./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod base-obsolete obsolete
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.97 src/distrib/sets/lists/modules/mi:1.98
--- src/distrib/sets/lists/modules/mi:1.97 Tue Sep 27 04:00:33 2016
+++ src/distrib/sets/lists/modules/mi Tue Sep 27 20:52:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.97 2016/09/27 04:00:33 pgoyette Exp $
+# $NetBSD: mi,v 1.98 2016/09/27 20:52:43 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -10,8 +10,8 @@
# Sorry for any inconvenience this may cause, the management.
#
./@MODULEDIR@ base-kernel-modules kmod
-./@MODULEDIR@/aac base-kernel-modules kmod
-./@MODULEDIR@/aac/aac.kmod base-kernel-modules kmod
+./@MODULEDIR@/aac base-obsolete obsolete
+./@MODULEDIR@/aac/aac.kmod base-obsolete obsolete
./@MODULEDIR@/accf_dataready base-kernel-modules kmod
./@MODULEDIR@/accf_dataready/accf_dataready.kmod base-kernel-modules kmod
./@MODULEDIR@/accf_httpready base-kernel-modules kmod
@@ -20,20 +20,20 @@
./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules kmod
./@MODULEDIR@/aio base-kernel-modules kmod
./@MODULEDIR@/aio/aio.kmod base-kernel-modules kmod
-./@MODULEDIR@/amr base-kernel-modules kmod
-./@MODULEDIR@/amr/amr.kmod base-kernel-modules kmod
-./@MODULEDIR@/ataraid base-kernel-modules kmod
-./@MODULEDIR@/ataraid/ataraid.kmod base-kernel-modules kmod
+./@MODULEDIR@/amr base-obsolete obsolete
+./@MODULEDIR@/amr/amr.kmod base-obsolete obsolete
+./@MODULEDIR@/ataraid base-obsolete obsolete
+./@MODULEDIR@/ataraid/ataraid.kmod base-obsolete obsolete
./@MODULEDIR@/blowfish base-kernel-modules kmod
./@MODULEDIR@/blowfish/blowfish.kmod base-kernel-modules kmod
./@MODULEDIR@/bpf base-kernel-modules kmod
./@MODULEDIR@/bpf/bpf.kmod base-kernel-modules kmod
./@MODULEDIR@/bpf_filter base-kernel-modules kmod
./@MODULEDIR@/bpf_filter/bpf_filter.kmod base-kernel-modules kmod
-./@MODULEDIR@/cac base-kernel-modules kmod
-./@MODULEDIR@/cac/cac.kmod base-kernel-modules kmod
-./@MODULEDIR@/cac_pci base-kernel-modules kmod
-./@MODULEDIR@/cac_pci/cac_pci.kmod base-kernel-modules kmod
+./@MODULEDIR@/cac base-obsolete obsolete
+./@MODULEDIR@/cac/cac.kmod base-obsolete obsolete
+./@MODULEDIR@/cac_pci base-obsolete obsolete
+./@MODULEDIR@/cac_pci/cac_pci.kmod base-obsolete obsolete
./@MODULEDIR@/camellia base-kernel-modules kmod
./@MODULEDIR@/camellia/camellia.kmod base-kernel-modules kmod
./@MODULEDIR@/cast128 base-kernel-modules kmod
@@ -164,8 +164,8 @@
./@MODULEDIR@/if_strip/if_strip.kmod base-kernel-modules kmod
./@MODULEDIR@/if_tun base-kernel-modules kmod
./@MODULEDIR@/if_tun/if_tun.kmod base-kernel-modules kmod
-./@MODULEDIR@/if_vioif base-kernel-modules kmod
-./@MODULEDIR@/if_vioif/if_vioif.kmod base-kernel-modules kmod
+./@MODULEDIR@/if_vioif base-obsolete obsolete
+./@MODULEDIR@/if_vioif/if_vioif.kmod base-obsolete obsolete
./@MODULEDIR@/if_vlan base-kernel-modules kmod
./@MODULEDIR@/if_vlan/if_vlan.kmod base-kernel-modules kmod
./@MODULEDIR@/iic base-kernel-modules kmod
@@ -180,28 +180,28 @@
./@MODULEDIR@/ksem/ksem.kmod base-obsolete obsolete
./@MODULEDIR@/layerfs base-kernel-modules kmod
./@MODULEDIR@/layerfs/layerfs.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld base-kernel-modules kmod
-./@MODULEDIR@/ld/ld.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_aac base-kernel-modules kmod
-./@MODULEDIR@/ld_aac/ld_aac.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_amr base-kernel-modules kmod
-./@MODULEDIR@/ld_amr/ld_amr.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_ataraid base-kernel-modules kmod
-./@MODULEDIR@/ld_ataraid/ld_ataraid.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_cac base-kernel-modules kmod
-./@MODULEDIR@/ld_cac/ld_cac.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_icp base-kernel-modules kmod
-./@MODULEDIR@/ld_icp/ld_icp.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_mlx base-kernel-modules kmod
-./@MODULEDIR@/ld_mlx/ld_mlx.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_sdmmc base-kernel-modules kmod
-./@MODULEDIR@/ld_sdmmc/ld_sdmmc.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_twa base-kernel-modules kmod
-./@MODULEDIR@/ld_twa/ld_twa.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_twe base-kernel-modules kmod
-./@MODULEDIR@/ld_twe/ld_twe.kmod base-kernel-modules kmod
-./@MODULEDIR@/ld_virtio base-kernel-modules kmod
-./@MODULEDIR@/ld_virtio/ld_virtio.kmod base-kernel-modules kmod
+./@MODULEDIR@/ld base-obsolete obsolete
+./@MODULEDIR@/ld/ld.kmod base-obsolete obsolete
+./@MODULEDIR@/ld_aac base-obsolete obsolete
+./@MODULEDIR@/ld_aac/ld_aac.kmod base-obsolete obsolete
+./@MODULEDIR@/ld_amr base-obsolete obsolete
+./@MODULEDIR@/ld_amr/ld_amr.kmod base-obsolete obsolete
+./@MODULEDIR@/ld_ataraid base-obsolete obsolete
+./@MODULEDIR@/ld_ataraid/ld_ataraid.kmod base-obsolete obsolete
+./@MODULEDIR@/ld_cac base-obsolete obsolete
+./@MODULEDIR@/ld_cac/ld_cac.kmod base-obsolete obsolete
+./@MODULEDIR@/ld_icp base-obsolete obsolete
+./@MODULEDIR@/ld_icp/ld_icp.kmod base-obsolete obsolete
+./@MODULEDIR@/ld_mlx base-obsolete obsolete
+./@MODULEDIR@/ld_mlx/ld_mlx.kmod base-obsolete obsolete
+./@MODULEDIR@/ld_sdmmc base-obsolete obsolete
+./@MODULEDIR@/ld_sdmmc/ld_sdmmc.kmod base-obsolete obsolete
+./@MODULEDIR@/ld_twa base-obsolete obsolete
+./@MODULEDIR@/ld_twa/ld_twa.kmod base-obsolete obsolete
+./@MODULEDIR@/ld_twe base-obsolete obsolete
+./@MODULEDIR@/ld_twe/ld_twe.kmod base-obsolete obsolete
+./@MODULEDIR@/ld_virtio base-obsolete obsolete
+./@MODULEDIR@/ld_virtio/ld_virtio.kmod base-obsolete obsolete
./@MODULEDIR@/lfs base-kernel-modules kmod
./@MODULEDIR@/lfs/lfs.kmod base-kernel-modules kmod
./@MODULEDIR@/lua base-kernel-modules kmod
@@ -218,8 +218,8 @@
./@MODULEDIR@/miiverbose/miiverbose.kmod base-kernel-modules kmod
./@MODULEDIR@/miniroot base-kernel-modules kmod
./@MODULEDIR@/miniroot/miniroot.kmod base-kernel-modules kmod
-./@MODULEDIR@/mlx base-kernel-modules kmod
-./@MODULEDIR@/mlx/mlx.kmod base-kernel-modules kmod
+./@MODULEDIR@/mlx base-obsolete obsolete
+./@MODULEDIR@/mlx/mlx.kmod base-obsolete obsolete
./@MODULEDIR@/mlx_pci base-kernel-modules kmod
./@MODULEDIR@/mlx_pci/mlx_pci.kmod base-kernel-modules kmod
./@MODULEDIR@/mqueue base-kernel-modules kmod
@@ -334,10 +334,10 @@
./@MODULEDIR@/tprof/tprof.kmod base-kernel-modules kmod
./@MODULEDIR@/tun base-kernel-modules kmod
./@MODULEDIR@/tun/tun.kmod base-kernel-modules kmod
-./@MODULEDIR@/twa base-kernel-modules kmod
-./@MODULEDIR@/twa/twa.kmod base-kernel-modules kmod
-./@MODULEDIR@/twe base-kernel-modules kmod
-./@MODULEDIR@/twe/twe.kmod base-kernel-modules kmod
+./@MODULEDIR@/twa base-obsolete obsolete
+./@MODULEDIR@/twa/twa.kmod base-obsolete obsolete
+./@MODULEDIR@/twe base-obsolete obsolete
+./@MODULEDIR@/twe/twe.kmod base-obsolete obsolete
./@MODULEDIR@/uatp base-kernel-modules kmod
./@MODULEDIR@/uatp/uatp.kmod base-kernel-modules kmod
./@MODULEDIR@/udf base-kernel-modules kmod
@@ -352,10 +352,10 @@
./@MODULEDIR@/v7fs/v7fs.kmod base-kernel-modules kmod
./@MODULEDIR@/vcoda base-kernel-modules kmod
./@MODULEDIR@/vcoda/vcoda.kmod base-kernel-modules kmod
-./@MODULEDIR@/viomb base-kernel-modules kmod
-./@MODULEDIR@/viomb/viomb.kmod base-kernel-modules kmod
-./@MODULEDIR@/virtio base-kernel-modules kmod
-./@MODULEDIR@/virtio/virtio.kmod base-kernel-modules kmod
+./@MODULEDIR@/viomb base-obsolete obsolete
+./@MODULEDIR@/viomb/viomb.kmod base-obsolete obsolete
+./@MODULEDIR@/virtio base-obsolete obsolete
+./@MODULEDIR@/virtio/virtio.kmod base-obsolete obsolete
./@MODULEDIR@/vnd base-kernel-modules kmod
./@MODULEDIR@/vnd/vnd.kmod base-kernel-modules kmod
./@MODULEDIR@/wapbl base-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.178 src/sys/modules/Makefile:1.179
--- src/sys/modules/Makefile:1.178 Tue Sep 27 03:53:06 2016
+++ src/sys/modules/Makefile Tue Sep 27 20:52:43 2016
@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.178 2016/09/27 03:53:06 pgoyette Exp $
+# $NetBSD: Makefile,v 1.179 2016/09/27 20:52:43 pgoyette Exp $
.include <bsd.own.mk>
# For all platforms
-SUBDIR= aac
-SUBDIR+= accf_dataready
+SUBDIR= accf_dataready
SUBDIR+= accf_httpready
SUBDIR+= adosfs
SUBDIR+= aio
-SUBDIR+= amr
-SUBDIR+= ataraid
SUBDIR+= blowfish
SUBDIR+= bpf
SUBDIR+= bpf_filter
-SUBDIR+= cac
-SUBDIR+= cac_pci
SUBDIR+= camellia
SUBDIR+= cast128
SUBDIR+= ccd
@@ -67,23 +62,11 @@ SUBDIR+= if_srt
SUBDIR+= if_stf
SUBDIR+= if_strip
SUBDIR+= if_tun tun
-SUBDIR+= if_vioif
SUBDIR+= if_vlan
SUBDIR+= iic
SUBDIR+= ipl
SUBDIR+= kernfs
SUBDIR+= layerfs
-SUBDIR+= ld
-SUBDIR+= ld_aac
-SUBDIR+= ld_amr
-SUBDIR+= ld_ataraid
-SUBDIR+= ld_cac
-SUBDIR+= ld_icp
-SUBDIR+= ld_mlx
-SUBDIR+= ld_sdmmc
-SUBDIR+= ld_twa
-SUBDIR+= ld_twe
-SUBDIR+= ld_virtio
SUBDIR+= lfs
SUBDIR+= lua
SUBDIR+= luasystm
@@ -91,8 +74,6 @@ SUBDIR+= luapmf
SUBDIR+= mfs
SUBDIR+= miiverbose
SUBDIR+= miniroot
-SUBDIR+= mlx
-SUBDIR+= mlx_pci
SUBDIR+= mqueue
SUBDIR+= msdos
SUBDIR+= nand
@@ -142,16 +123,12 @@ SUBDIR+= swcrypto
SUBDIR+= swsensor
SUBDIR+= swwdog
SUBDIR+= tmpfs
-SUBDIR+= twa
-SUBDIR+= twe
SUBDIR+= uatp
SUBDIR+= udf
SUBDIR+= umap
SUBDIR+= union
SUBDIR+= usbverbose
SUBDIR+= vcoda
-SUBDIR+= viomb
-SUBDIR+= virtio
SUBDIR+= v7fs
SUBDIR+= vnd
SUBDIR+= wapbl
@@ -206,8 +183,6 @@ SUBDIR+= vmt
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
SUBDIR+= ubsec # Builds on architectures with PCI bus
-SUBDIR+= ld_nvme
-SUBDIR+= nvme
.endif
.if ${MKSLJIT} != "no"
@@ -328,18 +303,6 @@ SUBDIR+= compat_aoutm68k
SUBDIR+= pwdog
.endif
-#
-# eisa bus modules
-#
-.if ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_ARCH} == "alpha" || \
- ${MACHINE_ARCH} == "hppa" || \
- ${MACHINE_ARCH} == "prep" || \
- ${MACHINE_ARCH} == "sgimips"
-SUBDIR+= cac_eisa
-SUBDIR+= mlx_eisa
-.endif
-
.include <bsd.own.mk>
#
@@ -401,6 +364,40 @@ SUBDIR+= spkr
SUBDIR+= iscsi
.endif
+# For now, all of these are disabled, pending resolution of how to deal
+# with attachment-specific modules and bus-specific modules (as opposed
+# to machine- or architecture-specific modules)
+
+.if 0
+SUBDIR+= aac
+SUBDIR+= amr
+SUBDIR+= ataraid
+SUBDIR+= cac
+SUBDIR+= cac_eisa
+SUBDIR+= cac_pci
+SUBDIR+= if_vioif
+SUBDIR+= ld
+SUBDIR+= ld_aac
+SUBDIR+= ld_amr
+SUBDIR+= ld_ataraid
+SUBDIR+= ld_cac
+SUBDIR+= ld_icp
+SUBDIR+= ld_mlx
+SUBDIR+= ld_sdmmc
+SUBDIR+= ld_twa
+SUBDIR+= ld_twe
+SUBDIR+= ld_virtio
+SUBDIR+= mlx
+SUBDIR+= mlx_eisa
+SUBDIR+= mlx_pci
+SUBDIR+= ld_nvme
+SUBDIR+= nvme
+SUBDIR+= twa
+SUBDIR+= twe
+SUBDIR+= viomb
+SUBDIR+= virtio
+.endif
+
SUBDIR+= examples # build these regularly to avoid bit-rot
.include <bsd.subdir.mk>
