[src/trunk]: src/sys/rump Rename RUMP_COMPAT to RUMP_NBCOMBAT to better signi...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b057368b6efb
branches:  trunk
changeset: 337685:b057368b6efb
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Apr 23 14:49:26 2015 +0000

description:
Rename RUMP_COMPAT to RUMP_NBCOMBAT to better signify what the
variable does.

diffstat:

 sys/rump/Makefile.rump                      |  12 ++++++------
 sys/rump/README.compileopts                 |  10 +++++-----
 sys/rump/dev/lib/libraidframe/Makefile      |   4 ++--
 sys/rump/kern/lib/libtty/Makefile           |   4 ++--
 sys/rump/librump/rumpkern/Makefile.rumpkern |   4 ++--
 sys/rump/librump/rumpvfs/Makefile.rumpvfs   |   7 ++++---
 sys/rump/net/lib/libnet/Makefile            |   4 ++--
 7 files changed, 23 insertions(+), 22 deletions(-)

diffs (148 lines):

diff -r fea5f5d0d8ac -r b057368b6efb sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Thu Apr 23 14:39:03 2015 +0000
+++ b/sys/rump/Makefile.rump    Thu Apr 23 14:49:26 2015 +0000
@@ -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 @@
 .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
 
diff -r fea5f5d0d8ac -r b057368b6efb sys/rump/README.compileopts
--- a/sys/rump/README.compileopts       Thu Apr 23 14:39:03 2015 +0000
+++ b/sys/rump/README.compileopts       Thu Apr 23 14:49:26 2015 +0000
@@ -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 @@
        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.
 
 
 ================================================================================
diff -r fea5f5d0d8ac -r b057368b6efb sys/rump/dev/lib/libraidframe/Makefile
--- a/sys/rump/dev/lib/libraidframe/Makefile    Thu Apr 23 14:39:03 2015 +0000
+++ b/sys/rump/dev/lib/libraidframe/Makefile    Thu Apr 23 14:49:26 2015 +0000
@@ -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+= raidframe_component.c
 
-.if !empty(RUMP_COMPAT:M50)
+.if !empty(RUMP_NBCOMPAT:M50)
 SRCS+= rf_compat50.c
 .endif
 
diff -r fea5f5d0d8ac -r b057368b6efb sys/rump/kern/lib/libtty/Makefile
--- a/sys/rump/kern/lib/libtty/Makefile Thu Apr 23 14:39:03 2015 +0000
+++ b/sys/rump/kern/lib/libtty/Makefile Thu Apr 23 14:49:26 2015 +0000
@@ -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 @@
 
 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
 
diff -r fea5f5d0d8ac -r b057368b6efb sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Thu Apr 23 14:39:03 2015 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Thu Apr 23 14:49:26 2015 +0000
@@ -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+= 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
diff -r fea5f5d0d8ac -r b057368b6efb sys/rump/librump/rumpvfs/Makefile.rumpvfs
--- a/sys/rump/librump/rumpvfs/Makefile.rumpvfs Thu Apr 23 14:39:03 2015 +0000
+++ b/sys/rump/librump/rumpvfs/Makefile.rumpvfs Thu Apr 23 14:49:26 2015 +0000
@@ -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+= 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
diff -r fea5f5d0d8ac -r b057368b6efb sys/rump/net/lib/libnet/Makefile
--- a/sys/rump/net/lib/libnet/Makefile  Thu Apr 23 14:39:03 2015 +0000
+++ b/sys/rump/net/lib/libnet/Makefile  Thu Apr 23 14:49:26 2015 +0000
@@ -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_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