git: 4928772f0bf3 - main - sysutils/bhyve+: Remove expired port

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Rene Ladan <rene_at_FreeBSD.org>
Date: Mon, 30 Sep 2024 19:20:46 UTC
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4928772f0bf3a95bacc3757f0c1e1b9d969015d8

commit 4928772f0bf3a95bacc3757f0c1e1b9d969015d8
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-09-30 19:20:39 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-09-30 19:20:39 +0000

    sysutils/bhyve+: Remove expired port
    
    2024-09-30 sysutils/bhyve+: EOLed upstream
---
 MOVED                                              |   1 +
 sysutils/Makefile                                  |   1 -
 sysutils/bhyve+/Makefile                           | 117 ---------------------
 sysutils/bhyve+/distinfo                           |   3 -
 .../bhyve+/files/freebsd-13/1/patch-custom-libs    |  21 ----
 sysutils/bhyve+/files/freebsd-13/1/patch-lib9p     |  12 ---
 sysutils/bhyve+/files/freebsd-13/1/patch-libvmmapi |  34 ------
 sysutils/bhyve+/files/freebsd-14/patch-custom-libs |  21 ----
 sysutils/bhyve+/files/freebsd-14/patch-libvmmapi   |  34 ------
 sysutils/bhyve+/files/kernconf/opt_acpi.h          |   2 -
 .../bhyve+/files/kernconf/opt_bhyve_snapshot.h     |   1 -
 sysutils/bhyve+/files/kernconf/opt_ddb.h           |   1 -
 sysutils/bhyve+/files/kernconf/opt_global.h        |   3 -
 sysutils/bhyve+/files/kernconf/opt_inet.h          |   1 -
 sysutils/bhyve+/files/kernconf/opt_inet6.h         |   1 -
 sysutils/bhyve+/files/kernconf/opt_platform.h      |   1 -
 sysutils/bhyve+/files/patch-lib9p                  |  24 -----
 sysutils/bhyve+/pkg-descr                          |   2 -
 sysutils/bhyve+/pkg-plist                          |   9 --
 19 files changed, 1 insertion(+), 288 deletions(-)

diff --git a/MOVED b/MOVED
index 9733c23945ca..d9f07b277f4c 100644
--- a/MOVED
+++ b/MOVED
@@ -3509,3 +3509,4 @@ sysutils/bacula11-client-static||2024-09-30|Has expired: Unsupported. Please mig
 sysutils/bacula11-docs||2024-09-30|Has expired: Unsupported. Please migrate to bacula15-server
 sysutils/bacula11-server||2024-09-30|Has expired: Unsupported. Please migrate to bacula15-server
 net-mgmt/nagios-check_bacula11||2024-09-30|Has expired: Unsupported. Please migrate to bacula15-server
+sysutils/bhyve+||2024-09-30|Has expired: EOLed upstream
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 78e85c73ec2d..b0310dda35fd 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -124,7 +124,6 @@
     SUBDIR += beats7
     SUBDIR += beats8
     SUBDIR += bfs
-    SUBDIR += bhyve+
     SUBDIR += bhyve-firmware
     SUBDIR += bhyve-rc
     SUBDIR += bhyvemgr
