Revert "netgraph7: Make netgraph7 kernel modules names unique."
authorNuno Antunes <nuno.antunes@gmail.com>
Sun, 12 Dec 2010 13:22:40 +0000 (13:22 +0000)
committerNuno Antunes <nuno.antunes@gmail.com>
Tue, 10 Jan 2012 14:10:35 +0000 (14:10 +0000)
This reverts commit b3caef111369521fa1099de35840437191aa1436.

* Now that netgraph7 kernel buils is under the WANT_NETGRAPH7 make
  variable, this commit can be reverted.

25 files changed:
sys/netgraph7/UI/Makefile
sys/netgraph7/async/Makefile
sys/netgraph7/atmllc/Makefile
sys/netgraph7/bpf/Makefile
sys/netgraph7/bridge/Makefile
sys/netgraph7/cisco/Makefile
sys/netgraph7/deflate/Makefile
sys/netgraph7/echo/Makefile
sys/netgraph7/etf/Makefile
sys/netgraph7/ether/Makefile
sys/netgraph7/frame_relay/Makefile
sys/netgraph7/hole/Makefile
sys/netgraph7/iface/Makefile
sys/netgraph7/ksocket/Makefile
sys/netgraph7/l2tp/Makefile
sys/netgraph7/lmi/Makefile
sys/netgraph7/mppc/Makefile
sys/netgraph7/netgraph/Makefile
sys/netgraph7/one2many/Makefile
sys/netgraph7/ppp/Makefile
sys/netgraph7/pppoe/Makefile
sys/netgraph7/pptpgre/Makefile
sys/netgraph7/socket/Makefile
sys/netgraph7/tee/Makefile
sys/netgraph7/vjc/Makefile

index bc59d87..73b70bd 100644 (file)
@@ -2,8 +2,8 @@
 # $DragonFly: src/sys/netgraph/UI/Makefile,v 1.2 2003/06/17 04:28:45 dillon Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
-KMOD=          ng7_UI
+KMOD=          ng_UI
 SRCS=          ng_UI.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .include <bsd.kmod.mk>
index 8f2353b..2f38cd6 100644 (file)
@@ -2,8 +2,8 @@
 # $DragonFly$
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
-KMOD=          ng7_async
+KMOD=          ng_async
 SRCS=          ng_async.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .include <bsd.kmod.mk>
index ffe8782..a346142 100644 (file)
@@ -2,8 +2,8 @@
 # $DragonFly$
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
-KMOD=          ng7_atmllc
+KMOD=          ng_atmllc
 SRCS=          ng_atmllc.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .include <bsd.kmod.mk>
index f64967d..8e7128a 100644 (file)
@@ -2,9 +2,9 @@
 # $DragonFly: src/sys/netgraph/bpf/Makefile,v 1.3 2003/08/14 23:26:36 dillon Exp $
 # $Whistle: Makefile,v 1.1 1999/12/03 01:44:28 archie Exp $
 
-KMOD=          ng7_bpf
+KMOD=          ng_bpf
 SRCS=          ng_bpf.c bpf_filter.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .PATH:         ${.CURDIR}/../../net
 
index 3ef6909..59c7329 100644 (file)
@@ -1,8 +1,8 @@
 # $FreeBSD: src/sys/modules/netgraph/bridge/Makefile,v 1.1.2.1 2000/09/13 04:23:38 archie Exp $
 # $DragonFly: src/sys/netgraph/bridge/Makefile,v 1.2 2003/06/17 04:28:45 dillon Exp $
 
-KMOD=          ng7_bridge
+KMOD=          ng_bridge
 SRCS=          ng_bridge.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .include <bsd.kmod.mk>
index b0baea1..82e32bd 100644 (file)
@@ -2,8 +2,8 @@
 # $DragonFly: src/sys/netgraph/cisco/Makefile,v 1.2 2003/06/17 04:28:45 dillon Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
-KMOD=          ng7_cisco
+KMOD=          ng_cisco
 SRCS=          ng_cisco.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .include <bsd.kmod.mk>
