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...
Sepherosa Ziehau
sephe at freebsd.org
Thu Nov 17 03:03:32 UTC 2016
On Thu, Nov 17, 2016 at 6:14 AM, Mark Johnston <markj at freebsd.org> 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
More information about the svn-src-all
mailing list