diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2022-09-06 06:50:50 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2022-09-06 06:50:50 +0000 |
| commit | 5ce5a9294d5199fafd24fbb702292fc88d7592ca (patch) | |
| tree | b10ca8a2aa8f34af85178207fa85989aa9b6f63a | |
| parent | b96a341f50503005a9a00c0084228a687210050e (diff) | |
| download | ports-5ce5a9294d5199fafd24fbb702292fc88d7592ca.tar.gz ports-5ce5a9294d5199fafd24fbb702292fc88d7592ca.zip | |
sysutils/cbsd: Update to 13.1.14
| -rw-r--r-- | sysutils/cbsd/Makefile | 16 | ||||
| -rw-r--r-- | sysutils/cbsd/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/cbsd/pkg-plist | 19 |
3 files changed, 35 insertions, 6 deletions
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index 28bedfc4c110..ba08bd452911 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,6 +1,5 @@ PORTNAME= cbsd -DISTVERSION= 13.1.3 -PORTREVISION= 1 +DISTVERSION= 13.1.14 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru @@ -27,6 +26,10 @@ SUB_FILES= pkg-message USERS= ${PORTNAME} GROUPS= ${PORTNAME} +OPTIONS_DEFINE= BHYVE_GOP +OPTIONS_DEFAULT= +BHYVE_GOP_DESC= Include bhyve UEFI firmware with GPU PPT+GOP support + CBSD_HOME?= ${PREFIX}/cbsd .include <bsd.port.options.mk> @@ -45,6 +48,12 @@ RUN_DEPENDS+= sysrc:sysutils/sysrc PLIST_SUB+= FBSD="" .endif +.if !${PORT_OPTIONS:MBHYVE_GOP} +PLIST_SUB+= BHYVE_GOP="@comment " +.else +PLIST_SUB+= BHYVE_GOP="" +.endif + do-install: @${ECHO} "Installing in ${CBSD_HOME}" ${MKDIR} ${STAGEDIR}${CBSD_HOME} @@ -59,6 +68,9 @@ do-install: ${STAGEDIR}${PREFIX}/cbsd/sbin/src \ ${STAGEDIR}${PREFIX}/cbsd/tools/src ${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8 +.if !${PORT_OPTIONS:MBHYVE_GOP} + ${RM} -f ${STAGEDIR}${PREFIX}/cbsd/upgrade/patch/efigop.fd +.endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/bsdconfig diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo index 641bd0e8b434..2a602510271e 100644 --- a/sysutils/cbsd/distinfo +++ b/sysutils/cbsd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659092451 -SHA256 (cbsd-cbsd-13.1.3_GH0.tar.gz) = b8a2a39fdd7055eaf37ae6a8df9dc85f971d4b7251f618f3aa3637c833390fc5 -SIZE (cbsd-cbsd-13.1.3_GH0.tar.gz) = 5592506 +TIMESTAMP = 1662413301 +SHA256 (cbsd-cbsd-13.1.14_GH0.tar.gz) = 6c83914ba9d1babcbc8a49bae5c0f312ffabd7c4edd6abfc5145bcb5d545417c +SIZE (cbsd-cbsd-13.1.14_GH0.tar.gz) = 6489854 diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist index 9fdc0645e1ff..f7d63450323e 100644 --- a/sysutils/cbsd/pkg-plist +++ b/sysutils/cbsd/pkg-plist @@ -232,6 +232,7 @@ cbsd/etc/defaults/vm-linux-Tails-5.conf cbsd/etc/defaults/vm-linux-TinyCore-x86-13.conf cbsd/etc/defaults/vm-linux-TrueNAS-Scale-22.conf cbsd/etc/defaults/vm-linux-cloud-Alma-9-x86_64.conf +cbsd/etc/defaults/vm-linux-cloud-Arch-x86-2022.conf cbsd/etc/defaults/vm-linux-cloud-CentOS-7-x86_64.conf cbsd/etc/defaults/vm-linux-cloud-CentOS-stream-8-x86_64.conf cbsd/etc/defaults/vm-linux-cloud-CentOS-stream-9-x86_64.conf @@ -247,7 +248,7 @@ cbsd/etc/defaults/vm-linux-cloud-Oracle-8-x86_64.conf cbsd/etc/defaults/vm-linux-cloud-Oracle-9-x86_64.conf cbsd/etc/defaults/vm-linux-cloud-Rocky-8-x86_64.conf cbsd/etc/defaults/vm-linux-cloud-Rocky-9-x86_64.conf -cbsd/etc/defaults/vm-linux-cloud-kubernetes-24.conf +cbsd/etc/defaults/vm-linux-cloud-kubernetes-25.conf cbsd/etc/defaults/vm-linux-cloud-ubuntudesktop-amd64-22.04.conf cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-20.04.conf cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-22.04.conf @@ -390,6 +391,21 @@ cbsd/modules/bsdconf.d/cloud-tpl/centos7/40-user-data-chpasswd-root cbsd/modules/bsdconf.d/cloud-tpl/centos7/40-user-data-chpasswd-user cbsd/modules/bsdconf.d/cloud-tpl/centos7/50-user-data-chpasswd cbsd/modules/bsdconf.d/cloud-tpl/centos7/meta-data +cbsd/modules/bsdconf.d/cloud-tpl/centos9/10-network-config +cbsd/modules/bsdconf.d/cloud-tpl/centos9/10-user-data +cbsd/modules/bsdconf.d/cloud-tpl/centos9/20-network-config-interface +cbsd/modules/bsdconf.d/cloud-tpl/centos9/20-user-data-root-lockpassword +cbsd/modules/bsdconf.d/cloud-tpl/centos9/20-user-data-root-password +cbsd/modules/bsdconf.d/cloud-tpl/centos9/20-user-data-user-lockpassword +cbsd/modules/bsdconf.d/cloud-tpl/centos9/20-user-data-user-password +cbsd/modules/bsdconf.d/cloud-tpl/centos9/30-network-config-dhcp4 +cbsd/modules/bsdconf.d/cloud-tpl/centos9/30-network-config-static +cbsd/modules/bsdconf.d/cloud-tpl/centos9/30-user-data-chpasswd +cbsd/modules/bsdconf.d/cloud-tpl/centos9/40-network-config +cbsd/modules/bsdconf.d/cloud-tpl/centos9/40-user-data-chpasswd-root +cbsd/modules/bsdconf.d/cloud-tpl/centos9/40-user-data-chpasswd-user +cbsd/modules/bsdconf.d/cloud-tpl/centos9/50-user-data-chpasswd +cbsd/modules/bsdconf.d/cloud-tpl/centos9/meta-data cbsd/modules/bsdconf.d/cloud-tpl/windows/meta_data.json cbsd/modules/bsdconf.d/cloud-tpl/windows/meta_data.json-uid cbsd/modules/bsdconf.d/cloud-tpl/windows/network_data.json @@ -1064,6 +1080,7 @@ cbsd/tools/zfs-migrator cbsd/upgrade/patch/BHYVE_UEFI_VARS.fd cbsd/upgrade/patch/bhyve-vesa-fb-13.0/patch-13x-usr.sbin-bhyve-pci_fbuf.c cbsd/upgrade/patch/efi.fd +%%BHYVE_GOP%%cbsd/upgrade/patch/efigop.fd cbsd/upgrade/patch/efirefd.fd cbsd/upgrade/patch/efirefn.fd cbsd/upgrade/patch/iov-13.0/README.md |