Date: Tue, 18 May 2021 09:15:49 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 91fcb7ade64e - main - sysutils/edk2: Rename xen flavor to xen_x64 Message-ID: <202105180915.14I9Fn7d012101@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=91fcb7ade64ea5050cc7cfe6951956cb0c31e80f commit 91fcb7ade64ea5050cc7cfe6951956cb0c31e80f Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2021-05-18 09:15:22 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2021-05-18 09:15:22 +0000 sysutils/edk2: Rename xen flavor to xen_x64 We might want to have other flavor of this for other xen arches at one point. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D30278 --- MOVED | 1 + sysutils/edk2/Makefile | 6 +++--- sysutils/xen-tools/Makefile | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/MOVED b/MOVED index fb8ae0f9ee8f..36d068447705 100644 --- a/MOVED +++ b/MOVED @@ -16334,3 +16334,4 @@ net-mgmt/unifi-devel|net-mgmt/unifi6|2021-05-16|Has expired: Use net-mgmt/unifi6 print/rubygem-pdf-core07|print/rubygem-pdf-core|2021-05-16|Obsoleted. Use print/rubygem-pdf-core instead security/bitwarden_rs|security/vaultwarden|2021-05-16|Project was renamed sysutils/kdiskmark|benchmarks/kdiskmark|2021-05-18|Moved to a more appropriate category +sysutils/edk2@xen|sysutils/edk2@xen_x64|2021-05-18|Add Xen arch to the flavor name to be futur-proof diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile index a80b4379e20d..daf5a9a42247 100644 --- a/sysutils/edk2/Makefile +++ b/sysutils/edk2/Makefile @@ -11,7 +11,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= This port only provides firmware for aarch64 and amd64 machine PKGNAMESUFFIX= -${FLAVOR:C/_/-/g} -FLAVORS= macchiatobin rpi3 rpi4 xen +FLAVORS= macchiatobin rpi3 rpi4 xen_x64 FLAVOR?= macchiatobin USES= gmake python:3.7+,build @@ -71,13 +71,13 @@ PLAT_RESULT= RPi4/${PLAT_TARGET}_GCC5/FV/RPI_EFI.fd PLAT_FILENAME= RPI_EFI.fd .endif -.if ${FLAVOR} == xen +.if ${FLAVOR} == xen_x64 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 +PLAT_FILENAME= XEN_X64_EFI.fd .endif PLIST_FILES= ${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile index 0c487b73739a..ce37661a08ab 100644 --- a/sysutils/xen-tools/Makefile +++ b/sysutils/xen-tools/Makefile @@ -17,9 +17,9 @@ LIB_DEPENDS= libyajl.so:devel/yajl \ libargp.so:devel/argp-standalone \ libxml2.so:textproc/libxml2 BUILD_DEPENDS= seabios>0:misc/seabios \ - ${LOCALBASE}/share/edk2-xen/XEN_EFI.fd:sysutils/edk2@xen + ${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd:sysutils/edk2@xen_x64 RUN_DEPENDS= seabios>0:misc/seabios \ - ${LOCALBASE}/share/edk2-xen/XEN_EFI.fd:sysutils/edk2@xen + ${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd:sysutils/edk2@xen_x64 OPTIONS_DEFINE= DOCS SPICE OPTIONS_DEFAULT= DOCS @@ -45,7 +45,7 @@ MAKE_ARGS= clang=y ARCH=x86_64 BINARY_ALIAS= python3=${PYTHON_CMD} CONFIGURE_ARGS+= --with-system-seabios=${LOCALBASE}/share/seabios/bios.bin \ - --with-system-ovmf=${LOCALBASE}/share/edk2-xen/XEN_EFI.fd \ + --with-system-ovmf=${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd \ --mandir=${MANPREFIX}/man SHEBANG_FILES= tools/misc/xencov_split \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105180915.14I9Fn7d012101>