From owner-dev-commits-ports-all@freebsd.org Wed May 12 08:57:40 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 17105636888; Wed, 12 May 2021 08:57:40 +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 4Fg7wN07fyz3spm; Wed, 12 May 2021 08:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E1E60808; Wed, 12 May 2021 08:57:39 +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 14C8vdWA079044; Wed, 12 May 2021 08:57:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14C8vdSC079043; Wed, 12 May 2021 08:57:39 GMT (envelope-from git) Date: Wed, 12 May 2021 08:57:39 GMT Message-Id: <202105120857.14C8vdSC079043@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= Subject: git: 565eb7e544c8 - main - sysutils/edk2: add Xen platform MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 565eb7e544c803dbaa64a3767d4c3e1e593e144c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2021 08:57:40 -0000 The branch main has been updated by royger (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=565eb7e544c803dbaa64a3767d4c3e1e593e144c commit 565eb7e544c803dbaa64a3767d4c3e1e593e144c Author: Roger Pau Monné AuthorDate: 2021-05-11 17:22:32 +0000 Commit: Roger Pau Monné CommitDate: 2021-05-12 08:57:19 +0000 sysutils/edk2: add Xen platform As part of this make the gcc aarch64 dependency conditional to building a firmware for that architecture, and make the nasm package a build dependency for the X64 (amd64) targets. Sponsored by: Citrix Systems R&D Reviewed by: manu Approved by: manu Differential revision: https://reviews.freebsd.org/D30225 --- sysutils/edk2/Makefile | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile index dde3c01381b9..253578647ebd 100644 --- a/sysutils/edk2/Makefile +++ b/sysutils/edk2/Makefile @@ -11,13 +11,12 @@ ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 riscv64 ONLY_FOR_ARCHS_REASON= source code is not yet ported to anything other than IA32, X64, ARM, AARCH64, RISCV64 or EBC PKGNAMESUFFIX= -${FLAVOR:C/_/-/g} -FLAVORS= macchiatobin rpi3 rpi4 +FLAVORS= macchiatobin rpi3 rpi4 xen FLAVOR?= macchiatobin USES= gmake python:3.7+,build -BUILD_DEPENDS+= aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc \ - gcc8:lang/gcc8 \ +BUILD_DEPENDS+= gcc8:lang/gcc8 \ dtc>=1.4.1:sysutils/dtc \ bash:shells/bash @@ -38,6 +37,7 @@ GH_TUPLE= tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \ BINARY_ALIAS= make=${LOCALBASE}/bin/gmake \ dtc=${LOCALBASE}/bin/dtc \ gcc=${LOCALBASE}/bin/gcc8 \ + gcc-ar=${LOCALBASE}/bin/gcc-ar8 \ g++=${LOCALBASE}/bin/g++8 \ python3=${PYTHON_CMD} python=${PYTHON_CMD} @@ -71,6 +71,15 @@ PLAT_RESULT= RPi4/${PLAT_TARGET}_GCC5/FV/RPI_EFI.fd PLAT_FILENAME= RPI_EFI.fd .endif +.if ${FLAVOR} == xen +PLAT= xen +PLAT_ARCH= X64 +PLAT_TARGET= RELEASE +PLATFILE= OvmfPkg/OvmfXen.dsc +PLAT_RESULT= OvmfXen/${PLAT_TARGET}_GCC5/FV/OVMF.fd +PLAT_FILENAME= XEN_EFI.fd +.endif + PLIST_FILES= ${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} # Emulate source edk2/edksetup.sh @@ -83,9 +92,14 @@ MAKE_ENV+= WORKSPACE=${WRKDIR} \ PYTHONHASHSEED=1 .if ${PLAT_ARCH} == AARCH64 +BUILD_DEPENDS+= aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc MAKE_ENV+= GCC5_AARCH64_PREFIX=aarch64-none-elf- .endif +.if ${PLAT_ARCH} == X64 +BUILD_DEPENDS+= nasm:devel/nasm +.endif + # We can't have two submodule with the same origin in GH_TUPLE post-extract: (cd ${WRKDIR}/edk2-${GH_TAGNAME}/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli && tar cf - * | tar xf - -C ../../../../BaseTools/Source/C/BrotliCompress/brotli) @@ -102,6 +116,6 @@ do-build: do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/ - ${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/ + ${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} .include