From owner-svn-src-head@freebsd.org Thu Nov 17 03:03:32 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06948C432C0; Thu, 17 Nov 2016 03:03:32 +0000 (UTC) (envelope-from sepherosa@gmail.com) Received: from mail-vk0-x244.google.com (mail-vk0-x244.google.com [IPv6:2607:f8b0:400c:c05::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B33F5A2B; Thu, 17 Nov 2016 03:03:31 +0000 (UTC) (envelope-from sepherosa@gmail.com) Received: by mail-vk0-x244.google.com with SMTP id l126so13582784vkh.0; Wed, 16 Nov 2016 19:03:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=Ta+RsB2zCO31ZRCoxaJm9JlRrQGfexZpbu4OpVqwMjU=; b=PrQDexK66ZRqNIcHgmFGODiZydErM7XXt+960OAs8/VwPBHmpAPCHE6reheQnJJjJ1 d+cw5onDxxzphS7Bv1DDq0NsOWVGAlcMeWsAhfEGfVtrJ+csIBF6m/7EjlOEGREUcY4s XmaLJyvApEdIXBZVgYby/jamCxgkPKBWfhswDfckzeYDpB0yPNKGiaDDg9XBGgcoKUkR WquSiHZBx1C/AQmB/dhFpTLNmG9ESF7NBvWlcCs+b4c9iZZfPfSXEA5bNXQKpjbS3gPi sbCIQqo1qKtPVHUmncGODTvlQhhk/g1sMHG8dghUSJLsewUL28bmCLcb8F4/lWgwkZWY /2SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=Ta+RsB2zCO31ZRCoxaJm9JlRrQGfexZpbu4OpVqwMjU=; b=lDpCIcBvGfPFzXhGUAa4NAurAh8PogMfPfYkw3Gf9tA479xJZdnYJwFNvRQwhhAnMf DL/UFjTIE7QaeVMLafKUtmug5n5nCPnB1krIQjwu8/gp6ggo3xZyeI7UiFvqjMuYUxQE Nt7vrU293oHeCnyEnuYbgnmMvVA440qvtrsoO3pbmhsU8HCgth9bAmix1/bmW46mNRRq +ENSYl8R1c1kVTsjf5+7iRdkuUiS28WNhQrHodM+43giww6cyv8+meLWXBfhVKgKNjDi cS4k/fMQ+nIv1p86rQ1Z4hEvHTU0ijmX0cAwabVkrgTfucag5Nhm8Gs2MxrzhhlBxL6Z kEwg== X-Gm-Message-State: AKaTC02fRdyF8xwPw7JzljwJaCw4nJ4+wFV4mJXHNYP+NgEd3MFJbGytHlxIqc8pIUx4F1SZQA29wH0n0vgB1g== X-Received: by 10.31.168.7 with SMTP id r7mr390026vke.148.1479351810607; Wed, 16 Nov 2016 19:03:30 -0800 (PST) MIME-Version: 1.0 Sender: sepherosa@gmail.com Received: by 10.159.36.247 with HTTP; Wed, 16 Nov 2016 19:03:30 -0800 (PST) In-Reply-To: <20161116221440.GA83880@wkstn-mjohnston.west.isilon.com> References: <201611150236.uAF2aCV8015106@repo.freebsd.org> <20161116221440.GA83880@wkstn-mjohnston.west.isilon.com> From: Sepherosa Ziehau Date: Thu, 17 Nov 2016 11:03:30 +0800 X-Google-Sender-Auth: 5Jn3gAJHqQEPG2Aw5D3ntHHnaVY Message-ID: Subject: Re: svn commit: r308664 - in head: contrib/hyperv/tools etc/devd etc/mtree include share/man/man4 sys/conf sys/dev/hyperv/utilities sys/modules/hyperv/utilities usr.sbin/hyperv usr.sbin/hyperv/tools us... To: Mark Johnston Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Nov 2016 03:03:32 -0000 On Thu, Nov 17, 2016 at 6:14 AM, Mark Johnston wrote: > On Tue, Nov 15, 2016 at 02:36:12AM +0000, Sepherosa Ziehau wrote: >> Author: sephe >> Date: Tue Nov 15 02:36:12 2016 >> New Revision: 308664 >> URL: https://svnweb.freebsd.org/changeset/base/308664 >> >> Log: >> hyperv/vss: Add driver and tools for VSS > > This appears to install hv_kvp_daemon and hv_vss_daemon to / instead of > /usr/sbin, and breaks the -DNO_ROOT build. I think a Makefile.inc is > needed in usr.sbin/hyperv/tools in order to preserve BINDIR from > usr.sbin/Makefile.inc. I fixed the problem in my tree with the diff > below, but am not sure if this is the right way to do it. For some > reason, doing this resulted in unused var warnings compiling > hv_vss_daemon.c. > > diff --git a/contrib/hyperv/tools/hv_vss_daemon.c b/contrib/hyperv/tools/hv_vss_daemon.c > index 8b58bc9..a1ba98d 100644 > --- a/contrib/hyperv/tools/hv_vss_daemon.c > +++ b/contrib/hyperv/tools/hv_vss_daemon.c > @@ -158,10 +158,9 @@ main(int argc, char* argv[]) > > struct pollfd hv_vss_poll_fd[1]; > uint32_t op; > - int ch, r, len, error; > + int ch, r, error; > int hv_vss_dev_fd; > > - int freeze_thaw = UNDEF_FREEZE_THAW; > while ((ch = getopt(argc, argv, "dnh")) != -1) { > switch (ch) { > case 'n': > diff --git a/usr.sbin/hyperv/Makefile.inc b/usr.sbin/hyperv/tools/Makefile.inc > similarity index 60% > rename from usr.sbin/hyperv/Makefile.inc > rename to usr.sbin/hyperv/tools/Makefile.inc > index edb0129..7e09f32 100644 > --- a/usr.sbin/hyperv/Makefile.inc > +++ b/usr.sbin/hyperv/tools/Makefile.inc > @@ -1,4 +1,4 @@ > # $FreeBSD$ > > CFLAGS.gcc+= -Wno-uninitialized > -.include "../Makefile.inc" > +.include "../../Makefile.inc" Committed! Thank you for the submission! -- Tomorrow Will Never Die