From owner-svn-ports-head@freebsd.org  Wed Apr 24 14:49:29 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CFD1C159AB18;
 Wed, 24 Apr 2019 14:49:28 +0000 (UTC)
 (envelope-from araujo@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)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 736058FDFF;
 Wed, 24 Apr 2019 14:49:28 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 47203DACA;
 Wed, 24 Apr 2019 14:49:28 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3OEnSIU086604;
 Wed, 24 Apr 2019 14:49:28 GMT (envelope-from araujo@FreeBSD.org)
Received: (from araujo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3OEnRCv086599;
 Wed, 24 Apr 2019 14:49:27 GMT (envelope-from araujo@FreeBSD.org)
Message-Id: <201904241449.x3OEnRCv086599@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: araujo set sender to
 araujo@FreeBSD.org using -f
From: Marcelo Araujo <araujo@FreeBSD.org>
Date: Wed, 24 Apr 2019 14:49:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r499851 - in head/sysutils: . uefi-edk2-bhyve-devel
 uefi-edk2-bhyve-devel/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: araujo
X-SVN-Commit-Paths: in head/sysutils: . uefi-edk2-bhyve-devel
 uefi-edk2-bhyve-devel/files
X-SVN-Commit-Revision: 499851
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 736058FDFF
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.96 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
 NEURAL_HAM_SHORT(-0.96)[-0.964,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
 NEURAL_HAM_LONG(-1.00)[-1.000,0]
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Apr 2019 14:49:29 -0000

Author: araujo
Date: Wed Apr 24 14:49:26 2019
New Revision: 499851
URL: https://svnweb.freebsd.org/changeset/ports/499851

Log:
  - Add a devel version of edk2-bhyve based on the newest stable201903 branch.
  
  WWW: https://github.com/freebsd/uefi-edk2/tree/bhyve/edk2-stable201903
  
  Reviewed by:	bcran (previous version)
  		Scott Phillips <d.scott.phillips__intel.com> (previous version)
  Differential Revision:	https://reviews.freebsd.org/D19875

Added:
  head/sysutils/uefi-edk2-bhyve-devel/
  head/sysutils/uefi-edk2-bhyve-devel/Makefile   (contents, props changed)
  head/sysutils/uefi-edk2-bhyve-devel/distinfo   (contents, props changed)
  head/sysutils/uefi-edk2-bhyve-devel/files/
  head/sysutils/uefi-edk2-bhyve-devel/files/patch-CryptoPkg_Library_OpensslLib_openssl_crypto_uid.c   (contents, props changed)
  head/sysutils/uefi-edk2-bhyve-devel/pkg-descr   (contents, props changed)
Modified:
  head/sysutils/Makefile

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Wed Apr 24 14:41:48 2019	(r499850)
+++ head/sysutils/Makefile	Wed Apr 24 14:49:26 2019	(r499851)
@@ -1411,6 +1411,7 @@
     SUBDIR += udfclient
     SUBDIR += uefi-edk2-bhyve
     SUBDIR += uefi-edk2-bhyve-csm
+    SUBDIR += uefi-edk2-bhyve-devel
     SUBDIR += ufs_copy
     SUBDIR += uhidd
     SUBDIR += uif2iso

Added: head/sysutils/uefi-edk2-bhyve-devel/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/uefi-edk2-bhyve-devel/Makefile	Wed Apr 24 14:49:26 2019	(r499851)
@@ -0,0 +1,79 @@
+# $FreeBSD$
+
+PORTNAME=	uefi-edk2-bhyve-devel
+DISTVERSION=	g20190424
+CATEGORIES=	sysutils
+
+MAINTAINER=	araujo@FreeBSD.org
+COMMENT=	UEFI-EDK2 firmware for bhyve
+
+LICENSE=	BSD2CLAUSE
+
+ONLY_FOR_ARCHS=	amd64
+
+BUILD_DEPENDS=	${BASH_CMD}:shells/bash \
+		nasm:devel/nasm \
+		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
+
+USES=		gmake \
+		python:2.7,build
+USE_GCC=	8+
+USE_GITHUB=	yes
+GH_ACCOUNT=	freebsd
+GH_PROJECT=	uefi-edk2
+GH_TAGNAME=	0613ec3
+GH_TUPLE=	openssl:openssl:OpenSSL_1_1_0j:openssl/src/github.com/openssl/openssl
+
+PLIST_FILES=	share/uefi-firmware/BHYVE_UEFI_CODE${PLIST_SUFFIX}-devel.fd \
+		share/uefi-firmware/BHYVE_UEFI_VARS${PLIST_SUFFIX}-devel.fd
+
+OPTIONS_DEFINE=	DEBUG HTTP_BOOT
+OPTIONS_DEFAULT=	HTTP_BOOT
+
+DEBUG_DESC=	Build a debug configuration
+HTTP_BOOT_DESC=	Build with HTTP(S) boot support
+
+DEBUG_VARS=	uefi_target=DEBUG
+DEBUG_VARS_OFF=	uefi_target=RELEASE
+HTTP_BOOT_VARS=	build_args+=-DHTTP_BOOT_ENABLE=TRUE
+
+BASH_CMD=	${LOCALBASE}/bin/bash
+
+MAKE_ARGS+=	EXTRA_LDFLAGS=-static
+MAKE_ARGS+=	SHELL=${BASH_CMD}
+MAKE_ENV+=	PYTHON_COMMAND=${PYTHON_CMD}
+BUILD_ARGS=	-DDEBUG_ON_SERIAL_PORT=TRUE
+
+post-extract:
+	@${RMDIR} ${WRKSRC}/CryptoPkg/Library/OpensslLib/openssl
+	@${MV} ${WRKSRC}/src/github.com/openssl/openssl \
+		${WRKSRC}/CryptoPkg/Library/OpensslLib/openssl
+do-build:
+	${MKDIR} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE};
+	${LN} -sf ${LOCALBASE}/bin/gcc${GCC_DEFAULT} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/gcc
+	${LN} -sf ${LOCALBASE}/bin/gcc${GCC_DEFAULT} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/cc
+	${LN} -sf ${LOCALBASE}/bin/g++${GCC_DEFAULT} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/g++
+	${LN} -sf ${LOCALBASE}/bin/ld ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/ld
+	${LN} -sf ${LOCALBASE}/bin/gmake ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/make
+	${LN} -sf ${LOCALBASE}/bin/gcc-ar${GCC_DEFAULT} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/gcc-ar
+	${LN} -sf ${LOCALBASE}/bin/gcc-nm${GCC_DEFAULT} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/gcc-nm
+	${LN} -sf ${LOCALBASE}/bin/objcopy ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/objcopy
+	${LN} -sf ${LOCALBASE}/bin/nasm ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/nasm
+	unset ARCH; unset MAKEFLAGS
+	${SETENV} ${MAKE_ENV} ${BASH_CMD} -c "cd ${WRKSRC}; . ./edksetup.sh; ${MAKE_CMD} ${MAKE_ARGS} -C ${WRKSRC}/BaseTools"
+	${SETENV} ${MAKE_ENV} ${BASH_CMD} -c " \
+		cd ${BUILD_WRKSRC}; \
+		unset ARCH; unset MAKEFLAGS; \
+		. ./edksetup.sh; \
+		build -t GCC5 -a X64 -b ${UEFI_TARGET} -p OvmfPkg/OvmfPkgX64.dsc ${BUILD_ARGS} \
+	"
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/uefi-firmware/
+	${INSTALL} ${BUILD_WRKSRC}/Build/OvmfX64/${UEFI_TARGET}_GCC5/FV/OVMF_CODE.fd \
+		${STAGEDIR}${PREFIX}/share/uefi-firmware/BHYVE_UEFI_CODE${PLIST_SUFFIX}-devel.fd
+	${INSTALL} ${BUILD_WRKSRC}/Build/OvmfX64/${UEFI_TARGET}_GCC5/FV/OVMF_VARS.fd \
+		${STAGEDIR}${PREFIX}/share/uefi-firmware/BHYVE_UEFI_VARS${PLIST_SUFFIX}-devel.fd
+
+.include <bsd.port.mk>
+RUN_DEPENDS:=	${RUN_DEPENDS:Ngcc*}

Added: head/sysutils/uefi-edk2-bhyve-devel/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/uefi-edk2-bhyve-devel/distinfo	Wed Apr 24 14:49:26 2019	(r499851)
@@ -0,0 +1,5 @@
+TIMESTAMP = 1556115530
+SHA256 (freebsd-uefi-edk2-g20190424-0613ec3_GH0.tar.gz) = fbdb9bedfcb2a05981e94027a2f29d1d16e89d923daad72e9437723ec9d1cbc0
+SIZE (freebsd-uefi-edk2-g20190424-0613ec3_GH0.tar.gz) = 34125617
+SHA256 (openssl-openssl-OpenSSL_1_1_0j_GH0.tar.gz) = 95f9d879e66f76711db28d8c2f24ab4e049ab7d5afb7266238a312c95bb9f338
+SIZE (openssl-openssl-OpenSSL_1_1_0j_GH0.tar.gz) = 5949610

Added: head/sysutils/uefi-edk2-bhyve-devel/files/patch-CryptoPkg_Library_OpensslLib_openssl_crypto_uid.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/uefi-edk2-bhyve-devel/files/patch-CryptoPkg_Library_OpensslLib_openssl_crypto_uid.c	Wed Apr 24 14:49:26 2019	(r499851)
@@ -0,0 +1,11 @@
+--- CryptoPkg/Library/OpensslLib/openssl/crypto/uid.c.orig	2019-03-20 05:39:21 UTC
++++ CryptoPkg/Library/OpensslLib/openssl/crypto/uid.c
+@@ -14,6 +14,8 @@
+ 
+ # include OPENSSL_UNISTD
+ 
++int issetugid(void);
++
+ int OPENSSL_issetugid(void)
+ {
+     return issetugid();

Added: head/sysutils/uefi-edk2-bhyve-devel/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/uefi-edk2-bhyve-devel/pkg-descr	Wed Apr 24 14:49:26 2019	(r499851)
@@ -0,0 +1,3 @@
+UEFI-EDK2 firmware for bhyve.
+
+WWW: https://github.com/freebsd/uefi-edk2/tree/bhyve/edk2-stable201903