Module Name: src
Committed By: pgoyette
Date: Sun Sep 23 21:38:08 UTC 2018
Modified Files:
src/distrib/sets/lists/modules [pgoyette-compat]: ad.arm ad.mips
md.amd64
src/sys/modules [pgoyette-compat]: Makefile
Log Message:
Reenable the compat_netbsd32 module. It is _NOT_ an all-version monolithic
module (as was compat_netbsd).
To generate a diff of this commit:
cvs rdiff -u -r1.10.12.7 -r1.10.12.8 src/distrib/sets/lists/modules/ad.arm
cvs rdiff -u -r1.10.12.6 -r1.10.12.7 src/distrib/sets/lists/modules/ad.mips
cvs rdiff -u -r1.75.2.9 -r1.75.2.10 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.202.2.37 -r1.202.2.38 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/ad.arm
diff -u src/distrib/sets/lists/modules/ad.arm:1.10.12.7 src/distrib/sets/lists/modules/ad.arm:1.10.12.8
--- src/distrib/sets/lists/modules/ad.arm:1.10.12.7 Sun Sep 23 07:16:41 2018
+++ src/distrib/sets/lists/modules/ad.arm Sun Sep 23 21:38:08 2018
@@ -1,7 +1,7 @@
-# $NetBSD: ad.arm,v 1.10.12.7 2018/09/23 07:16:41 pgoyette Exp $
+# $NetBSD: ad.arm,v 1.10.12.8 2018/09/23 21:38:08 pgoyette Exp $
-./@MODULEDIR@/compat_netbsd32 base-obsolete obsolete
-./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-obsolete obsolete
+./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod
+./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32_09 base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod base-kernel-modules kmod
#./@MODULEDIR@/compat_netbsd32_10 base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/ad.mips
diff -u src/distrib/sets/lists/modules/ad.mips:1.10.12.6 src/distrib/sets/lists/modules/ad.mips:1.10.12.7
--- src/distrib/sets/lists/modules/ad.mips:1.10.12.6 Sat Sep 22 11:41:35 2018
+++ src/distrib/sets/lists/modules/ad.mips Sun Sep 23 21:38:08 2018
@@ -1,6 +1,6 @@
-# $NetBSD: ad.mips,v 1.10.12.6 2018/09/22 11:41:35 pgoyette Exp $
-./@MODULEDIR@/compat_netbsd32 base-obsolete obsolete
-./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-obsolete obsolete
+# $NetBSD: ad.mips,v 1.10.12.7 2018/09/23 21:38:08 pgoyette Exp $
+./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod
+./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32_09 base-kernel-modules kmod,arch64,nocompatmodules
./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod base-kernel-modules kmod,arch64,nocompatmodules
#./@MODULEDIR@/compat_netbsd32_10 base-kernel-modules kmod,arch64,nocompatmodules
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.75.2.9 src/distrib/sets/lists/modules/md.amd64:1.75.2.10
--- src/distrib/sets/lists/modules/md.amd64:1.75.2.9 Sun Sep 23 03:50:12 2018
+++ src/distrib/sets/lists/modules/md.amd64 Sun Sep 23 21:38:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.75.2.9 2018/09/23 03:50:12 pgoyette Exp $
+# $NetBSD: md.amd64,v 1.75.2.10 2018/09/23 21:38:08 pgoyette Exp $
#
# NOTE that there are two sets of files here:
# @MODULEDIR@ and amd64-xen
@@ -53,8 +53,8 @@
./@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-obsolete obsolete
-./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-obsolete obsolete
+./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod
+./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32_09 base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod base-kernel-modules kmod
#./@MODULEDIR@/compat_netbsd32_10 base-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.37 src/sys/modules/Makefile:1.202.2.38
--- src/sys/modules/Makefile:1.202.2.37 Sun Sep 23 04:31:17 2018
+++ src/sys/modules/Makefile Sun Sep 23 21:38:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.37 2018/09/23 04:31:17 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.38 2018/09/23 21:38:08 pgoyette Exp $
.include <bsd.own.mk>
@@ -269,6 +269,7 @@ SUBDIR+= wmimsi
.if ${MACHINE_CPU} == "arm" \
|| (!empty(MACHINE_ARCH:Mmips64*) && !defined(BSD_MK_COMPAT_FILE))
+SUBDIR+= compat_netbsd32
SUBDIR+= compat_netbsd32_09 compat_netbsd32_12
SUBDIR+= compat_netbsd32_13 compat_netbsd32_16
SUBDIR+= compat_netbsd32_20 compat_netbsd32_30