Module Name: src
Committed By: pooka
Date: Mon Aug 24 23:04:43 UTC 2015
Modified Files:
src/sys/rump/net/lib/libbridge: Makefile
src/sys/rump/net/lib/libnet: Makefile
src/sys/rump/net/lib/libnetinet: Makefile.inc
src/sys/rump/net/lib/libnetmpls: Makefile
src/sys/rump/net/lib/libtap: Makefile
Added Files:
src/sys/rump/include/opt: agr.h arcnet.h bridge.h carp.h ether.h
etherip.h faith.h fddi.h gif.h gre.h pppoe.h token.h vlan.h
Removed Files:
src/sys/rump/net/lib/libnet/opt: agr.h bridge.h carp.h pppoe.h vlan.h
src/sys/rump/net/lib/libnetinet/opt: arcnet.h ether.h etherip.h faith.h
fddi.h gif.h gre.h token.h
Log Message:
purge rump/net of component-specific opt directories
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/agr.h \
src/sys/rump/include/opt/arcnet.h src/sys/rump/include/opt/bridge.h \
src/sys/rump/include/opt/carp.h src/sys/rump/include/opt/ether.h \
src/sys/rump/include/opt/etherip.h src/sys/rump/include/opt/faith.h \
src/sys/rump/include/opt/fddi.h src/sys/rump/include/opt/gif.h \
src/sys/rump/include/opt/gre.h src/sys/rump/include/opt/pppoe.h \
src/sys/rump/include/opt/token.h src/sys/rump/include/opt/vlan.h
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/net/lib/libbridge/Makefile
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/net/lib/libnet/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/rump/net/lib/libnet/opt/agr.h \
src/sys/rump/net/lib/libnet/opt/bridge.h \
src/sys/rump/net/lib/libnet/opt/carp.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnet/opt/pppoe.h \
src/sys/rump/net/lib/libnet/opt/vlan.h
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/net/lib/libnetinet/Makefile.inc
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnetinet/opt/arcnet.h \
src/sys/rump/net/lib/libnetinet/opt/ether.h \
src/sys/rump/net/lib/libnetinet/opt/etherip.h \
src/sys/rump/net/lib/libnetinet/opt/faith.h \
src/sys/rump/net/lib/libnetinet/opt/fddi.h \
src/sys/rump/net/lib/libnetinet/opt/gif.h \
src/sys/rump/net/lib/libnetinet/opt/gre.h \
src/sys/rump/net/lib/libnetinet/opt/token.h
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/net/lib/libnetmpls/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libtap/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/net/lib/libbridge/Makefile
diff -u src/sys/rump/net/lib/libbridge/Makefile:1.3 src/sys/rump/net/lib/libbridge/Makefile:1.4
--- src/sys/rump/net/lib/libbridge/Makefile:1.3 Thu Aug 20 12:20:09 2015
+++ src/sys/rump/net/lib/libbridge/Makefile Mon Aug 24 23:04:42 2015
@@ -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= if_bridge.c bridgestp.c
SRCS+= bridge_component.c
-CPPFLAGS+= -I${.CURDIR}/../libnet/opt
-
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
Index: src/sys/rump/net/lib/libnet/Makefile
diff -u src/sys/rump/net/lib/libnet/Makefile:1.24 src/sys/rump/net/lib/libnet/Makefile:1.25
--- src/sys/rump/net/lib/libnet/Makefile:1.24 Thu Aug 20 12:20:09 2015
+++ src/sys/rump/net/lib/libnet/Makefile Mon Aug 24 23:04:43 2015
@@ -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+= net_component.c
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"
Index: src/sys/rump/net/lib/libnetinet/Makefile.inc
diff -u src/sys/rump/net/lib/libnetinet/Makefile.inc:1.12 src/sys/rump/net/lib/libnetinet/Makefile.inc:1.13
--- src/sys/rump/net/lib/libnetinet/Makefile.inc:1.12 Sun Jan 18 17:06:24 2015
+++ src/sys/rump/net/lib/libnetinet/Makefile.inc Mon Aug 24 23:04:43 2015
@@ -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 @@ SRCS+= tcp_congctl.c tcp_input.c tcp_out
# UDP
SRCS+= udp_usrreq.c
-CPPFLAGS+= -I${.CURDIR}/opt -I${.CURDIR}/../libnet/opt
-
CPPFLAGS+= -DPORTALGO_INET4_DEFAULT=PORTALGO_RANDOM_START
# TCP debugging
Index: src/sys/rump/net/lib/libnetmpls/Makefile
diff -u src/sys/rump/net/lib/libnetmpls/Makefile:1.3 src/sys/rump/net/lib/libnetmpls/Makefile:1.4
--- src/sys/rump/net/lib/libnetmpls/Makefile:1.3 Thu Aug 20 12:20:09 2015
+++ src/sys/rump/net/lib/libnetmpls/Makefile Mon Aug 24 23:04:43 2015
@@ -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 @@ IOCONF= NETMPLS.ioconf
SRCS= mpls_ttl.c if_mpls.c
SRCS+= netmpls_component.c
-CPPFLAGS+= -I${.CURDIR}/../libnet/opt
-
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
Index: src/sys/rump/net/lib/libtap/Makefile
diff -u src/sys/rump/net/lib/libtap/Makefile:1.2 src/sys/rump/net/lib/libtap/Makefile:1.3
--- src/sys/rump/net/lib/libtap/Makefile:1.2 Thu Aug 20 12:20:09 2015
+++ src/sys/rump/net/lib/libtap/Makefile Mon Aug 24 23:04:43 2015
@@ -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= if_tap.c
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>
Added files:
Index: src/sys/rump/include/opt/agr.h
diff -u /dev/null src/sys/rump/include/opt/agr.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/agr.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: agr.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+#define NAGR 1
Index: src/sys/rump/include/opt/arcnet.h
diff -u /dev/null src/sys/rump/include/opt/arcnet.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/arcnet.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: arcnet.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+/* dummy */
Index: src/sys/rump/include/opt/bridge.h
diff -u /dev/null src/sys/rump/include/opt/bridge.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/bridge.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: bridge.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+#define NBRIDGE 1
Index: src/sys/rump/include/opt/carp.h
diff -u /dev/null src/sys/rump/include/opt/carp.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/carp.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: carp.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+#define NCARP 1
Index: src/sys/rump/include/opt/ether.h
diff -u /dev/null src/sys/rump/include/opt/ether.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/ether.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: ether.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+/* dummy */
Index: src/sys/rump/include/opt/etherip.h
diff -u /dev/null src/sys/rump/include/opt/etherip.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/etherip.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: etherip.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+/* dummy */
Index: src/sys/rump/include/opt/faith.h
diff -u /dev/null src/sys/rump/include/opt/faith.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/faith.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: faith.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+/* dummy */
Index: src/sys/rump/include/opt/fddi.h
diff -u /dev/null src/sys/rump/include/opt/fddi.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/fddi.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: fddi.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+/* dummy */
Index: src/sys/rump/include/opt/gif.h
diff -u /dev/null src/sys/rump/include/opt/gif.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/gif.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: gif.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+/* dummy */
Index: src/sys/rump/include/opt/gre.h
diff -u /dev/null src/sys/rump/include/opt/gre.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/gre.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: gre.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+/* dummy */
Index: src/sys/rump/include/opt/pppoe.h
diff -u /dev/null src/sys/rump/include/opt/pppoe.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/pppoe.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: pppoe.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+/* dummy */
Index: src/sys/rump/include/opt/token.h
diff -u /dev/null src/sys/rump/include/opt/token.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/token.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: token.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+/* dummy */
Index: src/sys/rump/include/opt/vlan.h
diff -u /dev/null src/sys/rump/include/opt/vlan.h:1.1
--- /dev/null Mon Aug 24 23:04:43 2015
+++ src/sys/rump/include/opt/vlan.h Mon Aug 24 23:04:42 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: vlan.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+
+/* dummy */
