From nobody Mon Jun 6 23:33:54 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 767AD1BD4317; Mon, 6 Jun 2022 23:33:54 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LH8vQ2FwHz4SYQ; Mon, 6 Jun 2022 23:33:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654558434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RupftEhvFZbiBi2abk0YitU/zcwyVQaRQg6tXlrVgRs=; b=M5qsthcagKCDHF2yrYXxHgZPBIbG+iwk7g1LJtqJ98/C7BuClDaabK+N0wVCb1MD0X859I VIT8Z259eECRusHn3231OJtPNpB0v6swCcEQlHEKBkDSjkWnONeupluMFUPWEvaX7531EF leOfChSFpWxUTy4VfiypbOmRKo9rdf2oWjEZzPQ6Efsa6lXyB90G5uwEC3e59bxHBKj537 0OQZu/RpIJkOTcpQHEWP49LoNZsr4lBP7z6yaqh0zhMDJZs5uDJzi/972CHRt3x+8ZON6T OeUrz9ORfFdF6wsMOrIv0vZKdaFkVQyRX1UmcDmW5s08EyMXklpkaSKsC4QC+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1EA5A7C9B; Mon, 6 Jun 2022 23:33:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 256NXs1X016678; Mon, 6 Jun 2022 23:33:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 256NXsMI016677; Mon, 6 Jun 2022 23:33:54 GMT (envelope-from git) Date: Mon, 6 Jun 2022 23:33:54 GMT Message-Id: <202206062333.256NXsMI016677@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rebecca Cran Subject: git: 177204e3190b - main - sysutils/edk2: Add qemu_x64 and qemu_i386 as new FLAVORs of edk2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcran X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 177204e3190b7e608f39df4160217aad578ab7ef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654558434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RupftEhvFZbiBi2abk0YitU/zcwyVQaRQg6tXlrVgRs=; b=Dc3CcwPdFVjOm/lEZbWd75D4KeZ3fAHi/sSF7WEoZKjdNEf4rquAZ9U/zEQSiEmXlGoCIV mzKsAj7ewN059Ol8bTfnNK4pbC0EMqyxFugduBXU5PUYm5ea5UwUBPa0C5AjuwO65RZaAQ oSiT25sFQWOHzc4iOqufbnKcNAQlfcSUEzWucpRsKtNyUEuqYrWrnEcmilNlQjCJBc5jwZ hZ7RMQSYyVR7wQjKJFASPXuNHkhW2JgHFYyldjoGDsJbqzc8WMOvN3qpX5Mghut1S25+Zl qzHc4XLT6WLPdQqttfcvCMsLXGAWDcYF0k5fSAXYq5BON4gLl7lYtggHUF0Uew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654558434; a=rsa-sha256; cv=none; b=xtU1tSZixoMxFzCLoV9vT8JvQdzvt1iEIZo12dhq+p3mUtuWJX26/cSLEX4FWjYTnnr8UB Adhi4esCCXNCMxOXnF6gjPLzrShKUCK0B4DvwC/SLKBtaZZdqrKqczfuPh72SGSOAqeFUd 4pQGDQ5mxSxLIaLWQkjhkLUzx3FHgKp1WEPH/TxzAlrZa2WwQaNxqnf5tGapewbfAIncSU MaRlmr8ek8feyteBV09EzSYtC49pJedYx5IFHlSy3Se+uc62A4/FB9WGoXQ+HVM9pYWf9J RnyELP5+WJFnMfGX1NHM944jts/+KflWMpFo3BlDSBKCYq3ztD2lI4f+wTRtDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bcran (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=177204e3190b7e608f39df4160217aad578ab7ef commit 177204e3190b7e608f39df4160217aad578ab7ef Author: Rebecca Cran AuthorDate: 2022-05-26 02:35:49 +0000 Commit: Rebecca Cran CommitDate: 2022-06-06 23:32:08 +0000 sysutils/edk2: Add qemu_x64 and qemu_i386 as new FLAVORs of edk2 Instead of having a separate sysutils/uefi-edk2-qemu port, add qemu_x64 and qemu_i386 as FLAVORs of sysutils/edk2 and delete sysutils/uefi-edk2-qemu. Differential Revision: https://reviews.freebsd.org/D35408 Approved by: manu --- MOVED | 1 + sysutils/Makefile | 1 - sysutils/edk2/Makefile | 32 +++++++++++++- sysutils/uefi-edk2-qemu/Makefile | 88 --------------------------------------- sysutils/uefi-edk2-qemu/distinfo | 5 --- sysutils/uefi-edk2-qemu/pkg-descr | 14 ------- 6 files changed, 32 insertions(+), 109 deletions(-) diff --git a/MOVED b/MOVED index 0458e15dbd0b..db8c3d3b1941 100644 --- a/MOVED +++ b/MOVED @@ -17191,3 +17191,4 @@ www/rubygem-faraday110|www/rubygem-faraday|2022-06-03|Obsolete, please use www/r www/npm-node17|www/npm-node18|2022-06-03|Renamed for www/node update to v18 www/yarn-node17|www/yarn-node18|2022-06-03|Renamed for www/node update to v18 security/keepassx-devel||2022-06-05|Has expired: KeePassX had been stopped development/maintenance, please consider using security/keepassxc instead +sysutils/uefi-edk2-qemu|sysutils/edk2@qemu|2022-06-05|No more need for this port: please use sysutils/edk2 FLAVOR qemu instead diff --git a/sysutils/Makefile b/sysutils/Makefile index 3c7dfe366ae3..9e952a4fe686 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1476,7 +1476,6 @@ SUBDIR += ucspi-unix SUBDIR += udfclient SUBDIR += uefi-edk2-bhyve-csm - SUBDIR += uefi-edk2-qemu SUBDIR += ufetch SUBDIR += ufs_copy SUBDIR += uhidd diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile index d821fd0d4747..b499a09960aa 100644 --- a/sysutils/edk2/Makefile +++ b/sysutils/edk2/Makefile @@ -12,7 +12,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= only provides firmware for aarch64 and amd64 PKGNAMESUFFIX= -${FLAVOR:C/_/-/g} -FLAVORS= macchiatobin fvp rpi3 rpi4 xen_x64 bhyve +FLAVORS= macchiatobin fvp rpi3 rpi4 xen_x64 bhyve qemu_x64 qemu_i386 USES= cpe gmake python:3.7+,build CPE_VENDOR= tianocore @@ -111,6 +111,36 @@ PLAT_FILENAME_CODE = BHYVE_UEFI_CODE.fd PLAT_FILENAME_VARS = BHYVE_UEFI_VARS.fd .endif +.if ${FLAVOR} == qemu_x64 +ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS_REASON= Do not compile on hardware other than amd64 +PLAT= qemu +PLAT_ARCH= X64 +PLAT_TARGET= RELEASE +PLATFILE= OvmfPkg/OvmfPkgX64.dsc +PLAT_RESULT= OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF.fd +PLAT_RESULT_CODE= OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd +PLAT_RESULT_VARS= OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF_VARS.fd +PLAT_FILENAME= QEMU_UEFI-x86_64.fd +PLAT_FILENAME_CODE = QEMU_UEFI_CODE-x86_64.fd +PLAT_FILENAME_VARS = QEMU_UEFI_VARS-x86_64.fd +.endif + +.if ${FLAVOR} == qemu_i386 +ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS_REASON= Do not compile on hardware other than amd64 +PLAT= qemu +PLAT_ARCH= IA32 +PLAT_TARGET= RELEASE +PLATFILE= OvmfPkg/OvmfPkgIa32.dsc +PLAT_RESULT= OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF.fd +PLAT_RESULT_CODE= OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd +PLAT_RESULT_VARS= OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_VARS.fd +PLAT_FILENAME= QEMU_UEFI-i386.fd +PLAT_FILENAME_CODE = QEMU_UEFI_CODE-i386.fd +PLAT_FILENAME_VARS = QEMU_UEFI_VARS-i386.fd +.endif + PLIST_FILES= ${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} .if defined(PLAT_FILENAME_CODE) PLIST_FILES+= ${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE} diff --git a/sysutils/uefi-edk2-qemu/Makefile b/sysutils/uefi-edk2-qemu/Makefile deleted file mode 100644 index f07c027f3430..000000000000 --- a/sysutils/uefi-edk2-qemu/Makefile +++ /dev/null @@ -1,88 +0,0 @@ -PORTNAME= uefi-edk2-qemu -DISTVERSION= g20191122 -CATEGORIES= sysutils - -MAINTAINER= bcran@FreeBSD.org -COMMENT= OVMF package providing UEFI system firmware for QEMU - -LICENSE= BSD2CLAUSE - -ONLY_FOR_ARCHS= amd64 - -BUILD_DEPENDS= bash:shells/bash \ - nasm:devel/nasm \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3@${PY_FLAVOR} - -FLAVORS= x86_64 i386 - -USES= gmake \ - python:3.4+,build -USE_GCC= yes:build - -x86_64_PKGNAMESUFFIX= -x86_64 -i386_PKGNAMESUFFIX= -i386 - -USE_GITHUB= yes -GH_ACCOUNT= tianocore openssl:ssl -GH_PROJECT= edk2 openssl:ssl -GH_TAGNAME= edk2-stable201911 c3656cc594daac8167721dde7220f0e59ae146fc:ssl -GH_SUBDIR= CryptoPkg/Library/OpensslLib/openssl:ssl - -PLIST_FILES= share/uefi-edk2-qemu/QEMU_UEFI_CODE${PLIST_SUFFIX}-${PKGSUFFIX}.fd \ - share/uefi-edk2-qemu/QEMU_UEFI_VARS${PLIST_SUFFIX}-${PKGSUFFIX}.fd - -MAKE_ARGS= EXTRA_LDFLAGS=-static -BUILD_ARGS= -DDEBUG_ON_SERIAL_PORT=TRUE - -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 - -.if "${FLAVOR:U}" != i386 -EDK2ARCH=X64 -EDK2BLDDIR=X64 -PKGSUFFIX=x86_64 -.endif - -.if ${FLAVOR:U} == i386 -EDK2ARCH=IA32 -EDK2BLDDIR=Ia32 -PKGSUFFIX=i386 -.endif - -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: - bash -c "cd ${WRKSRC}; . ./edksetup.sh; ${MAKE_CMD} -j4 ${MAKE_ARGS} -C ${WRKSRC}/BaseTools" - bash -c " \ - cd ${BUILD_WRKSRC}; \ - unset ARCH; unset MAKEFLAGS; \ - . ./edksetup.sh; \ - build -t GCC5 -a ${EDK2ARCH} -b ${UEFI_TARGET} -p OvmfPkg/OvmfPkg${EDK2ARCH}.dsc ${BUILD_ARGS} \ - " - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/share/uefi-edk2-qemu/ - ${INSTALL} ${BUILD_WRKSRC}/Build/Ovmf${EDK2BLDDIR}/${UEFI_TARGET}_GCC5/FV/OVMF_CODE.fd \ - ${STAGEDIR}${PREFIX}/share/uefi-edk2-qemu/QEMU_UEFI_CODE${PLIST_SUFFIX}-${PKGSUFFIX}.fd - ${INSTALL} ${BUILD_WRKSRC}/Build/Ovmf${EDK2BLDDIR}/${UEFI_TARGET}_GCC5/FV/OVMF_VARS.fd \ - ${STAGEDIR}${PREFIX}/share/uefi-edk2-qemu/QEMU_UEFI_VARS${PLIST_SUFFIX}-${PKGSUFFIX}.fd - -.include diff --git a/sysutils/uefi-edk2-qemu/distinfo b/sysutils/uefi-edk2-qemu/distinfo deleted file mode 100644 index 99323ce2e896..000000000000 --- a/sysutils/uefi-edk2-qemu/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1580529840 -SHA256 (tianocore-edk2-g20191122-edk2-stable201911_GH0.tar.gz) = 23affd4ca2ba526747e72cbb350a4c95d192ac14eeb616778b1976577ed06001 -SIZE (tianocore-edk2-g20191122-edk2-stable201911_GH0.tar.gz) = 13821169 -SHA256 (openssl-openssl-c3656cc594daac8167721dde7220f0e59ae146fc_GH0.tar.gz) = 54bf99246115cccacd20edca58b4ebb5c9701b36ee20f03b8024038914baa90e -SIZE (openssl-openssl-c3656cc594daac8167721dde7220f0e59ae146fc_GH0.tar.gz) = 9019630 diff --git a/sysutils/uefi-edk2-qemu/pkg-descr b/sysutils/uefi-edk2-qemu/pkg-descr deleted file mode 100644 index 5ff881544c52..000000000000 --- a/sysutils/uefi-edk2-qemu/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -Unified Extensible Firmware Interface (UEFI) compliant firmware can be -developed using the EFI Development Kit II (EDK2). - -UEFI provides a specification for modern system (boot) firmware for x86, -x86_64, arm and arm64 machines. This system firmware was previously -called a 'BIOS'. - -This package contains the Open Virtual Machine Firmware (OVMF) package -from the TianoCore EDK II project configured to run under QEMU. - -More information about OVMF can be found at -https://github.com/tianocore/tianocore.github.io/wiki/OVMF . - -WWW: https://github.com/tianocore/edk2