svn commit: r418285 - in head/sysutils: . uefi-edk2-bhyve uefi-edk2-bhyve-csm

[Roman Bogorodskiy]

Author: novel
Date: Sat Jul  9 16:10:08 2016
New Revision: 418285
URL: https://svnweb.freebsd.org/changeset/ports/418285

Log:
  sysutils/uefi-edk2-bhyve: add slave port with CSM
  
  - add slave port for uefi-edk2-bhyve with CSM enabled.
    The CSM option was removed from the main port, and
    now the port uses different firmware name based on CSM
    setting, so master and slave ports can be installed
    simultaneously.
  - rename destination path: s/uefi-firmwares/uefi-firmware
    because "firmware" is plural already
  - Use USE_GCC instead of direct dependency
  
  Submitted by:	maintainer
  Differential Revision:	D7157

Added:
  head/sysutils/uefi-edk2-bhyve-csm/
  head/sysutils/uefi-edk2-bhyve-csm/Makefile   (contents, props changed)
Modified:
  head/sysutils/Makefile
  head/sysutils/uefi-edk2-bhyve/Makefile

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Sat Jul  9 15:47:25 2016	(r418284)
+++ head/sysutils/Makefile	Sat Jul  9 16:10:08 2016	(r418285)
@@ -1107,6 +1107,7 @@
     SUBDIR += ucspi-unix
     SUBDIR += udfclient
     SUBDIR += uefi-edk2-bhyve
+    SUBDIR += uefi-edk2-bhyve-csm
     SUBDIR += ufs_copy
     SUBDIR += uhidd
     SUBDIR += uif2iso

Added: head/sysutils/uefi-edk2-bhyve-csm/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/uefi-edk2-bhyve-csm/Makefile	Sat Jul  9 16:10:08 2016	(r418285)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-csm
+
+COMMENT=	UEFI-EDK2 firmware for bhyve with CSM
+
+MASTERDIR=	${.CURDIR}/../uefi-edk2-bhyve
+
+WITH_CSM=	yes
+
+.include "${MASTERDIR}/Makefile"

Modified: head/sysutils/uefi-edk2-bhyve/Makefile
==============================================================================
--- head/sysutils/uefi-edk2-bhyve/Makefile	Sat Jul  9 15:47:25 2016	(r418284)
+++ head/sysutils/uefi-edk2-bhyve/Makefile	Sat Jul  9 16:10:08 2016	(r418285)
@@ -2,35 +2,33 @@
 
 PORTNAME=	uefi-edk2-bhyve
 PORTVERSION=	20160704
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	fabian.freyer at physik.tu-berlin.de
-COMMENT=	UEFI-EDK2 firmware for bhyve
+COMMENT?=	UEFI-EDK2 firmware for bhyve
 
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	bash:shells/bash \
-		gcc48:lang/gcc48 \
 		nasm:devel/nasm \
 		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3
 
 USES=		gmake \
 		python:build
+USE_GCC=	4.8
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	uefi-edk2
 GH_TAGNAME=	a36132939e259df79b16699c03c6f1d63c7454b9
 
-PLIST_FILES=    ${PREFIX}/share/uefi-firmwares/BHYVE_UEFI.fd
+PLIST_FILES=	${PREFIX}/share/uefi-firmware/BHYVE_UEFI${PLIST_SUFFIX}.fd
 
 ONLY_FOR_ARCHS=	amd64
 
-OPTIONS_DEFINE=	CSM DEBUG
-OPTIONS_DEFAULT=CSM
-CSM_DESC=	Build with Compatibility Support Module (Legacy Boot)
-CSM_VARS=	build_args+=-DCSM_ENABLE=TRUE
+OPTIONS_DEFINE=	DEBUG
 
-DEBUG_VARS=     uefi_target=DEBUG
+DEBUG_VARS=	uefi_target=DEBUG
 DEBUG_VARS_OFF=	uefi_target=RELEASE
 
 MAKE_ARGS+=	AS=${LOCALBASE}/bin/as \
@@ -44,6 +42,11 @@ BUILD_ARGS=-DDEBUG_ON_SERIAL_PORT=TRUE -
 
 .include <bsd.port.options.mk>
 
+.if defined(WITH_CSM)
+PLIST_SUFFIX=	_CSM
+BUILD_ARGS+=	-DCSM_ENABLE=TRUE
+.endif
+
 post-extract:
 	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/BaseTools/Tests/GNUmakefile \
 							${WRKSRC}/BaseTools/BinWrappers/PosixLike/*
@@ -57,7 +60,7 @@ do-build:
 	${LN} -sf ${LOCALBASE}/bin/ar ${BUILD_WRKSRC}/Build/ar
 	${LN} -sf ${LOCALBASE}/bin/objcopy ${BUILD_WRKSRC}/Build/objcopy
 	${LN} -sf ${LOCALBASE}/bin/nasm ${BUILD_WRKSRC}/Build/nasm
-.if ${PORT_OPTIONS:MCSM}
+.if defined(WITH_CSM)
 	bash -c " \
 		cd ${BUILD_WRKSRC}; \
 		source edksetup.sh;\
@@ -73,8 +76,8 @@ do-build:
 	"
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/uefi-firmwares/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/uefi-firmware/
 	${INSTALL} ${BUILD_WRKSRC}/Build/BhyveX64/${UEFI_TARGET}_GCC48/FV/BHYVE.fd \
-		${STAGEDIR}${PREFIX}/share/uefi-firmwares/BHYVE_UEFI.fd
+		${STAGEDIR}${PREFIX}/share/uefi-firmware/BHYVE_UEFI${PLIST_SUFFIX}.fd
 
 .include <bsd.port.mk>