Module Name: src Committed By: maya Date: Sat Sep 25 17:55:37 UTC 2021
Modified Files: src/distrib/sets/lists/debug: module.md.amd64 module.md.i386 src/distrib/sets/lists/modules: md.amd64 md.i386 src/sys/modules: Makefile Log Message: Disable drmkms module builds. They haven't been functional (and won't be before fixing genfb abi). In a new drm update, we haven't prioritized fixing the build either. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug/module.md.amd64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug/module.md.i386 cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.255 -r1.256 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/debug/module.md.amd64 diff -u src/distrib/sets/lists/debug/module.md.amd64:1.5 src/distrib/sets/lists/debug/module.md.amd64:1.6 --- src/distrib/sets/lists/debug/module.md.amd64:1.5 Thu Mar 25 21:37:10 2021 +++ src/distrib/sets/lists/debug/module.md.amd64 Sat Sep 25 17:55:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: module.md.amd64,v 1.5 2021/03/25 21:37:10 nia Exp $ +# $NetBSD: module.md.amd64,v 1.6 2021/09/25 17:55:37 maya Exp $ ./usr/libdata/debug/@MODULEDIR@/acpiacad modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpibat modules-base-kernel kmod,debug @@ -105,14 +105,14 @@ ./usr/libdata/debug/@MODULEDIR@/cxdtv/cxdtv.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/drm modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/drm/drm.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/drmkms modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-obsolete obsolete ./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux modules-base-kernel kmod,dtrace,debug ./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux/dtrace_syscall_linux.kmod.debug modules-base-kernel kmod,dtrace,debug ./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux32 modules-base-kernel kmod,dtrace,debug @@ -149,8 +149,8 @@ ./usr/libdata/debug/@MODULEDIR@/hpqlb/hpqlb.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/i915drm modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/i915drm/i915drm.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-obsolete obsolete ./usr/libdata/debug/@MODULEDIR@/ichsmb modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/ichsmb/ichsmb.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/if_iavf modules-base-kernel kmod,debug Index: src/distrib/sets/lists/debug/module.md.i386 diff -u src/distrib/sets/lists/debug/module.md.i386:1.3 src/distrib/sets/lists/debug/module.md.i386:1.4 --- src/distrib/sets/lists/debug/module.md.i386:1.3 Thu Mar 25 21:37:10 2021 +++ src/distrib/sets/lists/debug/module.md.i386 Sat Sep 25 17:55:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: module.md.i386,v 1.3 2021/03/25 21:37:10 nia Exp $ +# $NetBSD: module.md.i386,v 1.4 2021/09/25 17:55:37 maya Exp $ ./usr/libdata/debug/@MODULEDIR@/acpiacad modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpibat modules-base-kernel kmod,debug @@ -59,14 +59,14 @@ ./usr/libdata/debug/@MODULEDIR@/cxdtv/cxdtv.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/drm modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/drm/drm.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/drmkms modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-obsolete obsolete ./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux modules-base-kernel kmod,dtrace,debug ./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux/dtrace_syscall_linux.kmod.debug modules-base-kernel kmod,dtrace,debug ./usr/libdata/debug/@MODULEDIR@/emdtv modules-base-kernel kmod,debug @@ -99,8 +99,8 @@ ./usr/libdata/debug/@MODULEDIR@/hpqlb/hpqlb.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/i915drm modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/i915drm/i915drm.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-obsolete obsolete ./usr/libdata/debug/@MODULEDIR@/ichsmb modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/ichsmb/ichsmb.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/if_iavf modules-base-kernel kmod,debug Index: src/distrib/sets/lists/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.92 src/distrib/sets/lists/modules/md.amd64:1.93 --- src/distrib/sets/lists/modules/md.amd64:1.92 Thu Mar 25 09:49:00 2021 +++ src/distrib/sets/lists/modules/md.amd64 Sat Sep 25 17:55:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.92 2021/03/25 09:49:00 nia Exp $ +# $NetBSD: md.amd64,v 1.93 2021/09/25 17:55:37 maya Exp $ # ./@MODULEDIR@/acpiacad modules-base-kernel kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod @@ -112,14 +112,14 @@ ./@MODULEDIR@/cxdtv/cxdtv.kmod modules-base-kernel kmod ./@MODULEDIR@/drm modules-base-kernel kmod ./@MODULEDIR@/drm/drm.kmod modules-base-kernel kmod -./@MODULEDIR@/drmkms modules-base-kernel kmod -./@MODULEDIR@/drmkms/drmkms.kmod modules-base-kernel kmod -./@MODULEDIR@/drmkms_agp modules-base-kernel kmod -./@MODULEDIR@/drmkms_agp/drmkms_agp.kmod modules-base-kernel kmod -./@MODULEDIR@/drmkms_linux modules-base-kernel kmod -./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod modules-base-kernel kmod -./@MODULEDIR@/drmkms_pci modules-base-kernel kmod -./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod modules-base-kernel kmod +./@MODULEDIR@/drmkms modules-obsolete obsolete +./@MODULEDIR@/drmkms/drmkms.kmod modules-obsolete obsolete +./@MODULEDIR@/drmkms_agp modules-obsolete obsolete +./@MODULEDIR@/drmkms_agp/drmkms_agp.kmod modules-obsolete obsolete +./@MODULEDIR@/drmkms_linux modules-obsolete obsolete +./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod modules-obsolete obsolete +./@MODULEDIR@/drmkms_pci modules-obsolete obsolete +./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod modules-obsolete obsolete ./@MODULEDIR@/dtrace_syscall_linux modules-base-kernel kmod,dtrace ./@MODULEDIR@/dtrace_syscall_linux/dtrace_syscall_linux.kmod modules-base-kernel kmod,dtrace ./@MODULEDIR@/dtrace_syscall_linux32 modules-base-kernel kmod,dtrace @@ -156,8 +156,8 @@ ./@MODULEDIR@/hpqlb/hpqlb.kmod modules-base-kernel kmod ./@MODULEDIR@/i915drm modules-base-kernel kmod ./@MODULEDIR@/i915drm/i915drm.kmod modules-base-kernel kmod -./@MODULEDIR@/i915drmkms modules-base-kernel kmod -./@MODULEDIR@/i915drmkms/i915drmkms.kmod modules-base-kernel kmod +./@MODULEDIR@/i915drmkms modules-obsolete obsolete +./@MODULEDIR@/i915drmkms/i915drmkms.kmod modules-obsolete obsolete ./@MODULEDIR@/ichsmb modules-base-kernel kmod ./@MODULEDIR@/ichsmb/ichsmb.kmod modules-base-kernel kmod ./@MODULEDIR@/if_iavf modules-base-kernel kmod Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.90 src/distrib/sets/lists/modules/md.i386:1.91 --- src/distrib/sets/lists/modules/md.i386:1.90 Thu Mar 25 09:49:00 2021 +++ src/distrib/sets/lists/modules/md.i386 Sat Sep 25 17:55:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.90 2021/03/25 09:49:00 nia Exp $ +# $NetBSD: md.i386,v 1.91 2021/09/25 17:55:37 maya Exp $ # ./@MODULEDIR@/acpiacad modules-base-kernel kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod @@ -68,14 +68,14 @@ ./@MODULEDIR@/cxdtv/cxdtv.kmod modules-base-kernel kmod ./@MODULEDIR@/drm modules-base-kernel kmod ./@MODULEDIR@/drm/drm.kmod modules-base-kernel kmod -./@MODULEDIR@/drmkms modules-base-kernel kmod -./@MODULEDIR@/drmkms/drmkms.kmod modules-base-kernel kmod -./@MODULEDIR@/drmkms_agp modules-base-kernel kmod -./@MODULEDIR@/drmkms_agp/drmkms_agp.kmod modules-base-kernel kmod -./@MODULEDIR@/drmkms_linux modules-base-kernel kmod -./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod modules-base-kernel kmod -./@MODULEDIR@/drmkms_pci modules-base-kernel kmod -./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod modules-base-kernel kmod +./@MODULEDIR@/drmkms modules-obsolete obsolete +./@MODULEDIR@/drmkms/drmkms.kmod modules-obsolete obsolete +./@MODULEDIR@/drmkms_agp modules-obsolete obsolete +./@MODULEDIR@/drmkms_agp/drmkms_agp.kmod modules-obsolete obsolete +./@MODULEDIR@/drmkms_linux modules-obsolete obsolete +./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod modules-obsolete obsolete +./@MODULEDIR@/drmkms_pci modules-obsolete obsolete +./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod modules-obsolete obsolete ./@MODULEDIR@/dtrace_syscall_linux modules-base-kernel kmod,dtrace ./@MODULEDIR@/dtrace_syscall_linux/dtrace_syscall_linux.kmod modules-base-kernel kmod,dtrace ./@MODULEDIR@/emdtv modules-base-kernel kmod @@ -108,8 +108,8 @@ ./@MODULEDIR@/hpqlb/hpqlb.kmod modules-base-kernel kmod ./@MODULEDIR@/i915drm modules-base-kernel kmod ./@MODULEDIR@/i915drm/i915drm.kmod modules-base-kernel kmod -./@MODULEDIR@/i915drmkms modules-base-kernel kmod -./@MODULEDIR@/i915drmkms/i915drmkms.kmod modules-base-kernel kmod +./@MODULEDIR@/i915drmkms modules-obsolete obsolete +./@MODULEDIR@/i915drmkms/i915drmkms.kmod modules-obsolete obsolete ./@MODULEDIR@/ichsmb modules-base-kernel kmod ./@MODULEDIR@/ichsmb/ichsmb.kmod modules-base-kernel kmod ./@MODULEDIR@/if_iavf modules-base-kernel kmod Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.255 src/sys/modules/Makefile:1.256 --- src/sys/modules/Makefile:1.255 Sat Sep 11 16:10:37 2021 +++ src/sys/modules/Makefile Sat Sep 25 17:55:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.255 2021/09/11 16:10:37 pgoyette Exp $ +# $NetBSD: Makefile,v 1.256 2021/09/25 17:55:37 maya Exp $ .include <bsd.own.mk> @@ -341,12 +341,12 @@ SUBDIR+= viadrmums ${MACHINE_ARCH} == "x86_64" SUBDIR+= compat_linux SUBDIR+= drm -SUBDIR+= drmkms -SUBDIR+= drmkms_agp -SUBDIR+= drmkms_linux -SUBDIR+= drmkms_pci +#SUBDIR+= drmkms +#SUBDIR+= drmkms_agp +#SUBDIR+= drmkms_linux +#SUBDIR+= drmkms_pci SUBDIR+= i915drm -SUBDIR+= i915drmkms +#SUBDIR+= i915drmkms # # ISA modules #