Module Name: src
Committed By: pgoyette
Date: Wed Sep 12 21:46:09 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: files.common
src/sys/modules [pgoyette-compat]: Makefile
Removed Files:
src/sys/compat/common [pgoyette-compat]: compat_sysv_mod.c
src/sys/modules/compat_sysv [pgoyette-compat]: Makefile
Log Message:
Complete removal of the "monolithic" all-version compat_sysvipc module
To generate a diff of this commit:
cvs rdiff -u -r1.4.10.4 -r0 src/sys/compat/common/compat_sysv_mod.c
cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/sys/compat/common/files.common
cvs rdiff -u -r1.202.2.32 -r1.202.2.33 src/sys/modules/Makefile
cvs rdiff -u -r1.3.10.5 -r0 src/sys/modules/compat_sysv/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/files.common
diff -u src/sys/compat/common/files.common:1.1.2.34 src/sys/compat/common/files.common:1.1.2.35
--- src/sys/compat/common/files.common:1.1.2.34 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/files.common Wed Sep 12 21:46:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.common,v 1.1.2.34 2018/09/10 08:41:47 pgoyette Exp $
+# $NetBSD: files.common,v 1.1.2.35 2018/09/12 21:46:09 pgoyette Exp $
#
# Generic files, used by all compat options.
@@ -108,20 +108,25 @@ file compat/common/kern_mod_80.c compat
# Module interface for sysv ipc compatability options
-define compat_sysv : sysvmsg, sysvshm, sysvsem
-file compat/common/compat_sysv_mod.c compat_sysv
-
# Compatibility code for NetBSD 1.0
-file compat/common/kern_ipc_10.c compat_sysv
+file compat/common/compat_sysv_10_mod.c compat_10 &
+ (sysvmsg | sysvshm | sysvsem)
+file compat/common/kern_ipc_10.c compat_10 &
+ (sysvmsg | sysvshm | sysvsem)
# Compatibility code for NetBSD 1.4
-file compat/common/sysv_msg_14.c compat_sysv
-file compat/common/sysv_sem_14.c compat_sysv
-file compat/common/sysv_shm_14.c compat_sysv
+file compat/common/compat_sysv_14_mod.c compat_14 &
+ (sysvmsg | sysvshm | sysvsem)
+file compat/common/sysv_msg_14.c compat_14 & sysvmsg
+file compat/common/sysv_sem_14.c compat_14 & sysvsem
+file compat/common/sysv_shm_14.c compat_14 & sysvshm
# Compatibility code for NetBSD 5.0
-file compat/common/sysv_ipc_50.c compat_sysv
-file compat/common/sysv_msg_50.c compat_sysv
-file compat/common/sysv_sem_50.c compat_sysv
-file compat/common/sysv_shm_50.c compat_sysv
+file compat/common/compat_sysv_50_mod.c compat_50 &
+ (sysvmsg | sysvshm | sysvsem)
+file compat/common/sysv_ipc_50.c compat_50 &
+ (sysvmsg | sysvshm | sysvsem)
+file compat/common/sysv_msg_50.c compat_50 & sysvmsg
+file compat/common/sysv_sem_50.c compat_50 & sysvsem
+file compat/common/sysv_shm_50.c compat_50 & sysvshm
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.32 src/sys/modules/Makefile:1.202.2.33
--- src/sys/modules/Makefile:1.202.2.32 Wed Sep 12 04:35:22 2018
+++ src/sys/modules/Makefile Wed Sep 12 21:46:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.32 2018/09/12 04:35:22 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.33 2018/09/12 21:46:08 pgoyette Exp $
.include <bsd.own.mk>
@@ -6,14 +6,12 @@
# Modules for compatability with earlier versions of NetBSD
-#SUBDIR+= compat
SUBDIR+= compat_util
SUBDIR+= compat_43 compat_sysctl_09_43
SUBDIR+= compat_09 compat_10 compat_12 compat_13 compat_14
SUBDIR+= compat_16 compat_20 compat_30 compat_40 compat_50
SUBDIR+= compat_60 compat_70 compat_80
-#SUBDIR+= compat_sysv
SUBDIR+= compat_sysv_10 compat_sysv_14 compat_sysv_50
SUBDIR+= accf_dataready
