From nobody Tue Sep 06 06:51:29 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MMGJK5dSMz4cK0q; Tue, 6 Sep 2022 06:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MMGJK5BjRz3XF4; Tue, 6 Sep 2022 06:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662447089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WxvyF3M11K+fjszTRQgzuKaoDP8RFuqrtlT3utboD6w=; b=yfU/gcOcc6arR3Xf5wip2uwaAcvNzyEsNqvUNHP85BNJjyxo91+Sqivg7vTG4D+TqctesV 0RoXYqk1YGsqXJm4f2HxDLu2hH9ox/N+rofGVmWEvWXX6FVAmzm2FFMMeVvtASOiDvzQk0 f/xa17Q4xS8eM8RpBFZdBsT1Nc/i6hYBEuMJv+2bweRiOIckiEjmAHEifEOCVUMu7rJ7FV E68ERSYBMXkz4TDsDlh4eELyWt4QpGBkMOmmVVVIheixIpM6e4abkTQqE0heETQEdCXxew XLIaG9Ye4WbPW4R12P2oKvwuYVn/6xXAxT643jlXtuHrlPCKjmQFEsaelT7DoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MMGJK4G06z15GJ; Tue, 6 Sep 2022 06:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2866pTbC098877; Tue, 6 Sep 2022 06:51:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2866pTC5098876; Tue, 6 Sep 2022 06:51:29 GMT (envelope-from git) Date: Tue, 6 Sep 2022 06:51:29 GMT Message-Id: <202209060651.2866pTC5098876@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kirill Ponomarev Subject: git: d58e5511ec61 - 2022Q3 - sysutils/cbsd: Update to 13.1.14 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: d58e5511ec61ead1208e65c32334e4594febb959 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662447089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WxvyF3M11K+fjszTRQgzuKaoDP8RFuqrtlT3utboD6w=; b=pMRcRSrcJDhYWHFb+jUwKMJAdc9hWn4PV3KhdU3ThVJwhvtw65fx7CqE2D9pvf/iR8hu5Q LpyNW0udpFfG42dUpzPAq+Tp6SF6YYCiN4cZXAPEW0r0l2IKGFCU6Z54dqtXXjPvwiBADH oZ3ZqPhJl8o6AvI3pxe47sNjj7NNvvHgY3GQekT8xC3dTxR5X13bcdqpibqLVsQJi69J4s L61jO7bhIYNfv188S7BWIU/1Mfgyz17pR6FBDVb6Naf2gK1Gf3145T1zTbANPYFNMwmBvq hX01igsBGrV9eQwrdcX9Wngq7IHgoWqXMwnYp8biwAXQ4YTFLiAZg03mRT4XPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662447089; a=rsa-sha256; cv=none; b=kW/jZFqYFKiNG5Pk8Yy7+PG0H2E0qgBCTeOBFma7Lf+BL8P6kXr2XhK23MSFQr8RvxgcAv acwgs1xxxwTvLai1bZ2tIOVJFltTaOkpsOmVFQpvznP8EDN7XMR8Ed3mZ2FkQNGO8148qJ jttziKGWqLAOiaywKb+wwL3H1EaD61Ue6//71itFKq5EZpD5rTDSMrMrhC7oHfA6zYwCwp Cu4HQ1zBEHMiXEcxRpjK4TPyN95LoC301RCrR0GJ/d+nmDaGMVSLxuaTTG+OIgztbzuFm9 +k6Ith0GGdAfBfVVJHHrRfus00phqC4sWt+FLNkT5SHilmK3qqPUv4yUMsS12g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=d58e5511ec61ead1208e65c32334e4594febb959 commit d58e5511ec61ead1208e65c32334e4594febb959 Author: Kirill Ponomarev AuthorDate: 2022-09-06 06:50:50 +0000 Commit: Kirill Ponomarev CommitDate: 2022-09-06 06:51:26 +0000 sysutils/cbsd: Update to 13.1.14 Changes: https://github.com/cbsd/cbsd/releases/tag/v13.1.14 (cherry picked from commit 5ce5a9294d5199fafd24fbb702292fc88d7592ca) --- sysutils/cbsd/Makefile | 16 ++++++++++++++-- sysutils/cbsd/distinfo | 6 +++--- sysutils/cbsd/pkg-plist | 19 ++++++++++++++++++- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index bd6f2275a969..c2f983e33501 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-deinstall 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 @@ -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