Module Name: src
Committed By: pooka
Date: Fri Feb 5 22:01:38 UTC 2010
Modified Files:
src/sys/rump/dev/wip: Makefile
src/sys/rump/net: Makefile.rumpnet
Added Files:
src/sys/rump/net/lib/libnet80211: Makefile shlib_version
Removed Files:
src/sys/rump/dev/wip/libnet80211: Makefile shlib_version
Log Message:
Move the net80211 support component into the proper place in "net"
and install as rumpnet_net80211.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/wip/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/wip/libnet80211/Makefile \
src/sys/rump/dev/wip/libnet80211/shlib_version
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/Makefile.rumpnet
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnet80211/Makefile \
src/sys/rump/net/lib/libnet80211/shlib_version
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/dev/wip/Makefile
diff -u src/sys/rump/dev/wip/Makefile:1.4 src/sys/rump/dev/wip/Makefile:1.5
--- src/sys/rump/dev/wip/Makefile:1.4 Mon Jan 11 02:15:38 2010
+++ src/sys/rump/dev/wip/Makefile Fri Feb 5 22:01:38 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2010/01/11 02:15:38 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/05 22:01:38 pooka Exp $
#
-SUBDIR= libnet80211 librumpusbhc libucom libumass libulpt libusb libusbrum
+SUBDIR= librumpusbhc libucom libumass libulpt libusb libusbrum
SUBDIR+=libums libukbd
SUBDIR+=libwscons
Index: src/sys/rump/net/Makefile.rumpnet
diff -u src/sys/rump/net/Makefile.rumpnet:1.5 src/sys/rump/net/Makefile.rumpnet:1.6
--- src/sys/rump/net/Makefile.rumpnet:1.5 Sat Feb 28 15:28:45 2009
+++ src/sys/rump/net/Makefile.rumpnet Fri Feb 5 22:01:38 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpnet,v 1.5 2009/02/28 15:28:45 pooka Exp $
+# $NetBSD: Makefile.rumpnet,v 1.6 2010/02/05 22:01:38 pooka Exp $
#
-RUMPNETLIST= sockin shmif virtif net netinet local
+RUMPNETLIST= net net80211 netinet local sockin shmif virtif
.for var in ${RUMPNETLIST}
RUMPNETLIBS+=lib${var}
Added files:
Index: src/sys/rump/net/lib/libnet80211/Makefile
diff -u /dev/null src/sys/rump/net/lib/libnet80211/Makefile:1.1
--- /dev/null Fri Feb 5 22:01:38 2010
+++ src/sys/rump/net/lib/libnet80211/Makefile Fri Feb 5 22:01:38 2010
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2010/02/05 22:01:38 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../net80211
+
+LIB= rumpnet_net80211
+
+SRCS= ieee80211.c ieee80211_acl.c ieee80211_amrr.c ieee80211_crypto.c \
+ ieee80211_crypto_ccmp.c ieee80211_crypto_none.c \
+ ieee80211_crypto_tkip.c ieee80211_crypto_wep.c ieee80211_input.c\
+ ieee80211_ioctl.c ieee80211_netbsd.c ieee80211_node.c \
+ ieee80211_output.c ieee80211_proto.c ieee80211_rssadapt.c \
+ ieee80211_xauth.c
+
+CFLAGS+= -Wno-pointer-sign
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/net/lib/libnet80211/shlib_version
diff -u /dev/null src/sys/rump/net/lib/libnet80211/shlib_version:1.1
--- /dev/null Fri Feb 5 22:01:38 2010
+++ src/sys/rump/net/lib/libnet80211/shlib_version Fri Feb 5 22:01:38 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/02/05 22:01:38 pooka Exp $
+#
+major=0
+minor=0