Page MenuHomeFreeBSD
Files F142740190

D23476.id67719.diff
No OneTemporary
Actions

D23476.id67719.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -14023,3 +14023,4 @@
www/sogo3|www/sogo4|2020-01-31|Has expired: Deprecated, replaced by www/sogo4
www/py-dj21-djangorestframework|www/py-dj22-djangorestframework|2020-01-31|Removed, part of expired Django 2.1
www/py-django21|www/py-django22|2020-01-31|Has expired: Django 2.1 is now End-of-Life (Since December 2 2019). Switch to Django 2.2+ as soon as possible
+sysutils/uefi-edk2-bhyve-devel|sysutils/uefi-edk2-bhyve|2020-02-02|Moved to sysutils/uefi-edk2-bhyve
Index: sysutils/Makefile
===================================================================
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -1377,7 +1377,6 @@
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/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= 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*}
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
===================================================================
--- /dev/null
+++ sysutils/uefi-edk2-bhyve-devel/files/patch-CryptoPkg_Library_OpensslLib_openssl_crypto_uid.c
@@ -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,14 +1,12 @@
# $FreeBSD$
PORTNAME= uefi-edk2-bhyve
-DISTVERSIONPREFIX= v
-DISTVERSION= 0.2
-PORTREVISION= 1
-PORTEPOCH= 1
+DISTVERSION= g20190424
+PORTEPOCH= 2
CATEGORIES= sysutils
-MAINTAINER= araujo@FreeBSD.org
-COMMENT?= UEFI-EDK2 firmware for bhyve
+MAINTAINER= bcran@FreeBSD.org
+COMMENT= UEFI-EDK2 firmware for bhyve
LICENSE= BSD2CLAUSE
@@ -16,71 +14,61 @@
BUILD_DEPENDS= bash:shells/bash \
nasm:devel/nasm \
- ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
+ gcc${GCC_DEFAULT}:lang/gcc${GCC_DEFAULT} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.4:databases/py-sqlite3@${PY_FLAVOR}
USES= gmake \
- python:2.7,build
-USE_GCC= 4.8
+ python:3.4+,build
+
USE_GITHUB= yes
-GH_ACCOUNT= freebsd
-GH_PROJECT= uefi-edk2
-GH_TAGNAME= aa8d718
+GH_ACCOUNT= freebsd openssl:ssl
+GH_PROJECT= uefi-edk2 openssl:ssl
+GH_TAGNAME= bhyve/edk2-stable201903 OpenSSL_1_1_0j:ssl
+GH_SUBDIR= CryptoPkg/Library/OpensslLib/openssl:ssl
+
+PLIST_FILES= share/uefi-firmware/BHYVE_UEFI_CODE${PLIST_SUFFIX}-devel.fd \
+ share/uefi-firmware/BHYVE_UEFI_VARS${PLIST_SUFFIX}-devel.fd
-PLIST_FILES= ${PREFIX}/share/uefi-firmware/BHYVE_UEFI${PLIST_SUFFIX}.fd
+OPTIONS_DEFINE= DEBUG HTTP_BOOT
+OPTIONS_DEFAULT=HTTP_BOOT
-OPTIONS_DEFINE= DEBUG
+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
-
-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
-
-post-extract:
- @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/BaseTools/Tests/GNUmakefile \
- ${WRKSRC}/BaseTools/BinWrappers/PosixLike/*
+HTTP_BOOT_VARS= build_args+=-DHTTP_BOOT_ENABLE=TRUE
+
+MAKE_ARGS+= EXTRA_LDFLAGS=-static
+BUILD_ARGS= -DDEBUG_ON_SERIAL_PORT=TRUE
+
+post-patch:
+ ${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 ${PYTHON_CMD} ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/python
+ ${LN} -sf ${LOCALBASE}/bin/nasm ${BUILD_WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/nasm
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 ${WRKSRC}; . ./edksetup.sh; ${MAKE_CMD} -j4 ${MAKE_ARGS} -C ${WRKSRC}/BaseTools"
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} \
+ . ./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/BhyveX64/${UEFI_TARGET}_GCC48/FV/BHYVE.fd \
- ${STAGEDIR}${PREFIX}/share/uefi-firmware/BHYVE_UEFI${PLIST_SUFFIX}.fd
+ ${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/distinfo
===================================================================
--- sysutils/uefi-edk2-bhyve/distinfo
+++ sysutils/uefi-edk2-bhyve/distinfo
@@ -1,3 +1,5 @@
-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 = 1580748854
+SHA256 (freebsd-uefi-edk2-g20190424-bhyve-edk2-stable201903_GH0.tar.gz) = b231dfb6f570300cf9fe4936bf86ccde362f9bd5bfd279cf08e63c4b2ffb7785
+SIZE (freebsd-uefi-edk2-g20190424-bhyve-edk2-stable201903_GH0.tar.gz) = 34126901
+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/pkg-descr
===================================================================
--- sysutils/uefi-edk2-bhyve/pkg-descr
+++ sysutils/uefi-edk2-bhyve/pkg-descr
@@ -1,3 +1,3 @@
UEFI-EDK2 firmware for bhyve.
-WWW: https://github.com/freebsd/uefi-edk2/tree/bhyve/UDK2014.SP1
+WWW: https://github.com/freebsd/uefi-edk2/tree/bhyve/edk2-stable201903

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 23, 11:06 PM (11 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27891050
Default Alt Text
D23476.id67719.diff (11 KB)

Event Timeline