svn commit: r253411 - in projects/hyperv/sys: contrib/dev/hyperv dev/hyperv modules/hyperv/netvsc modules/hyperv/stordisengage modules/hyperv/storvsc modules/hyperv/utilities modules/hyperv/vmbus

[Peter Grehan]

Author: grehan
Date: Wed Jul 17 06:30:23 2013
New Revision: 253411
URL: http://svnweb.freebsd.org/changeset/base/253411

Log:
  Microsoft have changed their policy on how the hyper-v code will
  be pulled into FreeBSD. From now, FreeBSD will be considered the
  upstream repo.
  
  First step: move the drivers away from the contrib area and into
  the base system.
  
  A follow-on commit will include the drivers in the amd64 GENERIC kernel.

Added:
  projects/hyperv/sys/dev/hyperv/
     - copied from r252763, projects/hyperv/sys/contrib/dev/hyperv/
Deleted:
  projects/hyperv/sys/contrib/dev/hyperv/
Modified:
  projects/hyperv/sys/modules/hyperv/netvsc/Makefile
  projects/hyperv/sys/modules/hyperv/stordisengage/Makefile
  projects/hyperv/sys/modules/hyperv/storvsc/Makefile
  projects/hyperv/sys/modules/hyperv/utilities/Makefile
  projects/hyperv/sys/modules/hyperv/vmbus/Makefile

Modified: projects/hyperv/sys/modules/hyperv/netvsc/Makefile
==============================================================================
--- projects/hyperv/sys/modules/hyperv/netvsc/Makefile	Wed Jul 17 06:29:41 2013	(r253410)
+++ projects/hyperv/sys/modules/hyperv/netvsc/Makefile	Wed Jul 17 06:30:23 2013	(r253411)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:  ${.CURDIR}/../../../contrib/dev/hyperv/netvsc
+.PATH:  ${.CURDIR}/../../../dev/hyperv/netvsc
 
 KMOD    = hv_netvsc
 
@@ -9,7 +9,6 @@ SRCS    = hv_net_vsc.c \
 	  hv_rndis_filter.c
 
 CFLAGS 	+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
-	   -I${.CURDIR}/../../../contrib/dev/hyperv/netvsc \
-	   -I${.CURDIR}/../../../contrib
+	   -I${.CURDIR}/../../../contrib/dev/hyperv/netvsc
 
 .include <bsd.kmod.mk>

Modified: projects/hyperv/sys/modules/hyperv/stordisengage/Makefile
==============================================================================
--- projects/hyperv/sys/modules/hyperv/stordisengage/Makefile	Wed Jul 17 06:29:41 2013	(r253410)
+++ projects/hyperv/sys/modules/hyperv/stordisengage/Makefile	Wed Jul 17 06:30:23 2013	(r253411)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-.PATH:  ${.CURDIR}/../../../contrib/dev/hyperv/stordisengage
+.PATH:  ${.CURDIR}/../../../dev/hyperv/stordisengage
 
 KMOD=	 hv_ata_pci_disengage
 
-SRCS =	hv_ata_pci_disengage.c
+SRCS=	hv_ata_pci_disengage.c
 
 .include <bsd.kmod.mk>

Modified: projects/hyperv/sys/modules/hyperv/storvsc/Makefile
==============================================================================
--- projects/hyperv/sys/modules/hyperv/storvsc/Makefile	Wed Jul 17 06:29:41 2013	(r253410)
+++ projects/hyperv/sys/modules/hyperv/storvsc/Makefile	Wed Jul 17 06:30:23 2013	(r253411)
@@ -1,15 +1,14 @@
 # $FreeBSD$
 
-.PATH:  ${.CURDIR}/../../../contrib/dev/hyperv/storvsc
+.PATH:  ${.CURDIR}/../../../dev/hyperv/storvsc
 
 KMOD=	 hv_storvsc
 
 SRCS =	hv_storvsc_drv_freebsd.c \
 	hv_vstorage.h
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
-	 -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus	\
-	 -I${.CURDIR}/../../../contrib/dev/hyperv/storvsc \
-	 -I${.CURDIR}/../../../contrib
+CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
+	 -I${.CURDIR}/../../../dev/hyperv/vmbus	\
+	 -I${.CURDIR}/../../../dev/hyperv/storvsc
 
 .include <bsd.kmod.mk>

Modified: projects/hyperv/sys/modules/hyperv/utilities/Makefile
==============================================================================
--- projects/hyperv/sys/modules/hyperv/utilities/Makefile	Wed Jul 17 06:29:41 2013	(r253410)
+++ projects/hyperv/sys/modules/hyperv/utilities/Makefile	Wed Jul 17 06:30:23 2013	(r253411)
@@ -1,13 +1,12 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../contrib/dev/hyperv/utilities
+.PATH:	${.CURDIR}/../../../dev/hyperv/utilities
 
 KMOD=	 hv_utils
 
 SRCS =  hv_util.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
-	 -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus \
-	 -I${.CURDIR}/../../../contrib
+CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
+	 -I${.CURDIR}/../../../dev/hyperv/vmbus
 
 .include <bsd.kmod.mk>

Modified: projects/hyperv/sys/modules/hyperv/vmbus/Makefile
==============================================================================
--- projects/hyperv/sys/modules/hyperv/vmbus/Makefile	Wed Jul 17 06:29:41 2013	(r253410)
+++ projects/hyperv/sys/modules/hyperv/vmbus/Makefile	Wed Jul 17 06:30:23 2013	(r253411)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../contrib/dev/hyperv/vmbus \
-	${.CURDIR}/../../../contrib/dev/hyperv/utilities
+.PATH:	${.CURDIR}/../../../dev/hyperv/vmbus \
+	${.CURDIR}/../../../dev/hyperv/utilities
 
 KMOD=	 hv_vmbus
 
@@ -13,9 +13,8 @@ SRCS =  hv_channel.c \
 	hv_vmbus_drv_freebsd.c \
 	hv_vmbus_priv.h
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
-	 -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus \
-	 -I${.CURDIR}/../../../contrib/dev/hyperv/utilities \
-	 -I${.CURDIR}/../../../contrib
+CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
+	 -I${.CURDIR}/../../../dev/hyperv/vmbus \
+	 -I${.CURDIR}/../../../dev/hyperv/utilities
 
 .include <bsd.kmod.mk>