[src/trunk]: src/sys/rump purge rump/net of component-specific opt directories

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

details:   https://anonhg.NetBSD.org/src/rev/770c4cbfcfbc
branches:  trunk
changeset: 340156:770c4cbfcfbc
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Aug 24 23:04:42 2015 +0000

description:
purge rump/net of component-specific opt directories

diffstat:

 sys/rump/include/opt/agr.h                |  3 +++
 sys/rump/include/opt/arcnet.h             |  3 +++
 sys/rump/include/opt/bridge.h             |  3 +++
 sys/rump/include/opt/carp.h               |  3 +++
 sys/rump/include/opt/ether.h              |  3 +++
 sys/rump/include/opt/etherip.h            |  3 +++
 sys/rump/include/opt/faith.h              |  3 +++
 sys/rump/include/opt/fddi.h               |  3 +++
 sys/rump/include/opt/gif.h                |  3 +++
 sys/rump/include/opt/gre.h                |  3 +++
 sys/rump/include/opt/pppoe.h              |  3 +++
 sys/rump/include/opt/token.h              |  3 +++
 sys/rump/include/opt/vlan.h               |  3 +++
 sys/rump/net/lib/libbridge/Makefile       |  4 +---
 sys/rump/net/lib/libnet/Makefile          |  4 +---
 sys/rump/net/lib/libnet/opt/agr.h         |  3 ---
 sys/rump/net/lib/libnet/opt/bridge.h      |  3 ---
 sys/rump/net/lib/libnet/opt/carp.h        |  3 ---
 sys/rump/net/lib/libnet/opt/pppoe.h       |  3 ---
 sys/rump/net/lib/libnet/opt/vlan.h        |  3 ---
 sys/rump/net/lib/libnetinet/Makefile.inc  |  4 +---
 sys/rump/net/lib/libnetinet/opt/arcnet.h  |  3 ---
 sys/rump/net/lib/libnetinet/opt/ether.h   |  3 ---
 sys/rump/net/lib/libnetinet/opt/etherip.h |  3 ---
 sys/rump/net/lib/libnetinet/opt/faith.h   |  3 ---
 sys/rump/net/lib/libnetinet/opt/fddi.h    |  3 ---
 sys/rump/net/lib/libnetinet/opt/gif.h     |  3 ---
 sys/rump/net/lib/libnetinet/opt/gre.h     |  3 ---
 sys/rump/net/lib/libnetinet/opt/token.h   |  3 ---
 sys/rump/net/lib/libnetmpls/Makefile      |  4 +---
 sys/rump/net/lib/libtap/Makefile          |  4 ++--
 31 files changed, 45 insertions(+), 53 deletions(-)

diffs (270 lines):

diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/agr.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/agr.h        Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: agr.h,v 1.1 2015/08/24 23:04:42 pooka Exp $    */
+
+#define NAGR 1
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/arcnet.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/arcnet.h     Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: arcnet.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/bridge.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/bridge.h     Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: bridge.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+#define NBRIDGE 1
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/carp.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/carp.h       Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: carp.h,v 1.1 2015/08/24 23:04:42 pooka Exp $   */
+
+#define NCARP 1
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/ether.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/ether.h      Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: ether.h,v 1.1 2015/08/24 23:04:42 pooka Exp $  */
+
+/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/etherip.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/etherip.h    Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: etherip.h,v 1.1 2015/08/24 23:04:42 pooka Exp $        */
+
+/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/faith.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/faith.h      Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: faith.h,v 1.1 2015/08/24 23:04:42 pooka Exp $  */
+
+/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/fddi.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/fddi.h       Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: fddi.h,v 1.1 2015/08/24 23:04:42 pooka Exp $   */
+
+/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/gif.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/gif.h        Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: gif.h,v 1.1 2015/08/24 23:04:42 pooka Exp $    */
+
+/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/gre.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/gre.h        Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: gre.h,v 1.1 2015/08/24 23:04:42 pooka Exp $    */
+
+/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/pppoe.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/pppoe.h      Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: pppoe.h,v 1.1 2015/08/24 23:04:42 pooka Exp $  */
+
+/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/token.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/token.h      Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: token.h,v 1.1 2015/08/24 23:04:42 pooka Exp $  */
+
+/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/include/opt/vlan.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/vlan.h       Mon Aug 24 23:04:42 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: vlan.h,v 1.1 2015/08/24 23:04:42 pooka Exp $   */
+
+/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libbridge/Makefile
--- a/sys/rump/net/lib/libbridge/Makefile       Mon Aug 24 23:01:58 2015 +0000
+++ b/sys/rump/net/lib/libbridge/Makefile       Mon Aug 24 23:04:42 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2015/08/20 12:20:09 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2015/08/24 23:04:42 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../net
@@ -9,7 +9,5 @@
 
 SRCS+= bridge_component.c
 
-CPPFLAGS+=     -I${.CURDIR}/../libnet/opt
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnet/Makefile
--- a/sys/rump/net/lib/libnet/Makefile  Mon Aug 24 23:01:58 2015 +0000
+++ b/sys/rump/net/lib/libnet/Makefile  Mon Aug 24 23:04:42 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.24 2015/08/20 12:20:09 christos Exp $
+#      $NetBSD: Makefile,v 1.25 2015/08/24 23:04:43 pooka Exp $
 #
 
 
@@ -18,8 +18,6 @@
 SRCS+= rtsock_50.c uipc_syscalls_50.c
 .endif
 
