mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

sysutils/bhyve+: Fix build on 14-CURRENT

Browse source 
- Refactor code for better consistency
This commit is contained in:
PÁLI Gábor János 2023-04-01 17:06:31 +02:00 • committed by Ashish SHUKLA
parent 1e0ea4cadc
commit 0b6166cc30
No known key found for this signature in database
13 changed files with 88 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sysutils/bhyve+/Makefile
View file

@ -35,12 +35,19 @@ GH_TAGNAME= 7ef466772108856ee3e093735033232a6f1a3f04
USE_LDCONFIG= yes
LIBVMMAPI_VERSION= 5.1
LIB9P_VERSION= 1.1
PLIST_SUB= 9P_SHLIB_MAJOR=${LIB9P_VERSION} \
VMMAPI_SHLIB_MAJOR=${LIBVMMAPI_VERSION}
.if 1200000 <= ${OSVERSION} && ${OSVERSION} < 1300000
EXTRA_PATCHES= ${PATCHDIR}/freebsd-12 ${PATCHDIR}/freebsd-12/3
.elif 1301000 <= ${OSVERSION} && ${OSVERSION} < 1400000
EXTRA_PATCHES= ${PATCHDIR}/freebsd-13/1
.elif 1400000 <= ${OSVERSION} && ${OSVERSION} < 1500000
EXTRA_PATCHES= ${PATCHDIR}/freebsd-14
EXTRA_PATCHES= ${PATCHDIR}/freebsd-14
LIBVMMAPI_VERSION= 6.1
.else
. if empty(IGNORE)
IGNORE+= cannot build: unsupported system
@ -71,6 +78,18 @@ post-extract:
.endfor
@cd ${FILESDIR} && ${COPYTREE_SHARE} kernconf ${WRKSRC}
post-patch:
@cd ${WRKSRC} && \
${REINPLACE_CMD} 's/%%9P_SHLIB_MAJOR%%/${LIB9P_VERSION}/g' \
contrib/lib9p/Makefile \
usr.sbin/bhyve/Makefile
@cd ${WRKSRC} && \
${REINPLACE_CMD} 's/%%VMMAPI_SHLIB_MAJOR%%/${LIBVMMAPI_VERSION}/g' \
lib/libvmmapi/Makefile \
usr.sbin/bhyve/Makefile \
usr.sbin/bhyvectl/Makefile \
usr.sbin/bhyveload/Makefile
do-build:
@cd ${WRKSRC}/contrib/lib9p && \
${MAKE} SRCTOP=${WRKSRC} SYSDIR=${SRC_BASE}/sys LIB9PDIR=
@ -83,8 +102,8 @@ do-build:
.endfor
do-install:
${INSTALL_LIB} ${WRKSRC}/contrib/lib9p/lib9p.so.1.1 ${STAGEDIR}${PREFIX}/lib
${INSTALL_LIB} ${WRKSRC}/lib/libvmmapi/libvmmapi.so.5.1 ${STAGEDIR}${PREFIX}/lib
${INSTALL_LIB} ${WRKSRC}/contrib/lib9p/lib9p.so.${LIB9P_VERSION} ${STAGEDIR}${PREFIX}/lib
${INSTALL_LIB} ${WRKSRC}/lib/libvmmapi/libvmmapi.so.${LIBVMMAPI_VERSION} ${STAGEDIR}${PREFIX}/lib
.for _bin in bhyve bhyveload bhyvectl
${INSTALL_PROGRAM} ${WRKSRC}/usr.sbin/${_bin}/${_bin} ${STAGEDIR}${PREFIX}/sbin
${INSTALL_MAN} ${WRKSRC}/usr.sbin/${_bin}/${_bin}.8.gz ${STAGEDIR}${PREFIX}/man/man8

16
sysutils/bhyve+/files/freebsd-12/patch-libvmmapi
View file