index 3dab57a..9881231 100644 (file)
@@ -2,8 +2,8 @@
 # $DragonFly: src/sys/netgraph/deflate/Makefile,v 1.3 2003/08/14 23:26:36 dillon Exp $
 # $Whistle: Makefile,v 1.1 1999/12/03 01:44:28 archie Exp $
 
-KMOD=          ng7_deflate
+KMOD=          ng_deflate
 SRCS=          ng_deflate.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .include <bsd.kmod.mk>
index fe1dc75..774cb64 100644 (file)
@@ -2,8 +2,7 @@
 # $DragonFly: src/sys/netgraph/echo/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
-KMOD=          ng7_echo
+KMOD=          ng_echo
 SRCS=          ng_echo.c
-KMODDEPS=      netgraph7
 
 .include <bsd.kmod.mk>
index fa0507b..b4ed7bd 100644 (file)
@@ -2,9 +2,7 @@
 # $DragonFly: src/sys/netgraph/etf/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 # Ethertype filter
 
-KMOD=          ng7_etf
-SRCS=          ng_etf.c
-KMODDEPS=      netgraph7
-
+KMOD=  ng_etf
+SRCS=  ng_etf.c
 
 .include <bsd.kmod.mk>
index e9c9d60..b585e9b 100644 (file)
@@ -1,8 +1,8 @@
 # $FreeBSD: src/sys/modules/netgraph/ether/Makefile,v 1.1.2.1 2000/07/11 20:46:55 archie Exp $
 # $DragonFly: src/sys/netgraph/ether/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 
-KMOD=          ng7_ether
+KMOD=          ng_ether
 SRCS=          ng_ether.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .include <bsd.kmod.mk>
index 24b5d85..7368865 100644 (file)
@@ -2,8 +2,7 @@
 # $DragonFly: src/sys/netgraph/frame_relay/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
-KMOD=          ng7_frame_relay
+KMOD=          ng_frame_relay
 SRCS=          ng_frame_relay.c
-KMODDEPS=      netgraph7
 
 .include <bsd.kmod.mk>
index cda9bde..030e9b5 100644 (file)
@@ -2,8 +2,8 @@
 # $DragonFly: src/sys/netgraph/hole/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
 
-KMOD=          ng7_hole
+KMOD=          ng_hole
 SRCS=          ng_hole.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .include <bsd.kmod.mk>
index 4585a97..0b71883 100644 (file)
@@ -2,9 +2,9 @@
 # $DragonFly: src/sys/netgraph/iface/Makefile,v 1.4 2005/02/18 11:41:42 corecode Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
 
-KMOD=          ng7_iface
+KMOD=          ng_iface
 SRCS=          ng_iface.c opt_atalk.h opt_inet.h opt_inet6.h opt_ipx.h
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .if !defined(BUILDING_WITH_KERNEL)
 opt_inet.h:
index 5ee122e..9c3fc5e 100644 (file)
@@ -1,8 +1,7 @@
 # $FreeBSD: src/sys/modules/netgraph/ksocket/Makefile,v 1.1.4.3 2001/12/21 09:00:48 ru Exp $
 # $DragonFly: src/sys/netgraph/ksocket/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 
-KMOD=          ng7_ksocket
+KMOD=          ng_ksocket
 SRCS=          ng_ksocket.c
-KMODDEPS=      netgraph7
 
 .include <bsd.kmod.mk>
index 5c58555..131fe16 100644 (file)
@@ -1,8 +1,7 @@
 # $FreeBSD: src/sys/modules/netgraph/l2tp/Makefile,v 1.1.2.1 2002/08/20 23:48:15 archie Exp $
 # $DragonFly: src/sys/netgraph/l2tp/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 
-KMOD=          ng7_l2tp
+KMOD=          ng_l2tp
 SRCS=          ng_l2tp.c
-KMODDEPS=      netgraph7
 
 .include <bsd.kmod.mk>
index cb14db5..eaaa62b 100644 (file)
@@ -2,8 +2,7 @@
 # $DragonFly: src/sys/netgraph/lmi/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
-KMOD=          ng7_lmi
+KMOD=          ng_lmi
 SRCS=          ng_lmi.c