diff --git a/sysutils/bhyve+/Makefile b/sysutils/bhyve+/Makefile
deleted file mode 100644
index d2efa9024e96..000000000000
--- a/sysutils/bhyve+/Makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-PORTNAME=	bhyve+
-PORTVERSION=	0.1.0
-PORTREVISION=	2
-CATEGORIES=	sysutils
-
-MAINTAINER=	pali.gabor@gmail.com
-COMMENT=	BHyVe with unofficial extensions
-WWW=		https://github.com/pgj/freebsd-bhyve-plus-port
-
-LICENSE=	BSD2CLAUSE
-
-DEPRECATED=	EOLed upstream
-EXPIRATION_DATE=2024-09-30
-
-ONLY_FOR_ARCHS=	amd64
-USES=		kmod uidfix
-
-.include <bsd.port.options.mk>
-
-SRCS=		${SRC_BASE}/sys/modules/vmm \
-		${SRC_BASE}/sys/amd64/vmm \
-		${SRC_BASE}/sys/conf \
-		${SRC_BASE}/lib/libvmmapi \
-		${SRC_BASE}/usr.sbin/bhyve \
-		${SRC_BASE}/usr.sbin/bhyvectl \
-		${SRC_BASE}/usr.sbin/bhyveload \
-		${SRC_BASE}/share/mk \
-		${SRC_BASE}/contrib/bmake/mk
-
-.for _src in ${SRCS}
-.  if !exists(${_src}) && empty(IGNORE)
-IGNORE+=	requires bhyve and vmm source files in ${_src}
-.  endif
-.endfor
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	conclusiveeng
-GH_PROJECT=	lib9p
-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 1302000 <= ${OSVERSION} && ${OSVERSION} < 1400000
-EXTRA_PATCHES=	${PATCHDIR}/freebsd-13/1
-.elif 1400000 <= ${OSVERSION} && ${OSVERSION} < 1500000
-EXTRA_PATCHES=		${PATCHDIR}/freebsd-14
-LIBVMMAPI_VERSION=	6.1
-.else
-.  if empty(IGNORE)
-IGNORE+=	cannot build: unsupported system
-.  endif
-.endif
-
-WRKSRC=		${WRKDIR}
-
-_LINKS=		sys/cam/ctl \
-		sys/contrib/dev/acpica \
-		sys/dev/e1000 \
-		sys/dev/mii \
-		sys/dev/usb/controller \
-		sys/dev/virtio \
-		sys/amd64/include \
-		sys/x86/include \
-		sys/libkern \
-		stand/userboot
-
-post-extract:
-	@${MKDIR} ${WRKSRC}/contrib
-	@cd ${WRKSRC} && ${LN} -s ../${GH_PROJECT}-${GH_TAGNAME} contrib/lib9p
-.for _link in ${_LINKS}
-	@${MKDIR} $$(dirname ${WRKSRC}/${_link})
-	@cd ${WRKSRC} && ${LN} -s ${SRC_BASE}/${_link} ${_link}
-.endfor
-.for _src in ${SRCS}
-	@cd ${_src} && ${COPYTREE_SHARE} . ${WRKDIR}/${_src:S/${SRC_BASE}//1}
-.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=
-.for _src in ${SRCS}
-.  if exists(${_src}/Makefile)
-	@cd ${WRKSRC}/${_src:S/${SRC_BASE}//1} && \
-		${MAKE} SRCTOP=${WRKSRC} SYSDIR=${SRC_BASE}/sys DEBUG_FLAGS=-g \
-		MK_CTF=yes KERNBUILDDIR=${WRKSRC}/kernconf
-.  endif
-.endfor
-
-do-install:
-	${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}/share/man/man8
-.endfor
-	${INSTALL_KLD} ${WRKSRC}/sys/modules/vmm/vmm.ko ${STAGEDIR}${KMODDIR}
-
-.include <bsd.port.mk>
diff --git a/sysutils/bhyve+/distinfo b/sysutils/bhyve+/distinfo
deleted file mode 100644
index 2c17bd4508cf..000000000000
--- a/sysutils/bhyve+/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1630740589
-SHA256 (conclusiveeng-lib9p-0.1.0-7ef466772108856ee3e093735033232a6f1a3f04_GH0.tar.gz) = 309c8dfc8cc6ff0ab72af6fa36fb0b7dd26c90bfeac0e11ef39344bf64cc2147
-SIZE (conclusiveeng-lib9p-0.1.0-7ef466772108856ee3e093735033232a6f1a3f04_GH0.tar.gz) = 145598
diff --git a/sysutils/bhyve+/files/freebsd-13/1/patch-custom-libs b/sysutils/bhyve+/files/freebsd-13/1/patch-custom-libs
deleted file mode 100644
index 61b6a93ce908..000000000000
--- a/sysutils/bhyve+/files/freebsd-13/1/patch-custom-libs
+++ /dev/null
@@ -1,21 +0,0 @@
---- usr.sbin/bhyve/Makefile.orig
-+++ usr.sbin/bhyve/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- .include <src.opts.mk>
--CFLAGS+=-I${.CURDIR}/../../contrib/lib9p
-+CFLAGS+=-I${SRCTOP}/contrib/lib9p
- CFLAGS+=-I${SRCTOP}/sys
- .PATH:  ${SRCTOP}/sys/cam/ctl
- 
-@@ -84,7 +84,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= ../../contrib/lib9p/lib9p.so.%%9P_SHLIB_MAJOR%% ../../lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
- 
- .if ${MK_CASPER} != "no"
- LIBADD+=	casper
diff --git a/sysutils/bhyve+/files/freebsd-13/1/patch-lib9p b/sysutils/bhyve+/files/freebsd-13/1/patch-lib9p
deleted file mode 100644
index 8a0eefb16f83..000000000000
--- a/sysutils/bhyve+/files/freebsd-13/1/patch-lib9p
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
- _DP_9p=		sbuf
-+.if ${MK_CASPER} != "no"
-+_DP_9p+=       casper cap_pwd cap_grp
-+.endif
- # 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/freebsd-13/1/patch-libvmmapi b/sysutils/bhyve+/files/freebsd-13/1/patch-libvmmapi
deleted file mode 100644
index 1ce7f3e3e829..000000000000
--- a/sysutils/bhyve+/files/freebsd-13/1/patch-libvmmapi
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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.%%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= ../../lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
- 
- WARNS?=	3
- 
---- lib/libvmmapi/Makefile.orig
-+++ lib/libvmmapi/Makefile
-@@ -5,6 +5,8 @@
- SRCS=	vmmapi.c vmmapi_freebsd.c
- INCS=	vmmapi.h
- 
-+SHLIB_MAJOR=	%%VMMAPI_SHLIB_MAJOR%%
-+
- LIBADD=	util
- 
- CFLAGS+= -I${.CURDIR}
diff --git a/sysutils/bhyve+/files/freebsd-14/patch-custom-libs b/sysutils/bhyve+/files/freebsd-14/patch-custom-libs
deleted file mode 100644
index 721ea1e559e9..000000000000
--- a/sysutils/bhyve+/files/freebsd-14/patch-custom-libs
+++ /dev/null
@@ -1,21 +0,0 @@
---- usr.sbin/bhyve/Makefile.orig
-+++ usr.sbin/bhyve/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- .include <src.opts.mk>
--CFLAGS+=-I${.CURDIR}/../../contrib/lib9p
-+CFLAGS+=-I${SRCTOP}/contrib/lib9p
- CFLAGS+=-I${SRCTOP}/sys
- .PATH:  ${SRCTOP}/sys/cam/ctl
- 
-@@ -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 9p
-+LDADD= ${SRCTOP}/contrib/lib9p/lib9p.so.%%9P_SHLIB_MAJOR%% ${SRCTOP}/lib/libvmmapi/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
- 
- .if ${MK_BHYVE_SNAPSHOT} != "no"
- LIBADD+= ucl xo
diff --git a/sysutils/bhyve+/files/freebsd-14/patch-libvmmapi b/sysutils/bhyve+/files/freebsd-14/patch-libvmmapi
deleted file mode 100644
index 66890febaf6f..000000000000
--- a/sysutils/bhyve+/files/freebsd-14/patch-libvmmapi
+++ /dev/null
@@ -1,34 +0,0 @@
---- lib/libvmmapi/Makefile.orig
-+++ lib/libvmmapi/Makefile
-@@ -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
- 
---- usr.sbin/bhyvectl/Makefile.orig
-+++ usr.sbin/bhyvectl/Makefile
-@@ -10,7 +10,8 @@
- 
- 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
- 
diff --git a/sysutils/bhyve+/files/kernconf/opt_acpi.h b/sysutils/bhyve+/files/kernconf/opt_acpi.h
deleted file mode 100644
index 2a4ebae95886..000000000000
--- a/sysutils/bhyve+/files/kernconf/opt_acpi.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ACPI_DMAR 1
-#define DEV_ACPI 1
diff --git a/sysutils/bhyve+/files/kernconf/opt_bhyve_snapshot.h b/sysutils/bhyve+/files/kernconf/opt_bhyve_snapshot.h
deleted file mode 100644
index 858b221cffac..000000000000
--- a/sysutils/bhyve+/files/kernconf/opt_bhyve_snapshot.h
+++ /dev/null
@@ -1 +0,0 @@
-/* This file is left blank intentionally. */
diff --git a/sysutils/bhyve+/files/kernconf/opt_ddb.h b/sysutils/bhyve+/files/kernconf/opt_ddb.h
deleted file mode 100644
index 79d95ae3ad8d..000000000000
--- a/sysutils/bhyve+/files/kernconf/opt_ddb.h
+++ /dev/null
@@ -1 +0,0 @@
-#define DDB_CTF 1
diff --git a/sysutils/bhyve+/files/kernconf/opt_global.h b/sysutils/bhyve+/files/kernconf/opt_global.h
deleted file mode 100644
index 3c736873d19c..000000000000
--- a/sysutils/bhyve+/files/kernconf/opt_global.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define KDB 1
-#define SMP 1
-#define KDTRACE_HOOKS 1
diff --git a/sysutils/bhyve+/files/kernconf/opt_inet.h b/sysutils/bhyve+/files/kernconf/opt_inet.h
deleted file mode 100644
index 858b221cffac..000000000000
--- a/sysutils/bhyve+/files/kernconf/opt_inet.h
+++ /dev/null
@@ -1 +0,0 @@
-/* This file is left blank intentionally. */
diff --git a/sysutils/bhyve+/files/kernconf/opt_inet6.h b/sysutils/bhyve+/files/kernconf/opt_inet6.h
deleted file mode 100644
index 858b221cffac..000000000000
--- a/sysutils/bhyve+/files/kernconf/opt_inet6.h
+++ /dev/null
@@ -1 +0,0 @@
-/* This file is left blank intentionally. */
diff --git a/sysutils/bhyve+/files/kernconf/opt_platform.h b/sysutils/bhyve+/files/kernconf/opt_platform.h
deleted file mode 100644
index 858b221cffac..000000000000
--- a/sysutils/bhyve+/files/kernconf/opt_platform.h
+++ /dev/null
@@ -1 +0,0 @@
-/* This file is left blank intentionally. */
diff --git a/sysutils/bhyve+/files/patch-lib9p b/sysutils/bhyve+/files/patch-lib9p
deleted file mode 100644
index 8818ca5f926f..000000000000
--- a/sysutils/bhyve+/files/patch-lib9p
+++ /dev/null
@@ -1,24 +0,0 @@
---- contrib/lib9p/Makefile.orig	2021-01-08 21:21:39.000000000 UTC
-+++ contrib/lib9p/Makefile
-@@ -5,7 +5,7 @@
- .include <src.opts.mk>
- 
- LIB=		9p
--SHLIB_MAJOR=	1
-+SHLIB_MAJOR=	%%9P_SHLIB_MAJOR%%
- SRCS=		pack.c \
- 		connection.c \
- 		request.c log.c \
-@@ -23,11 +23,9 @@
- LIBADD=		sbuf
- 
- .if ${MK_CASPER} != "no"
--LIBADD+=	libcasper libcap_pwd libcap_grp
-+LIBADD+=	casper cap_pwd cap_grp
- CFLAGS+=	-DWITH_CASPER
- .endif
--
--SUBDIR=		example
- 
- cscope: .PHONY
- 	cd ${.CURDIR}; cscope -buq $$(find . -name '*.[ch]' -print)
diff --git a/sysutils/bhyve+/pkg-descr b/sysutils/bhyve+/pkg-descr
deleted file mode 100644
index 0b1e6bf8f324..000000000000
--- a/sysutils/bhyve+/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-A patched version of BHyVe, the BSD Hypervisor from the base system
-that includes features and fixes that are not yet officially there.
diff --git a/sysutils/bhyve+/pkg-plist b/sysutils/bhyve+/pkg-plist
deleted file mode 100644
index 7e3c3a7ece70..000000000000
--- a/sysutils/bhyve+/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-sbin/bhyve
-sbin/bhyvectl
-sbin/bhyveload
-lib/lib9p.so.%%9P_SHLIB_MAJOR%%
-lib/libvmmapi.so.%%VMMAPI_SHLIB_MAJOR%%
-share/man/man8/bhyve.8.gz
-share/man/man8/bhyvectl.8.gz
-share/man/man8/bhyveload.8.gz
-/%%KMODDIR%%/vmm.ko