@ -1,33 +1,33 @@
--- lib/libvmmapi/Makefile.orig 2021-09-04 01:05:23.110816000 UTC
--- lib/libvmmapi/Makefile.orig
+++ lib/libvmmapi/Makefile
@@ -6,6 +6,7 @@
INCS= vmmapi.h
WARNS?= 2
+SHLIB_MAJOR?= 5.1
+SHLIB_MAJOR= %%VMMAPI_SHLIB_MAJOR%%
LIBADD= util
--- usr.sbin/bhyvectl/Makefile.orig 2021-09-04 02:33:12.704720000 +0200
+++ usr.sbin/bhyvectl/Makefile 2021-09-04 02:34:28.740202000 +0200
--- usr.sbin/bhyvectl/Makefile.orig
+++ usr.sbin/bhyvectl/Makefile
@@ -8,7 +8,8 @@
MAN= bhyvectl.8
-LIBADD= vmmapi util
+LIBADD= util
+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1
+LDADD= ../../lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
WARNS?= 3
--- usr.sbin/bhyveload/Makefile.orig 2021-09-04 02:33:20.942548000 +0200
+++ usr.sbin/bhyveload/Makefile 2021-09-04 02:35:58.712996000 +0200
--- usr.sbin/bhyveload/Makefile.orig
+++ usr.sbin/bhyveload/Makefile
@@ -5,7 +5,7 @@
MAN= bhyveload.8
PACKAGE= bhyve
-LIBADD= vmmapi
+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1
+LDADD= ../../lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
WARNS?= 3

4
sysutils/bhyve+/files/freebsd-12/patch-msi-x-mappings
View file