-KMODDEPS=      netgraph7
 
 .include <bsd.kmod.mk>
index e2af674..7647cad 100644 (file)
@@ -2,9 +2,8 @@
 # $FreeBSD: src/sys/modules/netgraph/mppc/Makefile,v 1.3.2.4 2001/12/21 09:00:49 ru Exp $
 # $DragonFly: src/sys/netgraph/mppc/Makefile,v 1.3 2006/09/16 18:39:13 swildner Exp $
 
-KMOD=          ng7_mppc
+KMOD=          ng_mppc
 SRCS=          ng_mppc.c opt_netgraph.h
-KMODDEPS=      netgraph7
 
 NETGRAPH_MPPC_COMPRESSION?=    0
 NETGRAPH_MPPC_ENCRYPTION?=     1
index 546d4b7..6c60781 100644 (file)
@@ -2,7 +2,7 @@
 # $DragonFly$
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
-KMOD=          netgraph7
+KMOD=          netgraph
 SRCS=          ng_base.c ng_parse.c
 
 .include <bsd.kmod.mk>
index 0485b3c..7bfbc95 100644 (file)
@@ -1,8 +1,7 @@
 # $FreeBSD: src/sys/modules/netgraph/one2many/Makefile,v 1.1.2.1 2000/11/16 17:28:32 archie Exp $
 # $DragonFly: src/sys/netgraph/one2many/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 
-KMOD=          ng7_one2many
+KMOD=          ng_one2many
 SRCS=          ng_one2many.c
-KMODDEPS=      netgraph7
 
 .include <bsd.kmod.mk>
index ed4ac9c..4bdbf47 100644 (file)
@@ -2,8 +2,7 @@
 # $DragonFly: src/sys/netgraph/ppp/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 # $Whistle: Makefile,v 1.1 1999/01/24 02:52:12 archie Exp $
 
-KMOD=          ng7_ppp
+KMOD=          ng_ppp
 SRCS=          ng_ppp.c
-KMODDEPS=      netgraph7
 
 .include <bsd.kmod.mk>
index 2c3033c..bc7c0a3 100644 (file)
@@ -2,8 +2,7 @@
 # $DragonFly: src/sys/netgraph/pppoe/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
-KMOD=          ng7_pppoe
+KMOD=          ng_pppoe
 SRCS=          ng_pppoe.c
-KMODDEPS=      netgraph7
 
 .include <bsd.kmod.mk>
index aef2c96..8801d56 100644 (file)
@@ -2,8 +2,7 @@
 # $DragonFly: src/sys/netgraph/pptpgre/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 # $Whistle: Makefile,v 1.1 1999/11/29 23:14:33 archie Exp $
 
-KMOD=          ng7_pptpgre
+KMOD=          ng_pptpgre
 SRCS=          ng_pptpgre.c
-KMODDEPS=      netgraph7
 
 .include <bsd.kmod.mk>
index f204259..f4175ce 100644 (file)
@@ -2,8 +2,8 @@
 # $DragonFly: src/sys/netgraph/socket/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
-KMOD=          ng7_socket
+KMOD=          ng_socket
 SRCS=          ng_socket.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .include <bsd.kmod.mk>
index c6289b1..818ed4f 100644 (file)
@@ -2,8 +2,8 @@
 # $DragonFly: src/sys/netgraph/tee/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
-KMOD=          ng7_tee
+KMOD=          ng_tee
 SRCS=          ng_tee.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .include <bsd.kmod.mk>
index 34c77d4..d4d40b1 100644 (file)
@@ -2,9 +2,9 @@
 # $DragonFly: src/sys/netgraph/vjc/Makefile,v 1.3 2003/08/14 23:26:45 dillon Exp $
 # $Whistle: Makefile,v 1.1 1999/01/24 06:48:07 archie Exp $
 
-KMOD=          ng7_vjc
+KMOD=          ng_vjc
 SRCS=          ng_vjc.c slcompress.c
-KMODDEPS=      netgraph7
+KMODDEPS=      netgraph
 
 .PATH:         ${.CURDIR}/../../net/ppp_layer