Module Name: src
Committed By: pooka
Date: Thu Apr 23 14:49:26 UTC 2015
Modified Files:
src/sys/rump: Makefile.rump README.compileopts
src/sys/rump/dev/lib/libraidframe: Makefile
src/sys/rump/kern/lib/libtty: Makefile
src/sys/rump/librump/rumpkern: Makefile.rumpkern
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs
src/sys/rump/net/lib/libnet: Makefile
Log Message:
Rename RUMP_COMPAT to RUMP_NBCOMBAT to better signify what the
variable does.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/README.compileopts
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libraidframe/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/kern/lib/libtty/Makefile
cvs rdiff -u -r1.158 -r1.159 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.45 -r1.46 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
cvs rdiff -u -r1.22 -r1.23 src/sys/rump/net/lib/libnet/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/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.109 src/sys/rump/Makefile.rump:1.110
--- src/sys/rump/Makefile.rump:1.109 Thu Apr 23 14:39:03 2015
+++ src/sys/rump/Makefile.rump Thu Apr 23 14:49:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.109 2015/04/23 14:39:03 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.110 2015/04/23 14:49:26 pooka Exp $
#
.if !defined(_RUMP_MK)
@@ -29,13 +29,13 @@ CPPFLAGS+= -DMIPS1=1
.endif
.endif
-RUMP_COMPAT?= 60 70
-.if ${RUMP_COMPAT} == "all"
-RUMP_COMPAT= 50 60 70
+RUMP_NBCOMPAT?= 60 70
+.if ${RUMP_NBCOMPAT} == "all"
+RUMP_NBCOMPAT= 50 60 70
.endif
# normalize alternatively accepted comma-separated list
-RUMP_COMPAT:= ${RUMP_COMPAT:S/,/ /g}
-CPPFLAGS+= ${RUMP_COMPAT:C/[1-9]0/-DCOMPAT_&/g}
+RUMP_NBCOMPAT:= ${RUMP_NBCOMPAT:S/,/ /g}
+CPPFLAGS+= ${RUMP_NBCOMPAT:C/[1-9]0/-DCOMPAT_&/g}
CPPFLAGS+= -DMAXUSERS=32
Index: src/sys/rump/README.compileopts
diff -u src/sys/rump/README.compileopts:1.7 src/sys/rump/README.compileopts:1.8
--- src/sys/rump/README.compileopts:1.7 Thu Apr 23 14:39:03 2015
+++ src/sys/rump/README.compileopts Thu Apr 23 14:49:26 2015
@@ -1,4 +1,4 @@
- $NetBSD: README.compileopts,v 1.7 2015/04/23 14:39:03 pooka Exp $
+ $NetBSD: README.compileopts,v 1.8 2015/04/23 14:49:26 pooka Exp $
This file describes compile-time options for rump kernels. Additionally,
NetBSD build options will have an effect. See src/share/mk/bsd.README
@@ -77,13 +77,13 @@ effect: Control how curlwp is obtained i
register - use a dedicated register (implies -ffixed)
- RUMP_COMPAT
+ RUMP_NBCOMPAT
values: either a comma-separated list of releases (e.g. 50,60), or "all"
defval: two previous NetBSD releases; check Makefile.rump
-effect: Builds COMPAT_nn code for each of the elements in the list.
- This is only useful when building rump kernels for NetBSD
- userspace.
+effect: Builds NetBSD COMPAT_nn code for each of the elements in the list.
+ This option is useful only when building rump kernels for
+ NetBSD userspace, and an empty value may be supplied elsewhere.
================================================================================
Index: src/sys/rump/dev/lib/libraidframe/Makefile
diff -u src/sys/rump/dev/lib/libraidframe/Makefile:1.5 src/sys/rump/dev/lib/libraidframe/Makefile:1.6
--- src/sys/rump/dev/lib/libraidframe/Makefile:1.5 Wed Apr 22 17:57:49 2015
+++ src/sys/rump/dev/lib/libraidframe/Makefile Thu Apr 23 14:49:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/04/22 17:57:49 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2015/04/23 14:49:26 pooka Exp $
#
.include <bsd.init.mk>
@@ -25,7 +25,7 @@ SRCS= rf_acctrace.c rf_alloclist.c rf_
SRCS+= raidframe_component.c
-.if !empty(RUMP_COMPAT:M50)
+.if !empty(RUMP_NBCOMPAT:M50)
SRCS+= rf_compat50.c
.endif
Index: src/sys/rump/kern/lib/libtty/Makefile
diff -u src/sys/rump/kern/lib/libtty/Makefile:1.4 src/sys/rump/kern/lib/libtty/Makefile:1.5
--- src/sys/rump/kern/lib/libtty/Makefile:1.4 Wed Apr 22 17:57:49 2015
+++ src/sys/rump/kern/lib/libtty/Makefile Thu Apr 23 14:49:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/22 17:57:49 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/23 14:49:26 pooka Exp $
#
.include <bsd.init.mk>
@@ -10,7 +10,7 @@ LIB= rumpkern_tty
SRCS= tty.c tty_bsdpty.c tty_conf.c tty_ptm.c tty_pty.c tty_tty.c tty_subr.c
-.if !empty(RUMP_COMPAT:M60)
+.if !empty(RUMP_NBCOMPAT:M60)
SRCS+= tty_60.c
.endif
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.158 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.159
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.158 Thu Apr 23 06:39:19 2015
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Thu Apr 23 14:49:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.158 2015/04/23 06:39:19 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.159 2015/04/23 14:49:26 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -150,7 +150,7 @@ SRCS+= rijndael.c
SRCS+= cprng_fast.c
# compat
-.if !empty(RUMP_COMPAT:M50)
+.if !empty(RUMP_NBCOMPAT:M50)
SRCS+= kern_select_50.c
SRCS+= kern_time_50.c
SRCS+= rndpseudo_50.c
Index: src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.45 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.46
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.45 Wed Apr 22 17:57:49 2015
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Thu Apr 23 14:49:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpvfs,v 1.45 2015/04/22 17:57:49 pooka Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.46 2015/04/23 14:49:26 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -70,8 +70,9 @@ SRCS+= quota1_subr.c vfs_quotactl.c
SRCS+= firmload.c
# compat syscalls
-.if !empty(RUMP_COMPAT:M50)
-SRCS+= vfs_syscalls_50.c rumpvfs_compat50.c
+.if !empty(RUMP_NBCOMPAT:M50)
+SRCS+= vfs_syscalls_50.c
+SRCS+= rumpvfs_compat50.c
.endif
SRCS+= rumpvnode_if.c
Index: src/sys/rump/net/lib/libnet/Makefile
diff -u src/sys/rump/net/lib/libnet/Makefile:1.22 src/sys/rump/net/lib/libnet/Makefile:1.23
--- src/sys/rump/net/lib/libnet/Makefile:1.22 Thu Apr 23 07:56:03 2015
+++ src/sys/rump/net/lib/libnet/Makefile Thu Apr 23 14:49:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2015/04/23 07:56:03 pooka Exp $
+# $NetBSD: Makefile,v 1.23 2015/04/23 14:49:26 pooka Exp $
#
.include <bsd.init.mk>
@@ -13,7 +13,7 @@ SRCS= if.c if_loop.c route.c rtsock.c ra
SRCS+= if_43.c pfil.c
SRCS+= net_component.c
-.if !empty(RUMP_COMPAT:M50)
+.if !empty(RUMP_NBCOMPAT:M50)
SRCS+= rtsock_50.c uipc_syscalls_50.c
.endif
