From owner-svn-src-projects@FreeBSD.ORG Wed Jul 17 06:30:24 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E6CD5AFC; Wed, 17 Jul 2013 06:30:24 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C99F7868; Wed, 17 Jul 2013 06:30:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6H6UO36068298; Wed, 17 Jul 2013 06:30:24 GMT (envelope-from grehan@svn.freebsd.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6H6UNVN068292; Wed, 17 Jul 2013 06:30:23 GMT (envelope-from grehan@svn.freebsd.org) Message-Id: <201307170630.r6H6UNVN068292@svn.freebsd.org> From: Peter Grehan Date: Wed, 17 Jul 2013 06:30:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: 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 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 06:30:25 -0000 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 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 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 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 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