git: 97632df2b3f8 - main - sysutils/xen-tools: fix build on FreeBSD 12

[Roger Pau Monné]

On Thu, May 20, 2021 at 06:59:56AM +0000, Roger Pau Monné wrote:
> The branch main has been updated by royger (src committer):
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=97632df2b3f820f6cbd8a09602aa96af6aaec0f5
> 
> commit 97632df2b3f820f6cbd8a09602aa96af6aaec0f5
> Author:     Roger Pau Monné <royger at FreeBSD.org>
> AuthorDate: 2021-05-17 13:38:12 +0000
> Commit:     Roger Pau Monné <royger at FreeBSD.org>
> CommitDate: 2021-05-20 06:58:57 +0000
> 
>     sysutils/xen-tools: fix build on FreeBSD 12
>     
>     QEMU Inter-VM shared memory device (ivshmem) depends on eventfd and
>     will only be built on FreeBSD versions > 12.
>     
>     The fix is picked up from the QEMU port.
>     
>     Approved by: bapt (implicit)
> ---
>  sysutils/edk2/Makefile       | 1 -
>  sysutils/edk2/distinfo       | 2 --
>  sysutils/xen-tools/Makefile  | 6 ++++++
>  sysutils/xen-tools/pkg-plist | 4 ++--
>  4 files changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
> index 5a7e41f8e1ac..f63ffd7f3cf7 100644
> --- a/sysutils/edk2/Makefile
> +++ b/sysutils/edk2/Makefile
> @@ -33,7 +33,6 @@ GH_TUPLE=	tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \
>  		ucb-bar:berkeley-softfloat-3:master:softfloat/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
>  		kkos:oniguruma:v6.9.4_mark1:oniguruma/MdeModulePkg/Universal/RegularExpressionDxe/oniguruma \
>  		google:brotli:v1.0.7-17-g666c328:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
> -		akheron:jansson:v2.13.1:jansson/RedfishPkg/Library/JsonLib/jansson
>  
>  BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake \
>  		dtc=${LOCALBASE}/bin/dtc \
> diff --git a/sysutils/edk2/distinfo b/sysutils/edk2/distinfo
> index 170b62c9d0eb..5b9797ac2b1a 100644
> --- a/sysutils/edk2/distinfo
> +++ b/sysutils/edk2/distinfo
> @@ -13,5 +13,3 @@ SHA256 (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 7f7576c926f7d4a071d594a01691c4
>  SIZE (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 592141
>  SHA256 (google-brotli-v1.0.7-17-g666c328_GH0.tar.gz) = caed254751585590b20b4a34d6600e9c9aae153ab1f9e1ae6b67f9bc3ee09b92
>  SIZE (google-brotli-v1.0.7-17-g666c328_GH0.tar.gz) = 23854268
> -SHA256 (akheron-jansson-v2.13.1_GH0.tar.gz) = f22901582138e3203959c9257cf83eba9929ac41d7be4a42557213a22ebcc7a0
> -SIZE (akheron-jansson-v2.13.1_GH0.tar.gz) = 144979

This chunk should have been part of ef0c9c2a7940b1ce8 ('sysutils/edk2:
update to 202102') as the jansson submodule is not used by any of the
code that we build for edk2, and shouldn't have been added in the
first place.

Sorry for the noise.

Roger.