-CPPFLAGS+=     -I${.CURDIR}/opt -I${.CURDIR}/../libnetinet/opt
-
 .include "${.CURDIR}/../libnetinet/Makefile.inc"
 .include "${.CURDIR}/../libnetinet6/Makefile.inc"
 .include "${.CURDIR}/../libnetmpls/Makefile.inc"
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnet/opt/agr.h
--- a/sys/rump/net/lib/libnet/opt/agr.h Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: agr.h,v 1.2 2010/12/08 20:20:17 pooka Exp $    */
-
-#define NAGR 1
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnet/opt/bridge.h
--- a/sys/rump/net/lib/libnet/opt/bridge.h      Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: bridge.h,v 1.2 2010/12/07 20:39:07 pooka Exp $ */
-
-#define NBRIDGE 1
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnet/opt/carp.h
--- a/sys/rump/net/lib/libnet/opt/carp.h        Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: carp.h,v 1.2 2010/08/10 21:50:10 pooka Exp $   */
-
-#define NCARP 1
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnet/opt/pppoe.h
--- a/sys/rump/net/lib/libnet/opt/pppoe.h       Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: pppoe.h,v 1.1 2008/10/06 00:27:07 pooka Exp $  */
-
-/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnet/opt/vlan.h
--- a/sys/rump/net/lib/libnet/opt/vlan.h        Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: vlan.h,v 1.1 2008/10/06 00:27:07 pooka Exp $   */
-
-/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnetinet/Makefile.inc
--- a/sys/rump/net/lib/libnetinet/Makefile.inc  Mon Aug 24 23:01:58 2015 +0000
+++ b/sys/rump/net/lib/libnetinet/Makefile.inc  Mon Aug 24 23:04:42 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.12 2015/01/18 17:06:24 justin Exp $
+#      $NetBSD: Makefile.inc,v 1.13 2015/08/24 23:04:43 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../netinet
@@ -20,8 +20,6 @@
 # UDP
 SRCS+= udp_usrreq.c
 
-CPPFLAGS+=     -I${.CURDIR}/opt -I${.CURDIR}/../libnet/opt
-
 CPPFLAGS+=     -DPORTALGO_INET4_DEFAULT=PORTALGO_RANDOM_START
 
 # TCP debugging
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnetinet/opt/arcnet.h
--- a/sys/rump/net/lib/libnetinet/opt/arcnet.h  Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: arcnet.h,v 1.1 2008/10/06 00:27:48 pooka Exp $ */
-
-/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnetinet/opt/ether.h
--- a/sys/rump/net/lib/libnetinet/opt/ether.h   Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: ether.h,v 1.1 2014/07/30 13:32:09 ozaki-r Exp $        */
-
-/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnetinet/opt/etherip.h
--- a/sys/rump/net/lib/libnetinet/opt/etherip.h Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: etherip.h,v 1.1 2008/10/06 00:27:48 pooka Exp $        */
-
-/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnetinet/opt/faith.h
--- a/sys/rump/net/lib/libnetinet/opt/faith.h   Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: faith.h,v 1.1 2008/10/06 00:27:48 pooka Exp $  */
-
-/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnetinet/opt/fddi.h
--- a/sys/rump/net/lib/libnetinet/opt/fddi.h    Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: fddi.h,v 1.1 2008/10/06 00:27:48 pooka Exp $   */
-
-/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnetinet/opt/gif.h
--- a/sys/rump/net/lib/libnetinet/opt/gif.h     Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: gif.h,v 1.1 2008/10/06 00:27:48 pooka Exp $    */
-
-/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnetinet/opt/gre.h
--- a/sys/rump/net/lib/libnetinet/opt/gre.h     Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: gre.h,v 1.1 2008/10/06 00:27:48 pooka Exp $    */
-
-/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnetinet/opt/token.h
--- a/sys/rump/net/lib/libnetinet/opt/token.h   Mon Aug 24 23:01:58 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: token.h,v 1.1 2008/10/06 00:27:49 pooka Exp $  */
-
-/* dummy */
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libnetmpls/Makefile
--- a/sys/rump/net/lib/libnetmpls/Makefile      Mon Aug 24 23:01:58 2015 +0000
+++ b/sys/rump/net/lib/libnetmpls/Makefile      Mon Aug 24 23:04:42 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/08/20 12:20:09 christos Exp $
+# $NetBSD: Makefile,v 1.4 2015/08/24 23:04:43 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../netmpls
@@ -8,7 +8,5 @@
 SRCS=  mpls_ttl.c if_mpls.c
 SRCS+= netmpls_component.c
 
-CPPFLAGS+=     -I${.CURDIR}/../libnet/opt
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r 25d550a594f2 -r 770c4cbfcfbc sys/rump/net/lib/libtap/Makefile
--- a/sys/rump/net/lib/libtap/Makefile  Mon Aug 24 23:01:58 2015 +0000
+++ b/sys/rump/net/lib/libtap/Makefile  Mon Aug 24 23:04:42 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2015/08/20 12:20:09 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2015/08/24 23:04:43 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../net
@@ -9,7 +9,7 @@
 
 SRCS+= tap_component.c
 
-CPPFLAGS+=     -I${.CURDIR}/../libnet/opt -I${.CURDIR}/../../../librump/rumpvfs
+CPPFLAGS+=     -I${.CURDIR}/../../../librump/rumpvfs
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>