Page MenuHomeFreeBSD
Files F145057225

D27230.1777296108.diff
No OneTemporary
Actions

Size
13 KB
Referenced Files
None
Subscribers
None

D27230.1777296108.diff
View Options

Index: sysutils/Makefile
===================================================================
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -1402,8 +1402,6 @@
SUBDIR += ucspi-unix
SUBDIR += udfclient
SUBDIR += uefi-edk2-bhyve
- SUBDIR += uefi-edk2-bhyve-csm
- SUBDIR += uefi-edk2-bhyve-devel
SUBDIR += uefi-edk2-qemu
SUBDIR += ufetch
SUBDIR += ufs_copy
Index: sysutils/bhyve-firmware/Makefile
===================================================================
--- sysutils/bhyve-firmware/Makefile
+++ sysutils/bhyve-firmware/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bhyve-firmware
-PORTVERSION= 1.0
+PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= sysutils
@@ -11,9 +11,5 @@
RUN_DEPENDS= uefi-edk2-bhyve>=0:sysutils/uefi-edk2-bhyve
USES= metaport
-OPTIONS_DEFINE= CSM
-OPTIONS_DEFAULT= CSM
-CSM_DESC= Include firmware with Compatibility Support Module
-CSM_RUN_DEPENDS= uefi-edk2-bhyve-csm>=0:sysutils/uefi-edk2-bhyve-csm
.include <bsd.port.mk>
Index: sysutils/uefi-edk2-bhyve-csm/Makefile
===================================================================
--- sysutils/uefi-edk2-bhyve-csm/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PKGNAMESUFFIX= -csm
-
-COMMENT= UEFI-EDK2 firmware for bhyve with CSM
-
-MASTERDIR= ${.CURDIR}/../uefi-edk2-bhyve
-
-WITH_CSM= yes
-
-.include "${MASTERDIR}/Makefile"
Index: sysutils/uefi-edk2-bhyve-devel/Makefile
===================================================================
--- sysutils/uefi-edk2-bhyve-devel/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= uefi-edk2-bhyve-devel
-DISTVERSION= g20190424
-PORTREVISION= 1
-CATEGORIES= sysutils
-
-MAINTAINER= ports@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= yes
-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*}
Index: sysutils/uefi-edk2-bhyve-devel/distinfo
===================================================================
--- sysutils/uefi-edk2-bhyve-devel/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-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
Index: sysutils/uefi-edk2-bhyve-devel/files/patch-CryptoPkg_Library_OpensslLib_openssl_crypto_uid.c
===================================================================
--- sysutils/uefi-edk2-bhyve-devel/files/patch-CryptoPkg_Library_OpensslLib_openssl_crypto_uid.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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();
Index: sysutils/uefi-edk2-bhyve-devel/pkg-descr
===================================================================
--- sysutils/uefi-edk2-bhyve-devel/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-UEFI-EDK2 firmware for bhyve.
-
-WWW: https://github.com/freebsd/uefi-edk2/tree/bhyve/edk2-stable201903
Index: sysutils/uefi-edk2-bhyve/Makefile
===================================================================
--- sysutils/uefi-edk2-bhyve/Makefile
+++ sysutils/uefi-edk2-bhyve/Makefile
@@ -1,86 +1,83 @@
# $FreeBSD$
PORTNAME= uefi-edk2-bhyve
-DISTVERSIONPREFIX= v
-DISTVERSION= 0.2
-PORTREVISION= 1
-PORTEPOCH= 1
+PORTVERSION= g20201115
CATEGORIES= sysutils
-MAINTAINER= ports@FreeBSD.org
-COMMENT?= UEFI-EDK2 firmware for bhyve
+MAINTAINER= bcran@FreeBSD.org
+COMMENT= UEFI EDK2 firmware for BHYVE
-LICENSE= BSD2CLAUSE
+LICENSE= BSD3CLAUSE
-ONLY_FOR_ARCHS= amd64
+ONLY_FOR_ARCHS= amd64
-BUILD_DEPENDS= bash:shells/bash \
- nasm:devel/nasm \
- ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
+USES= gmake python:3.7+,build
-USES= gmake \
- python:2.7,build
-USE_GCC= 4.8
-USE_GITHUB= yes
-GH_ACCOUNT= freebsd
-GH_PROJECT= uefi-edk2
-GH_TAGNAME= aa8d718
-
-PLIST_FILES= ${PREFIX}/share/uefi-firmware/BHYVE_UEFI${PLIST_SUFFIX}.fd
-
-OPTIONS_DEFINE= DEBUG
-
-DEBUG_VARS= uefi_target=DEBUG
-DEBUG_VARS_OFF= uefi_target=RELEASE
-
-MAKE_ARGS+= AS=${LOCALBASE}/bin/as \
- AR=${LOCALBASE}/bin/ar \
- LD=${LOCALBASE}/bin/ld \
- OBJCOPY=${LOCALBASE}/bin/objcopy \
- CC=${LOCALBASE}/bin/gcc48 \
- CXX=${LOCALBASE}/bin/g++48
-
-BUILD_ARGS=-DDEBUG_ON_SERIAL_PORT=TRUE -D FD_SIZE_2MB
-
-.include <bsd.port.options.mk>
-
-.if defined(WITH_CSM)
-PLIST_SUFFIX= _CSM
-BUILD_ARGS+= -DCSM_ENABLE=TRUE
-.endif
+BUILD_DEPENDS+= nasm:devel/nasm \
+ bash:shells/bash
+USE_GCC= yes
+USE_GITHUB= yes
+GH_ACCOUNT= tianocore
+GH_PROJECT= edk2
+GH_TAGNAME= 5e9a8a6dfb152472c5d12a3940069b16c774f0fc
+GH_TUPLE= openssl:openssl:OpenSSL_1_1_1g:openssl/CryptoPkg/Library/OpensslLib/openssl \
+ ucb-bar:berkeley-softfloat-3:master:softfloat/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
+ kkos:oniguruma:v6.9.4_mark1:oniguruma/MdeModulePkg/Universal/RegularExpressionDxe/oniguruma \
+ google:brotli:v1.0.7-17-g666c328:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+
+BINARY_ALIAS= make=${LOCALBASE}/bin/gmake \
+ gcc=${LOCALBASE}/bin/gcc${GCC_DEFAULT} \
+ gcc-ar=${LOCALBASE}/bin/gcc-ar${GCC_DEFAULT} \
+ g++=${LOCALBASE}/bin/g++${GCC_DEFAULT} \
+ python3=${PYTHON_CMD} python=${PYTHON_CMD}
+
+PLAT_ARCH= X64
+PLAT_FILE= OvmfPkg/Bhyve/BhyveX64.dsc
+PLAT_RESULT_CODE= BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_CODE.fd
+PLAT_RESULT_VARS= BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_VARS.fd
+
+PLIST_FILES= ${PREFIX}/share/uefi-firmware/BHYVE_UEFI_CODE${PLIST_SUFFIX}.fd \
+ ${PREFIX}/share/uefi-firmware/BHYVE_UEFI_VARS${PLIST_SUFFIC}.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= PLAT_TARGET=DEBUG
+DEBUG_VARS_OFF= PLAT_TARGET=RELEASE
+HTTP_BOOT_VARS= PLAT_ARGS+=-DHTTP_BOOT_ENABLE=TRUE
+
+PLAT_ARGS+= -DDEBUG_ON_SERIAL_PORT=TRUE
+
+# Emulate source edk2/edksetup.sh
+MAKE_ENV+= WORKSPACE=${WRKDIR} \
+ PACKAGES_PATH=${WRKDIR}/edk2-${GH_TAGNAME} \
+ CONF_PATH=${WRKDIR}/edk2-${GH_TAGNAME}/Conf \
+ EDK_TOOLS_PATH=${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools \
+ PATH=${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/BinWrappers/PosixLike:${PATH} \
+ PYTHON_COMMAND=python3 \
+ PYTHONHASHSEED=1
+
+# We can't have two submodule with the same origin in GH_TUPLE
post-extract:
- @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/BaseTools/Tests/GNUmakefile \
- ${WRKSRC}/BaseTools/BinWrappers/PosixLike/*
+ (cd ${WRKDIR}/edk2-${GH_TAGNAME}/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli && tar cf - * | tar xf - -C ../../../../BaseTools/Source/C/BrotliCompress/brotli)
do-build:
- unset ARCH; unset MAKEFLAGS; ${MAKE_CMD} ${MAKE_ARGS} -C ${BUILD_WRKSRC}/BaseTools
- ${MKDIR} ${BUILD_WRKSRC}/Build;
- ${LN} -sf ${LOCALBASE}/bin/gcc48 ${BUILD_WRKSRC}/Build/gcc
- ${LN} -sf ${LOCALBASE}/bin/ld ${BUILD_WRKSRC}/Build/ld
- ${LN} -sf ${LOCALBASE}/bin/gmake ${BUILD_WRKSRC}/Build/make
- ${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 defined(WITH_CSM)
- bash -c " \
- cd ${BUILD_WRKSRC}; \
- source edksetup.sh;\
- unset ARCH; unset MAKEFLAGS; \
- ${MAKE_CMD} ${MAKE_ARGS} GCC48_BIN=${BUILD_WRKSRC}/Build/ -C ${BUILD_WRKSRC}/BhyvePkg/Csm/BhyveCsm16/"
-.endif
- bash -c " \
- cd ${BUILD_WRKSRC}; \
- source edksetup.sh;\
- unset ARCH; unset MAKEFLAGS; \
- export GCC48_BIN=${BUILD_WRKSRC}/Build/; \
- build -t GCC48 -a X64 -b ${UEFI_TARGET} -p BhyvePkg/BhyvePkgX64.dsc ${BUILD_ARGS} \
- "
+ # This is normaly done during source edksetup.sh
+ (cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/build_rule.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/build_rule.txt)
+ (cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/tools_def.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/tools_def.txt)
+ (cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/target.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/target.txt)
+ # Build the basetools
+ (cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C edk2-${GH_TAGNAME}/BaseTools -j ${MAKE_JOBS_NUMBER} ${_MAKE_JOBS})
+ # Build EDK2
+ (cd ${WRKDIR}/edk2-${GH_TAGNAME} && ${SETENV} ${MAKE_ENV} BaseTools/BinWrappers/PosixLike/build -a ${PLAT_ARCH} -p ${PLAT_FILE} -n ${MAKE_JOBS_NUMBER} -t GCC5 -b ${PLAT_TARGET} ${PLAT_ARGS})
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/share/uefi-firmware/
- ${INSTALL} ${BUILD_WRKSRC}/Build/BhyveX64/${UEFI_TARGET}_GCC48/FV/BHYVE.fd \
- ${STAGEDIR}${PREFIX}/share/uefi-firmware/BHYVE_UEFI${PLIST_SUFFIX}.fd
+ ${MKDIR} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/
+ ${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/BHYVE_UEFI_CODE.fd
+ ${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_VARS} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/BHYVE_UEFI_VARS.fd
.include <bsd.port.mk>
-RUN_DEPENDS:= ${RUN_DEPENDS:Ngcc*}
Index: sysutils/uefi-edk2-bhyve/distinfo
===================================================================
--- sysutils/uefi-edk2-bhyve/distinfo
+++ sysutils/uefi-edk2-bhyve/distinfo
@@ -1,3 +1,11 @@
-TIMESTAMP = 1548651484
-SHA256 (freebsd-uefi-edk2-v0.2-aa8d718_GH0.tar.gz) = 749ef1ec3fdb37434745a7ecf7f3d41e6c84aeb906d52e5f8ce85527a06a472e
-SIZE (freebsd-uefi-edk2-v0.2-aa8d718_GH0.tar.gz) = 30986800
+TIMESTAMP = 1605476821
+SHA256 (tianocore-edk2-g20201115-5e9a8a6dfb152472c5d12a3940069b16c774f0fc_GH0.tar.gz) = c069d34339e5dafc4bd32b61cdbe1728e7ff14196dcf0233270e2e1f8d5a41e6
+SIZE (tianocore-edk2-g20201115-5e9a8a6dfb152472c5d12a3940069b16c774f0fc_GH0.tar.gz) = 13316632
+SHA256 (openssl-openssl-OpenSSL_1_1_1g_GH0.tar.gz) = 281e4f13142b53657bd154481e18195b2d477572fdffa8ed1065f73ef5a19777
+SIZE (openssl-openssl-OpenSSL_1_1_1g_GH0.tar.gz) = 9975550
+SHA256 (ucb-bar-berkeley-softfloat-3-master_GH0.tar.gz) = a40ccfa8d5c04971e6af8014217c93b58fba4d08c337bc0436bb141e9e79426a
+SIZE (ucb-bar-berkeley-softfloat-3-master_GH0.tar.gz) = 148747
+SHA256 (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 7f7576c926f7d4a071d594a01691c477bbb9391df250378bd5e1c003d42b4318
+SIZE (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 592141
+SHA256 (google-brotli-v1.0.7-17-g666c328_GH0.tar.gz) = caed254751585590b20b4a34d6600e9c9aae153ab1f9e1ae6b67f9bc3ee09b92
+SIZE (google-brotli-v1.0.7-17-g666c328_GH0.tar.gz) = 23854268
Index: sysutils/uefi-edk2-bhyve/pkg-descr
===================================================================
--- sysutils/uefi-edk2-bhyve/pkg-descr
+++ sysutils/uefi-edk2-bhyve/pkg-descr
@@ -1,3 +1,3 @@
-UEFI-EDK2 firmware for bhyve.
+UEFI EDK2 firmware for bhyve.
-WWW: https://github.com/freebsd/uefi-edk2/tree/bhyve/UDK2014.SP1
+WWW: https://github.com/tianocore/edk2/tree/master/OvmfPkg/Bhyve

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 27, 1:21 PM (12 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28440212
Default Alt Text
D27230.1777296108.diff (13 KB)

Event Timeline