Date: Fri, 7 Feb 2020 04:44:24 +0000 (UTC) From: Rebecca Cran <bcran@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525460 - in head: . sysutils sysutils/uefi-edk2-bhyve sysutils/uefi-edk2-bhyve-devel sysutils/uefi-edk2-bhyve/files Message-ID: <202002070444.0174iOaP083542@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bcran (src committer) Date: Fri Feb 7 04:44:24 2020 New Revision: 525460 URL: https://svnweb.freebsd.org/changeset/ports/525460 Log: sysutils/uefi-edk2-bhyve: update to be same as uefi-edk2-bhyve-devel Update sysutils/uefi-edk2-bhyve to be the same as the -devel port, and delete the -devel port. Also fix some issues in the Makefile. Reviewed by: mat, araujo Approved by: araujo Differential Revision: https://reviews.freebsd.org/D23476 Added: head/sysutils/uefi-edk2-bhyve/files/ head/sysutils/uefi-edk2-bhyve/files/patch-CryptoPkg_Library_OpensslLib_openssl_crypto_uid.c (contents, props changed) Deleted: head/sysutils/uefi-edk2-bhyve-devel/ Modified: head/MOVED head/sysutils/Makefile head/sysutils/uefi-edk2-bhyve/Makefile head/sysutils/uefi-edk2-bhyve/distinfo head/sysutils/uefi-edk2-bhyve/pkg-descr Modified: head/MOVED ============================================================================== --- head/MOVED Fri Feb 7 04:36:15 2020 (r525459) +++ head/MOVED Fri Feb 7 04:44:24 2020 (r525460) @@ -14023,6 +14023,7 @@ www/py-dj21-drf-yasg||2020-01-31|Has expired: Django 2 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 devel/py-Products.ATContentTypes||2020-02-03|Has expired: Outdated version of plone 4.3 (legacy), uses EOLed python27 devel/py-Products.ATReferenceBrowserWidget||2020-02-03|Has expired: Outdated version of plone 4.3 (legacy), uses EOLed python27 devel/py-Products.Archetypes||2020-02-03|Has expired: Outdated version of plone 4.3 (legacy), uses EOLed python27 Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Fri Feb 7 04:36:15 2020 (r525459) +++ head/sysutils/Makefile Fri Feb 7 04:44:24 2020 (r525460) @@ -1380,7 +1380,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 Modified: head/sysutils/uefi-edk2-bhyve/Makefile ============================================================================== --- head/sysutils/uefi-edk2-bhyve/Makefile Fri Feb 7 04:36:15 2020 (r525459) +++ head/sysutils/uefi-edk2-bhyve/Makefile Fri Feb 7 04:44:24 2020 (r525460) @@ -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,62 @@ ONLY_FOR_ARCHS= amd64 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= ${PREFIX}/share/uefi-firmware/BHYVE_UEFI${PLIST_SUFFIX}.fd +MAKE_ARGS= EXTRA_LDFLAGS=-static -OPTIONS_DEFINE= DEBUG +PLIST_FILES= share/uefi-firmware/BHYVE_UEFI_CODE${PLIST_SUFFIX}-devel.fd \ + share/uefi-firmware/BHYVE_UEFI_VARS${PLIST_SUFFIX}-devel.fd -DEBUG_VARS= uefi_target=DEBUG -DEBUG_VARS_OFF= uefi_target=RELEASE +OPTIONS_DEFINE= DEBUG HTTP_BOOT +OPTIONS_DEFAULT=HTTP_BOOT -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 +DEBUG_DESC= Build a debug configuration +HTTP_BOOT_DESC= Build with HTTP(S) boot support -BUILD_ARGS=-DDEBUG_ON_SERIAL_PORT=TRUE -D FD_SIZE_2MB +DEBUG_VARS= uefi_target=DEBUG +DEBUG_VARS_OFF= uefi_target=RELEASE +HTTP_BOOT_VARS= build_args+=-DHTTP_BOOT_ENABLE=TRUE -.include <bsd.port.options.mk> +BUILD_ARGS= -DDEBUG_ON_SERIAL_PORT=TRUE -.if defined(WITH_CSM) -PLIST_SUFFIX= _CSM -BUILD_ARGS+= -DCSM_ENABLE=TRUE -.endif +post-patch: + ${MKDIR} ${WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}; + ${LN} -sf ${LOCALBASE}/bin/gcc${GCC_DEFAULT} ${WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/gcc + ${LN} -sf ${LOCALBASE}/bin/gcc${GCC_DEFAULT} ${WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/cc + ${LN} -sf ${LOCALBASE}/bin/g++${GCC_DEFAULT} ${WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/g++ + ${LN} -sf ${LOCALBASE}/bin/ld ${WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/ld + ${LN} -sf ${LOCALBASE}/bin/gmake ${WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/make + ${LN} -sf ${LOCALBASE}/bin/gcc-ar${GCC_DEFAULT} ${WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/gcc-ar + ${LN} -sf ${LOCALBASE}/bin/gcc-nm${GCC_DEFAULT} ${WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/gcc-nm + ${LN} -sf ${LOCALBASE}/bin/objcopy ${WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/objcopy + ${LN} -sf ${PYTHON_CMD} ${WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/python + ${LN} -sf ${LOCALBASE}/bin/nasm ${WRKSRC}/BaseTools/Bin/FreeBSD-${MACHINE}/nasm -post-extract: - @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/BaseTools/Tests/GNUmakefile \ - ${WRKSRC}/BaseTools/BinWrappers/PosixLike/* - 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 ${WRKSRC}; . ./edksetup.sh; ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${WRKSRC}/BaseTools" bash -c " \ - cd ${BUILD_WRKSRC}; \ - source edksetup.sh;\ + cd ${WRKSRC}; \ 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} \ + . ./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} ${WRKSRC}/Build/OvmfX64/${UEFI_TARGET}_GCC5/FV/OVMF_CODE.fd \ + ${STAGEDIR}${PREFIX}/share/uefi-firmware/BHYVE_UEFI_CODE${PLIST_SUFFIX}-devel.fd + ${INSTALL} ${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*} Modified: head/sysutils/uefi-edk2-bhyve/distinfo ============================================================================== --- head/sysutils/uefi-edk2-bhyve/distinfo Fri Feb 7 04:36:15 2020 (r525459) +++ head/sysutils/uefi-edk2-bhyve/distinfo Fri Feb 7 04:44:24 2020 (r525460) @@ -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 Added: head/sysutils/uefi-edk2-bhyve/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/files/patch-CryptoPkg_Library_OpensslLib_openssl_crypto_uid.c Fri Feb 7 04:44:24 2020 (r525460) @@ -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(); Modified: head/sysutils/uefi-edk2-bhyve/pkg-descr ============================================================================== --- head/sysutils/uefi-edk2-bhyve/pkg-descr Fri Feb 7 04:36:15 2020 (r525459) +++ head/sysutils/uefi-edk2-bhyve/pkg-descr Fri Feb 7 04:44:24 2020 (r525460) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002070444.0174iOaP083542>