Date: Sat, 18 Dec 2021 11:39:52 GMT From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 58f8d6ca4907 - main - sysutils/bhyve+: Update for 12.3-RELEASE, and 14-CURRENT Message-ID: <202112181139.1BIBdqDM099437@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=58f8d6ca4907d12a07863333204a576126d0cc04 commit 58f8d6ca4907d12a07863333204a576126d0cc04 Author: PÁLI Gábor János <pali.gabor@gmail.com> AuthorDate: 2021-12-18 11:18:22 +0000 Commit: Ashish SHUKLA <ashish@FreeBSD.org> CommitDate: 2021-12-18 11:25:32 +0000 sysutils/bhyve+: Update for 12.3-RELEASE, and 14-CURRENT --- sysutils/bhyve+/Makefile | 5 ++++ sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p | 31 ++++++++++++++++++++++ sysutils/bhyve+/files/freebsd-12/3/patch-virtio-9p | 31 ++++++++++++++++++++++ sysutils/bhyve+/files/freebsd-12/patch-virtio-9p | 31 ---------------------- sysutils/bhyve+/files/freebsd-14/patch-lib9p | 14 +++++----- sysutils/bhyve+/files/kernconf/opt_inet.h | 0 sysutils/bhyve+/files/kernconf/opt_inet6.h | 0 sysutils/bhyve+/files/kernconf/opt_platform.h | 0 8 files changed, 74 insertions(+), 38 deletions(-) diff --git a/sysutils/bhyve+/Makefile b/sysutils/bhyve+/Makefile index 9945c581697f..4de4b073dbf7 100644 --- a/sysutils/bhyve+/Makefile +++ b/sysutils/bhyve+/Makefile @@ -35,6 +35,11 @@ USE_LDCONFIG= yes .if 1200000 <= ${OSVERSION} && ${OSVERSION} < 1300000 EXTRA_PATCHES= ${PATCHDIR}/freebsd-12 +.if ${OSVERSION} < 1203000 +EXTRA_PATCHES+= ${PATCHDIR}/freebsd-12/2 +.else +EXTRA_PATCHES+= ${PATCHDIR}/freebsd-12/3 +.endif .elif 1300000 <= ${OSVERSION} && ${OSVERSION} < 1400000 EXTRA_PATCHES= ${PATCHDIR}/freebsd-13 .elif 1400000 <= ${OSVERSION} && ${OSVERSION} < 1500000 diff --git a/sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p b/sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p new file mode 100644 index 000000000000..9ce027d3171a --- /dev/null +++ b/sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p @@ -0,0 +1,31 @@ +--- usr.sbin/bhyve/bhyve.8.orig 2021-08-19 22:38:50 UTC ++++ usr.sbin/bhyve/bhyve.8 +@@ -242,6 +242,8 @@ Virtio network interface. + Virtio block storage interface. + .It Li virtio-scsi + Virtio SCSI interface. ++.It Li virtio-9p ++Virtio 9p (VirtFS) interface. + .It Li virtio-rnd + Virtio RNG interface. + .It Li virtio-console +@@ -327,6 +329,19 @@ are: + .It Li iid= Ns Ar IID + Initiator ID to use when sending requests to specified CTL port. + The default value is 0. ++.El ++.Pp ++9P devices: ++.Bl -tag -width 10n ++.It Pa sharename=/path/to/share[,9p-device-options] ++.El ++.Pp ++The ++.Ar 9p-device-options ++are: ++.Bl -tag -width 10n ++.It Li ro ++Expose the share in read-only mode. + .El + .Pp + TTY devices: diff --git a/sysutils/bhyve+/files/freebsd-12/3/patch-virtio-9p b/sysutils/bhyve+/files/freebsd-12/3/patch-virtio-9p new file mode 100644 index 000000000000..28457afb3486 --- /dev/null +++ b/sysutils/bhyve+/files/freebsd-12/3/patch-virtio-9p @@ -0,0 +1,31 @@ +--- usr.sbin/bhyve/bhyve.8.orig 2021-12-17 02:14:53.986085000 +0100 ++++ usr.sbin/bhyve/bhyve.8 2021-12-17 02:21:03.716235000 +0100 +@@ -299,6 +299,8 @@ + Virtio block storage interface. + .It Cm virtio-scsi + Virtio SCSI interface. ++.It Cm virtio-9p ++Virtio 9p (VirtFS) interface. + .It Cm virtio-rnd + Virtio RNG interface. + .It Cm virtio-console +@@ -404,6 +406,19 @@ + .It Cm iid= Ns Ar IID + Initiator ID to use when sending requests to specified CTL port. + The default value is 0. ++.El ++.Pp ++9P devices: ++.Bl -tag -width 10n ++.It Pa sharename=/path/to/share[,9p-device-options] ++.El ++.Pp ++The ++.Ar 9p-device-options ++are: ++.Bl -tag -width 10n ++.It Li ro ++Expose the share in read-only mode. + .El + .Pp + TTY device backends: diff --git a/sysutils/bhyve+/files/freebsd-12/patch-virtio-9p b/sysutils/bhyve+/files/freebsd-12/patch-virtio-9p index 6799fd986342..1e14bcd58d61 100644 --- a/sysutils/bhyve+/files/freebsd-12/patch-virtio-9p +++ b/sysutils/bhyve+/files/freebsd-12/patch-virtio-9p @@ -1,34 +1,3 @@ ---- usr.sbin/bhyve/bhyve.8.orig 2021-08-19 22:38:50 UTC -+++ usr.sbin/bhyve/bhyve.8 -@@ -242,6 +242,8 @@ Virtio network interface. - Virtio block storage interface. - .It Li virtio-scsi - Virtio SCSI interface. -+.It Li virtio-9p -+Virtio 9p (VirtFS) interface. - .It Li virtio-rnd - Virtio RNG interface. - .It Li virtio-console -@@ -327,6 +329,19 @@ are: - .It Li iid= Ns Ar IID - Initiator ID to use when sending requests to specified CTL port. - The default value is 0. -+.El -+.Pp -+9P devices: -+.Bl -tag -width 10n -+.It Pa sharename=/path/to/share[,9p-device-options] -+.El -+.Pp -+The -+.Ar 9p-device-options -+are: -+.Bl -tag -width 10n -+.It Li ro -+Expose the share in read-only mode. - .El - .Pp - TTY devices: --- usr.sbin/bhyve/Makefile.orig 2021-08-19 23:00:57 UTC +++ usr.sbin/bhyve/Makefile @@ -3,6 +3,7 @@ diff --git a/sysutils/bhyve+/files/freebsd-14/patch-lib9p b/sysutils/bhyve+/files/freebsd-14/patch-lib9p index 97f2fd5b00a7..41bf90a59d7d 100644 --- a/sysutils/bhyve+/files/freebsd-14/patch-lib9p +++ b/sysutils/bhyve+/files/freebsd-14/patch-lib9p @@ -1,12 +1,12 @@ ---- share/mk/src.libnames.mk.orig 2021-09-04 10:14:17.407288000 +0200 -+++ share/mk/src.libnames.mk 2021-09-04 10:15:27.832153000 +0200 -@@ -245,6 +245,9 @@ +--- share/mk/src.libnames.mk.orig 2021-12-17 02:31:11.492798000 +0100 ++++ share/mk/src.libnames.mk 2021-12-17 02:36:30.736989000 +0100 +@@ -261,6 +261,9 @@ # 2nd+ order consumers. Auto-generating this would be better. _DP_80211= sbuf bsdxml _DP_9p= sbuf +.if ${MK_CASPER} != "no" -+_DP_9p+= casper cap_pwd cap_grp ++_DP_9p+= casper cap_pwd cap_grp +.endif - _DP_archive= z bz2 lzma bsdxml zstd - _DP_zstd= pthread - .if ${MK_BLACKLIST} != "no" + # XXX: Not bootstrapped so uses host version on non-FreeBSD, so don't use a + # FreeBSD-specific dependency list + .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) diff --git a/sysutils/bhyve+/files/kernconf/opt_inet.h b/sysutils/bhyve+/files/kernconf/opt_inet.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sysutils/bhyve+/files/kernconf/opt_inet6.h b/sysutils/bhyve+/files/kernconf/opt_inet6.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sysutils/bhyve+/files/kernconf/opt_platform.h b/sysutils/bhyve+/files/kernconf/opt_platform.h new file mode 100644 index 000000000000..e69de29bb2d1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112181139.1BIBdqDM099437>