@ -1,4 +1,4 @@
--- usr.sbin/bhyve/pci_emul.h.orig 2021-08-19 23:00:57 UTC
--- usr.sbin/bhyve/pci_emul.h.orig
+++ usr.sbin/bhyve/pci_emul.h
@@ -146,6 +146,7 @@ struct pci_devinst {
struct msix_table_entry *table; /* allocated at runtime */
@ -8,7 +8,7 @@
} pi_msix;
void *pi_arg; /* devemu-private data */
--- usr.sbin/bhyve/pci_passthru.c.orig 2021-08-19 23:00:57 UTC
--- usr.sbin/bhyve/pci_passthru.c.orig
+++ usr.sbin/bhyve/pci_passthru.c
@@ -324,13 +324,14 @@ msix_table_read(struct passthru_softc *sc, uint64_t of
return (data);

6
sysutils/bhyve+/files/freebsd-12/patch-virtio-9p
View file

@ -1,4 +1,4 @@
--- usr.sbin/bhyve/Makefile.orig 2021-08-19 23:00:57 UTC
--- usr.sbin/bhyve/Makefile.orig
+++ usr.sbin/bhyve/Makefile
@@ -3,6 +3,7 @@
#
@ -22,11 +22,11 @@
-LIBADD= vmmapi md pthread z util sbuf cam
+LIBADD= md pthread z util sbuf cam casper cap_pwd cap_grp
+LDADD= ../../contrib/lib9p/lib9p.so.1.1 ../../lib/libvmmapi/libvmmapi.so.5.1
+LDADD= ../../contrib/lib9p/lib9p.so.%%9P_SHLIB_MAJOR%% ../../lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
.if ${MK_INET_SUPPORT} != "no"
CFLAGS+=-DINET
--- usr.sbin/bhyve/pci_virtio_9p.c.orig 2021-08-19 22:44:10 UTC
--- usr.sbin/bhyve/pci_virtio_9p.c.orig
+++ usr.sbin/bhyve/pci_virtio_9p.c
@@ -0,0 +1,344 @@
+/*-

6
sysutils/bhyve+/files/freebsd-13/1/patch-custom-libs
View file

@ -1,5 +1,5 @@
--- usr.sbin/bhyve/Makefile.orig 2022-04-26 00:11:28.231312000 +0000
+++ usr.sbin/bhyve/Makefile 2022-04-26 00:12:31.807022000 +0000
--- usr.sbin/bhyve/Makefile.orig
+++ usr.sbin/bhyve/Makefile
@@ -3,7 +3,7 @@
#
@ -15,7 +15,7 @@
-LIBADD= vmmapi md nv pthread z util sbuf cam 9p
+LIBADD= md nv pthread z util sbuf cam
+LDADD= ../../contrib/lib9p/lib9p.so.1.1 ../../lib/libvmmapi/libvmmapi.so.5.1
+LDADD= ../../contrib/lib9p/lib9p.so.%%9P_SHLIB_MAJOR%% ../../lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
.if ${MK_CASPER} != "no"
LIBADD+= casper

4
sysutils/bhyve+/files/freebsd-13/1/patch-lib9p
View file

@ -1,5 +1,5 @@
--- share/mk/src.libnames.mk.orig 2022-04-26 00:33:13.464870000 +0000
+++ share/mk/src.libnames.mk 2022-04-26 00:34:36.615330000 +0000
--- share/mk/src.libnames.mk.orig
+++ share/mk/src.libnames.mk
@@ -265,6 +265,9 @@
# 2nd+ order consumers. Auto-generating this would be better.
_DP_80211= sbuf bsdxml

18
sysutils/bhyve+/files/freebsd-13/1/patch-libvmmapi
View file

@ -1,33 +1,33 @@
--- usr.sbin/bhyvectl/Makefile.orig 2022-04-26 00:35:36.192928000 +0000
+++ usr.sbin/bhyvectl/Makefile 2022-04-26 00:36:35.181368000 +0000
--- usr.sbin/bhyvectl/Makefile.orig
+++ usr.sbin/bhyvectl/Makefile
@@ -10,7 +10,8 @@
MAN= bhyvectl.8
-LIBADD= vmmapi util
+LIBADD= util
+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1
+LDADD= ../../lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
WARNS?= 3
--- usr.sbin/bhyveload/Makefile.orig 2022-04-26 00:36:44.251099000 +0000
+++ usr.sbin/bhyveload/Makefile 2022-04-26 00:37:15.919627000 +0000
--- usr.sbin/bhyveload/Makefile.orig
+++ usr.sbin/bhyveload/Makefile
@@ -5,7 +5,7 @@
MAN= bhyveload.8
PACKAGE= bhyve
-LIBADD= vmmapi
+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1
+LDADD= ../../lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
WARNS?= 3
--- lib/libvmmapi/Makefile.orig 2022-04-26 00:37:35.557718000 +0000
+++ lib/libvmmapi/Makefile 2022-04-26 00:38:23.135897000 +0000
--- lib/libvmmapi/Makefile.orig
+++ lib/libvmmapi/Makefile
@@ -5,6 +5,8 @@
SRCS= vmmapi.c vmmapi_freebsd.c
INCS= vmmapi.h
+SHLIB_MAJOR?= 5.1
+SHLIB_MAJOR= %%VMMAPI_SHLIB_MAJOR%%
+
LIBADD= util

12
sysutils/bhyve+/files/freebsd-14/patch-bhyvectl
View file

@ -1,12 +0,0 @@
--- usr.sbin/bhyvectl/Makefile.orig 2021-09-04 02:33:12.704720000 +0200
+++ usr.sbin/bhyvectl/Makefile 2021-09-04 02:34:28.740202000 +0200
@@ -10,7 +10,8 @@
MAN= bhyvectl.8
-LIBADD= vmmapi util
+LIBADD= util
+LDADD= ${SRCTOP}/lib/libvmmapi/libvmmapi.so.5.1
WARNS?= 3

11
sysutils/bhyve+/files/freebsd-14/patch-bhyveload
View file

@ -1,11 +0,0 @@
--- usr.sbin/bhyveload/Makefile.orig 2021-09-25 15:07:46.189926000 +0000
+++ usr.sbin/bhyveload/Makefile 2021-09-25 15:08:40.718294000 +0000
@@ -5,7 +5,7 @@
MAN= bhyveload.8
PACKAGE= bhyve
-LIBADD= vmmapi
+LDADD= ${SRCTOP}/lib/libvmmapi/libvmmapi.so.5.1
WARNS?= 3

14
sysutils/bhyve+/files/freebsd-14/patch-custom-libs
View file

@ -1,5 +1,5 @@
--- usr.sbin/bhyve/Makefile.orig 2021-09-04 02:15:16.364660000 +0200
+++ usr.sbin/bhyve/Makefile 2021-09-04 02:21:26.014446000 +0200
--- usr.sbin/bhyve/Makefile.orig
+++ usr.sbin/bhyve/Makefile
@@ -3,7 +3,7 @@
#
@ -9,13 +9,13 @@
CFLAGS+=-I${SRCTOP}/sys
.PATH: ${SRCTOP}/sys/cam/ctl
@@ -83,7 +83,8 @@
@@ -88,7 +88,8 @@
.PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm
SRCS+= vmm_instruction_emul.c
-LIBADD= vmmapi md nv pthread z util sbuf cam 9p
+LIBADD= md nv pthread z util sbuf cam
+LDADD= ${SRCTOP}/contrib/lib9p/lib9p.so.1.1 ${SRCTOP}/lib/libvmmapi/libvmmapi.so.5.1
+LIBADD= md nv pthread z util sbuf cam 9p
+LDADD= ${SRCTOP}/contrib/lib9p/lib9p.so.%%9P_SHLIB_MAJOR%% ${SRCTOP}/lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
.if ${MK_CASPER} != "no"
LIBADD+= casper
.if ${MK_BHYVE_SNAPSHOT} != "no"
LIBADD+= ucl xo

33
sysutils/bhyve+/files/freebsd-14/patch-libvmmapi
View file

@ -1,9 +1,34 @@
--- lib/libvmmapi/Makefile.orig 2021-09-04 01:05:23.110816000 UTC
--- lib/libvmmapi/Makefile.orig
+++ lib/libvmmapi/Makefile
@@ -6,6 +6,7 @@
@@ -2,7 +2,7 @@
PACKAGE=lib${LIB}
LIB= vmmapi
-SHLIB_MAJOR= 6
+SHLIB_MAJOR= %%VMMAPI_SHLIB_MAJOR%%
SRCS= vmmapi.c vmmapi_freebsd.c
INCS= vmmapi.h
+SHLIB_MAJOR?= 5.1
--- usr.sbin/bhyvectl/Makefile.orig
+++ usr.sbin/bhyvectl/Makefile
@@ -10,7 +10,8 @@
LIBADD= util
MAN= bhyvectl.8
-LIBADD= vmmapi util
+LIBADD= util
+LDADD= ${SRCTOP}/lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
WARNS?= 3
--- usr.sbin/bhyveload/Makefile.orig
+++ usr.sbin/bhyveload/Makefile
@@ -5,7 +5,7 @@
MAN= bhyveload.8
PACKAGE= bhyve
-LIBADD= vmmapi
+LDADD= ${SRCTOP}/lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
WARNS?= 3

2
sysutils/bhyve+/files/patch-lib9p
View file

@ -5,7 +5,7 @@
LIB= 9p
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 1.1
+SHLIB_MAJOR= %%9P_SHLIB_MAJOR%%
SRCS= pack.c \
connection.c \
request.c log.c \

4
sysutils/bhyve+/pkg-plist
View file

@ -1,8 +1,8 @@
sbin/bhyve
sbin/bhyvectl
sbin/bhyveload
lib/lib9p.so.1.1
lib/libvmmapi.so.5.1
lib/lib9p.so.%%9P_SHLIB_MAJOR%%
lib/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
man/man8/bhyve.8.gz
man/man8/bhyvectl.8.gz
man/man8/bhyveload.8.gz