Module Name: src
Committed By: pooka
Date: Mon Aug 24 22:52:15 UTC 2015
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/include/opt: opt_rumpkernel.h
Added Files:
src/sys/rump/include/opt: config_file.h ksyms.h veriexec.h
Removed Files:
src/sys/rump/librump/rumpkern/opt: config_file.h ksyms.h opt_bufcache.h
opt_compat_43.h opt_compat_netbsd.h opt_ddb.h opt_defcorename.h
opt_dump.h opt_fileassoc.h opt_hz.h opt_ipkdb.h opt_kgdb.h
opt_ktrace.h opt_lockdebug.h opt_magiclinks.h opt_modular.h
opt_multiprocessor.h opt_nmbclusters.h opt_pool.h opt_poollog.h
opt_ptrace.h opt_revcache.h opt_rnd_printf.h opt_rtc_offset.h
opt_sysv.h opt_sysvparam.h opt_uvmhist.h veriexec.h
Log Message:
Remove individual opt_foo.h files, continue consolidating to opt_rumpkernel.h
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/rump/Makefile.rump
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/config_file.h \
src/sys/rump/include/opt/ksyms.h src/sys/rump/include/opt/veriexec.h
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/include/opt/opt_rumpkernel.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpkern/opt/config_file.h \
src/sys/rump/librump/rumpkern/opt/opt_bufcache.h \
src/sys/rump/librump/rumpkern/opt/opt_compat_43.h \
src/sys/rump/librump/rumpkern/opt/opt_compat_netbsd.h \
src/sys/rump/librump/rumpkern/opt/opt_defcorename.h \
src/sys/rump/librump/rumpkern/opt/opt_dump.h \
src/sys/rump/librump/rumpkern/opt/opt_fileassoc.h \
src/sys/rump/librump/rumpkern/opt/opt_hz.h \
src/sys/rump/librump/rumpkern/opt/opt_ipkdb.h \
src/sys/rump/librump/rumpkern/opt/opt_kgdb.h \
src/sys/rump/librump/rumpkern/opt/opt_ktrace.h \
src/sys/rump/librump/rumpkern/opt/opt_lockdebug.h \
src/sys/rump/librump/rumpkern/opt/opt_magiclinks.h \
src/sys/rump/librump/rumpkern/opt/opt_nmbclusters.h \
src/sys/rump/librump/rumpkern/opt/opt_pool.h \
src/sys/rump/librump/rumpkern/opt/opt_poollog.h \
src/sys/rump/librump/rumpkern/opt/opt_ptrace.h \
src/sys/rump/librump/rumpkern/opt/opt_revcache.h \
src/sys/rump/librump/rumpkern/opt/opt_rtc_offset.h \
src/sys/rump/librump/rumpkern/opt/opt_sysv.h \
src/sys/rump/librump/rumpkern/opt/opt_sysvparam.h \
src/sys/rump/librump/rumpkern/opt/opt_uvmhist.h \
src/sys/rump/librump/rumpkern/opt/veriexec.h
cvs rdiff -u -r1.3 -r0 src/sys/rump/librump/rumpkern/opt/ksyms.h
cvs rdiff -u -r1.2 -r0 src/sys/rump/librump/rumpkern/opt/opt_ddb.h \
src/sys/rump/librump/rumpkern/opt/opt_modular.h \
src/sys/rump/librump/rumpkern/opt/opt_multiprocessor.h \
src/sys/rump/librump/rumpkern/opt/opt_rnd_printf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.117 src/sys/rump/Makefile.rump:1.118
--- src/sys/rump/Makefile.rump:1.117 Mon Aug 24 22:31:33 2015
+++ src/sys/rump/Makefile.rump Mon Aug 24 22:52:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.117 2015/08/24 22:31:33 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.118 2015/08/24 22:52:15 pooka Exp $
#
.if !defined(_RUMP_MK)
@@ -54,7 +54,6 @@ CPPFLAGS+= -I${.CURDIR} -I.
CPPFLAGS+= -I${RUMPTOP}/../../common/include
CPPFLAGS+= -I${RUMPTOP}/include
CPPFLAGS+= -I${RUMPTOP}/include/opt
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern/opt
SHLIB_MAJOR?= 0
SHLIB_MINOR?= 0
Index: src/sys/rump/include/opt/opt_rumpkernel.h
diff -u src/sys/rump/include/opt/opt_rumpkernel.h:1.2 src/sys/rump/include/opt/opt_rumpkernel.h:1.3
--- src/sys/rump/include/opt/opt_rumpkernel.h:1.2 Mon Aug 24 22:25:50 2015
+++ src/sys/rump/include/opt/opt_rumpkernel.h Mon Aug 24 22:52:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_rumpkernel.h,v 1.2 2015/08/24 22:25:50 pooka Exp $ */
+/* $NetBSD: opt_rumpkernel.h,v 1.3 2015/08/24 22:52:15 pooka Exp $ */
#ifndef __NetBSD__
#define __NetBSD__
@@ -13,6 +13,9 @@
#define DEBUGPRINT
+#define DEFCORENAME "rumpdump"
+#define DUMP_ON_PANIC 0
+
#define INET 1
#define INET6 1
#define GATEWAY 1
Added files:
Index: src/sys/rump/include/opt/config_file.h
diff -u /dev/null src/sys/rump/include/opt/config_file.h:1.1
--- /dev/null Mon Aug 24 22:52:15 2015
+++ src/sys/rump/include/opt/config_file.h Mon Aug 24 22:52:15 2015
@@ -0,0 +1 @@
+/* $NetBSD: config_file.h,v 1.1 2015/08/24 22:52:15 pooka Exp $ */
Index: src/sys/rump/include/opt/ksyms.h
diff -u /dev/null src/sys/rump/include/opt/ksyms.h:1.1
--- /dev/null Mon Aug 24 22:52:15 2015
+++ src/sys/rump/include/opt/ksyms.h Mon Aug 24 22:52:15 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: ksyms.h,v 1.1 2015/08/24 22:52:15 pooka Exp $ */
+
+#define NKSYMS 0
Index: src/sys/rump/include/opt/veriexec.h
diff -u /dev/null src/sys/rump/include/opt/veriexec.h:1.1
--- /dev/null Mon Aug 24 22:52:15 2015
+++ src/sys/rump/include/opt/veriexec.h Mon Aug 24 22:52:15 2015
@@ -0,0 +1 @@
+/* $NetBSD: veriexec.h,v 1.1 2015/08/24 22:52:15 pooka Exp $ */
