From 96dba2b2345df7ace195b4a918b1ec22a81dccd9 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Fri, 6 Jul 2018 09:17:14 +0000 Subject: [PATCH] - Update to 1.2 PR: 229515 Submitted by: maintainer --- sysutils/vm-bhyve/Makefile | 3 +-- sysutils/vm-bhyve/distinfo | 6 +++--- sysutils/vm-bhyve/files/patch-lib_vm-util | 22 ---------------------- sysutils/vm-bhyve/files/patch-lib_vm-zfs | 11 ----------- sysutils/vm-bhyve/pkg-message | 10 +++------- sysutils/vm-bhyve/pkg-plist | 10 ++++++++++ 6 files changed, 17 insertions(+), 45 deletions(-) delete mode 100644 sysutils/vm-bhyve/files/patch-lib_vm-util delete mode 100644 sysutils/vm-bhyve/files/patch-lib_vm-zfs diff --git a/sysutils/vm-bhyve/Makefile b/sysutils/vm-bhyve/Makefile index 94b482ef2854..a274f13270f1 100644 --- a/sysutils/vm-bhyve/Makefile +++ b/sysutils/vm-bhyve/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= vm-bhyve -PORTVERSION= 1.1.8 -PORTREVISION= 2 +PORTVERSION= 1.2.2 DISTVERSIONPREFIX=v CATEGORIES= sysutils diff --git a/sysutils/vm-bhyve/distinfo b/sysutils/vm-bhyve/distinfo index dc0f64a8cb74..1491cbf01f2d 100644 --- a/sysutils/vm-bhyve/distinfo +++ b/sysutils/vm-bhyve/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1496917755 -SHA256 (churchers-vm-bhyve-v1.1.8_GH0.tar.gz) = 2c716a03a4d94d0867fd081d5dc0abc342d66a23208b606e659d10eed56c3114 -SIZE (churchers-vm-bhyve-v1.1.8_GH0.tar.gz) = 54985 +TIMESTAMP = 1530694001 +SHA256 (churchers-vm-bhyve-v1.2.2_GH0.tar.gz) = b80a0549e0ae3b09fac03f3ba4fdb84a758fc2982d5eb154c6d98be27b1fcc55 +SIZE (churchers-vm-bhyve-v1.2.2_GH0.tar.gz) = 65186 diff --git a/sysutils/vm-bhyve/files/patch-lib_vm-util b/sysutils/vm-bhyve/files/patch-lib_vm-util deleted file mode 100644 index 6ea501e2c449..000000000000 --- a/sysutils/vm-bhyve/files/patch-lib_vm-util +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/vm-util.orig -+++ lib/vm-util -@@ -55,7 +55,7 @@ - # @modifies VM_NO_UG - # - util::check_bhyve_support(){ -- local _mesg _result -+ local _mesg _mesg1 _mesg2 _result - - # basic checks - [ `id -u` -ne 0 ] && util::err "virtual machines can only be managed by root" -@@ -73,7 +73,9 @@ - fi - - # check ept for intel -- _mesg=$(grep -E '^[ ]+VT-x' /var/run/dmesg.boot | tail -n 1) -+ _mesg1=$(grep -E '^[ ]+VT-x' /var/run/dmesg.boot | tail -n 1) -+ _mesg2=$(grep -E '^[ ]+Secondary Processor Controls' /var/run/dmesg.boot | tail -n 1) -+ _mesg="${_mesg1}${_mesg2}" - - if [ -n "${_mesg}" ]; then - diff --git a/sysutils/vm-bhyve/files/patch-lib_vm-zfs b/sysutils/vm-bhyve/files/patch-lib_vm-zfs deleted file mode 100644 index 2d4d2f3fef3f..000000000000 --- a/sysutils/vm-bhyve/files/patch-lib_vm-zfs +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/vm-zfs.orig -+++ lib/vm-zfs -@@ -45,7 +45,7 @@ - - # check for zfs storage location - # user should specify "zfs:pool/dataset" if they want ZFS support -- if [ ${vm_dir%%:*} = "zfs" ]; then -+ if [ "${vm_dir%%:*}" = "zfs" ]; then - - # check zfs running - kldstat -qm zfs >/dev/null 2>&1 diff --git a/sysutils/vm-bhyve/pkg-message b/sysutils/vm-bhyve/pkg-message index da251aa71dec..31d6ed9527a4 100644 --- a/sysutils/vm-bhyve/pkg-message +++ b/sysutils/vm-bhyve/pkg-message @@ -1,4 +1,4 @@ -To enable vm-bhyve, please add the following lines to /etc/rc.conf, +To enable vm-bhyve, please add the following lines to rc.conf, depending on whether you are using ZFS storage or not. Please note that the directory or dataset specified should already exist. @@ -14,11 +14,7 @@ Then run 'vm init'. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -If upgrading from 1.0 or earlier, please note that the 'guest' -configuration option is no longer used. - -Guests that are not using UEFI boot will need either loader="grub" -or loader="bhyveload" in their configuration in order to make sure -the correct loader is used. +Please note, if upgrading from version 1.1, it is advised to shutdown guests +and restart the host in order to re-create all virtual switches using new identifiers. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/sysutils/vm-bhyve/pkg-plist b/sysutils/vm-bhyve/pkg-plist index 6c3c617f9632..7494c005c851 100644 --- a/sysutils/vm-bhyve/pkg-plist +++ b/sysutils/vm-bhyve/pkg-plist @@ -5,21 +5,31 @@ lib/vm-bhyve/vm-core lib/vm-bhyve/vm-datastore lib/vm-bhyve/vm-guest lib/vm-bhyve/vm-info +lib/vm-bhyve/vm-migration lib/vm-bhyve/vm-rctl lib/vm-bhyve/vm-run lib/vm-bhyve/vm-switch +lib/vm-bhyve/vm-switch-manual +lib/vm-bhyve/vm-switch-standard +lib/vm-bhyve/vm-switch-vale +lib/vm-bhyve/vm-switch-vxlan lib/vm-bhyve/vm-util lib/vm-bhyve/vm-zfs man/man8/vm.8.gz sbin/vm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alpine.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arch.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos6.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos7.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.sample +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coreos.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/default.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dragonfly.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/freebsd-zvol.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freepbx.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/netbsd.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/openbsd.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resflash.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ubuntu.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/windows.conf