Tue Feb 19 16:45:45 2019 UTC ()
Update to 0.0.20181116

* Restrict supported platforms to i386 and amd64
* Build and install firmware(s) for i386 (and amd64)


(ryoon)
diff -r1.4 -r1.5 pkgsrc/sysutils/ovmf/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/ovmf/PLIST
diff -r1.2 -r1.3 pkgsrc/sysutils/ovmf/distinfo
diff -r1.2 -r0 pkgsrc/sysutils/ovmf/patches/patch-BaseTools_Conf_tools__def.template
diff -r1.1 -r0 pkgsrc/sysutils/ovmf/patches/patch-BaseTools_Source_C_Common_CommonLib.c
diff -r1.1 -r0 pkgsrc/sysutils/ovmf/patches/patch-EmulatorPkg_build.sh
diff -r1.1 -r0 pkgsrc/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_InternalS3SaveState.h
diff -r1.1 -r0 pkgsrc/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_S3SaveState.c
diff -r1.1 -r0 pkgsrc/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Variable_RuntimeDxe_Variable.c
diff -r1.1 -r0 pkgsrc/sysutils/ovmf/patches/patch-MdePkg_Include_Library_UefiLib.h
diff -r1.1 -r0 pkgsrc/sysutils/ovmf/patches/patch-MdePkg_Include_Protocol_S3SaveState.h
diff -r1.1 -r0 pkgsrc/sysutils/ovmf/patches/patch-MdePkg_Library_UefiLib_UefiLib.c
diff -r1.1 -r0 pkgsrc/sysutils/ovmf/patches/patch-UefiCpuPkg_Library_MpInitLib_DxeMpLib.c
diff -r0 -r1.1 pkgsrc/sysutils/ovmf/patches/patch-CryptoPkg_Library_OpensslLib_openssl_.travis-create-release.sh
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/ovmf/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/ovmf/Makefile 2018/04/20 15:34:36 1.4
+++ pkgsrc/sysutils/ovmf/Makefile 2019/02/19 16:45:45 1.5
@@ -1,45 +1,62 @@ @@ -1,45 +1,62 @@
1# $NetBSD: Makefile,v 1.4 2018/04/20 15:34:36 maya Exp $ 1# $NetBSD: Makefile,v 1.5 2019/02/19 16:45:45 ryoon Exp $
2 2
3GITHUB_PROJECT= edk2 3PKGNAME= OVMF-0.0.20181116
4PKGNAME= OVMF-0.0.2017624 4DISTNAME= edk2-20181116
5DISTNAME= vUDK2017 5MASTER_SITES= ${MASTER_SITE_LOCAL}
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_GITHUB:=tianocore/} 7# Require openssl submodule
8DIST_SUBDIR= ${GITHUB_PROJECT} 8#DISTNAME= edk2-${GITHUB_TAG}
9GITHUB_TAG= ${DISTNAME} 9#MASTER_SITES= ${MASTER_SITE_GITHUB:=tianocore/}
 10#GITHUB_PROJECT= edk2
 11#GITHUB_TAG= edk2-stable201811
 12#MASTER_SITES= ${MASTER_SITE_GITHUB:=tianocore/}
10 13
11MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://github.com/tianocore/edk2/ 15HOMEPAGE= https://github.com/tianocore/edk2/
13COMMENT= Sample UEFI firmware for virtual machines 16COMMENT= Sample UEFI firmware for virtual machines
14LICENSE= modified-bsd 17LICENSE= modified-bsd
15 18
16WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG} 19SSP_SUPPORTED= no
 20
 21.include "../../mk/bsd.prefs.mk"
 22ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64
 23
 24PLIST_VARS+= x64
 25
 26.if !empty(MACHINE_PLATFORM:M*-*-i386)
 27TARGET_ARCHS= IA32
 28.elif !empty(MACHINE_PLATFORM:M*-*-x86_64)
 29TARGET_ARCHS= IA32 X64
 30PLIST.x64= yes
 31.endif
17 32
18USE_TOOLS+= gmake bash 33USE_TOOLS+= gmake bash
19USE_LANGUAGES= c c++ 34USE_LANGUAGES= c c++
20 35
21SSP_SUPPORTED= no 
22 
23PYTHON_VERSIONS_ACCEPTED= 27 36PYTHON_VERSIONS_ACCEPTED= 27
24SUBST_CLASSES+= python 37SUBST_CLASSES+= python
25SUBST_STAGE.python= pre-configure 38SUBST_STAGE.python= pre-configure
26SUBST_MESSAGE.python= Fix python binary 39SUBST_MESSAGE.python= Fix python binary
27SUBST_FILES.python= BaseTools/Tests/GNUmakefile 40SUBST_FILES.python= BaseTools/Tests/GNUmakefile
28SUBST_FILES.python+= BaseTools/BinWrappers/PosixLike/* 41SUBST_FILES.python+= BaseTools/BinWrappers/PosixLike/*
29SUBST_SED.python= -e 's,python2,${PYTHONBIN},g' 42SUBST_SED.python= -e 's,python2,${PYTHONBIN},g'
30 43
31do-build: 44do-build:
 45.for ARCH in ${TARGET_ARCHS}
32 cd ${WRKSRC}/OvmfPkg && \ 46 cd ${WRKSRC}/OvmfPkg && \
33 ${SETENV} ${MAKE_ENV} ./build.sh 47 ${SETENV} ${MAKE_ENV} ./build.sh -a ${ARCH}
 48 ${CP} ${WRKSRC}/Build/Ovmf${ARCH:S/IA/Ia/}/*/FV/OVMF.fd \
 49 ${WRKSRC}/OVMF${ARCH}.fd
 50.endfor
34 51
35INSTALLATION_DIRS+= share 52INSTALLATION_DIRS+= share/ovmf
36do-install: 53do-install:
37 ${INSTALL_DATA} ${WRKSRC}/Build/Ovmf*/*/FV/OVMF.fd ${DESTDIR}${PREFIX}/share/OVMF.fd 54 ${INSTALL_DATA} ${WRKSRC}/OVMF*.fd ${DESTDIR}${PREFIX}/share/ovmf/
38 55
39BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils 56BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
40BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm 57BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
41BUILD_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 58BUILD_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
42 59
43.include "../../lang/python/application.mk" 60.include "../../lang/python/application.mk"
44.include "../../devel/libuuid/buildlink3.mk" 61.include "../../devel/libuuid/buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 62.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/ovmf/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/ovmf/PLIST 2017/10/23 14:42:45 1.2
+++ pkgsrc/sysutils/ovmf/PLIST 2019/02/19 16:45:45 1.3
@@ -1,2 +1,3 @@ @@ -1,2 +1,3 @@
1@comment $NetBSD: PLIST,v 1.2 2017/10/23 14:42:45 maya Exp $ 1@comment $NetBSD: PLIST,v 1.3 2019/02/19 16:45:45 ryoon Exp $
2share/OVMF.fd 2share/ovmf/OVMFIA32.fd
 3${PLIST.x64}share/ovmf/OVMFX64.fd
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/ovmf/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/ovmf/distinfo 2018/12/27 15:12:36 1.2
+++ pkgsrc/sysutils/ovmf/distinfo 2019/02/19 16:45:45 1.3
@@ -1,17 +1,8 @@ @@ -1,17 +1,8 @@
1$NetBSD: distinfo,v 1.2 2018/12/27 15:12:36 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2019/02/19 16:45:45 ryoon Exp $
2 2
3SHA1 (edk2/vUDK2017.tar.gz) = 5bfb90aedb958d747eb8803b2a60d416842a39d6 3SHA1 (edk2-20181116.tar.gz) = 17a398f19f7633e4e6b1a7c40ff50509c2ee400c
4RMD160 (edk2/vUDK2017.tar.gz) = f8260ec115b2db0816cd9eb012b7ded77b151840 4RMD160 (edk2-20181116.tar.gz) = 7c3b4e4768a45bce7e19a0890de8a489164061ff
5SHA512 (edk2/vUDK2017.tar.gz) = d941a661d570b0f69962105920b3524c4aac1f4883468914305eb68015148d70f6593c52872a79a6143cf87dc44e9ce2b8957834b4524cb8a04b12473c6d7d81 5SHA512 (edk2-20181116.tar.gz) = 40e188c4b195a461d1f8890251470767b650e4a136883d69aecbc5eaeae7c081d2b5bf45d6143132c4bdc2d32e5b13875b15cf753160db4bc644925158a46839
6Size (edk2/vUDK2017.tar.gz) = 38737483 bytes 6Size (edk2-20181116.tar.gz) = 44711685 bytes
7SHA1 (patch-BaseTools_Conf_tools__def.template) = 4d89f44d4b952bbbef17e544532bb17e972bed83 7SHA1 (patch-CryptoPkg_Library_OpensslLib_openssl_.travis-create-release.sh) = c094db893686eff2ca6d3e49b3d4427233cc3fff
8SHA1 (patch-BaseTools_Source_C_Common_CommonLib.c) = a0728ef64f805587566c8cd7929798e337dbe02a 
9SHA1 (patch-EmulatorPkg_build.sh) = 3ad9cc36a05d5763b1b6eba75ae58ac16751a6fe 
10SHA1 (patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_InternalS3SaveState.h) = 6ef1e77f59cad6a25906c2cc01be2998e5992925 
11SHA1 (patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_S3SaveState.c) = 3df87f9cd05f7c0751b7d4c3b6653995093dce74 
12SHA1 (patch-MdeModulePkg_Universal_Variable_RuntimeDxe_Variable.c) = c9338ed699679cf3aa5e0a1940612b2a410c2c82 
13SHA1 (patch-MdePkg_Include_Library_UefiLib.h) = 72a8ec0ffe3ba4c29540c62f972bf63ee6dea5d9 
14SHA1 (patch-MdePkg_Include_Protocol_S3SaveState.h) = 7e57635ff6690b605ba1539bdb09ef650fca6a6f 
15SHA1 (patch-MdePkg_Library_UefiLib_UefiLib.c) = 780edf9fd4b9c343f380046d6e9f8b4623c03127 
16SHA1 (patch-OvmfPkg_build.sh) = 7555880aaadfda4954b0bf8beab9a5441cc8374c 8SHA1 (patch-OvmfPkg_build.sh) = 7555880aaadfda4954b0bf8beab9a5441cc8374c
17SHA1 (patch-UefiCpuPkg_Library_MpInitLib_DxeMpLib.c) = cfc2430249f1af7a1d91b3248fba42fdbb2fd6fb 
File Deleted: pkgsrc/sysutils/ovmf/patches/Attic/patch-BaseTools_Conf_tools__def.template
File Deleted: pkgsrc/sysutils/ovmf/patches/patch-BaseTools_Source_C_Common_CommonLib.c
File Deleted: pkgsrc/sysutils/ovmf/patches/Attic/patch-EmulatorPkg_build.sh
File Deleted: pkgsrc/sysutils/ovmf/patches/Attic/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_InternalS3SaveState.h
File Deleted: pkgsrc/sysutils/ovmf/patches/Attic/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_S3SaveState.c
File Deleted: pkgsrc/sysutils/ovmf/patches/Attic/patch-MdeModulePkg_Universal_Variable_RuntimeDxe_Variable.c
File Deleted: pkgsrc/sysutils/ovmf/patches/Attic/patch-MdePkg_Include_Library_UefiLib.h
File Deleted: pkgsrc/sysutils/ovmf/patches/Attic/patch-MdePkg_Include_Protocol_S3SaveState.h
File Deleted: pkgsrc/sysutils/ovmf/patches/Attic/patch-MdePkg_Library_UefiLib_UefiLib.c
File Deleted: pkgsrc/sysutils/ovmf/patches/Attic/patch-UefiCpuPkg_Library_MpInitLib_DxeMpLib.c
File Added: pkgsrc/sysutils/ovmf/patches/patch-CryptoPkg_Library_OpensslLib_openssl_.travis-create-release.sh
$NetBSD: patch-CryptoPkg_Library_OpensslLib_openssl_.travis-create-release.sh,v 1.1 2019/02/19 16:45:45 ryoon Exp $

* POSIX shell portability

--- CryptoPkg/Library/OpensslLib/openssl/.travis-create-release.sh.orig	2019-01-10 14:13:56.000000000 +0000
+++ CryptoPkg/Library/OpensslLib/openssl/.travis-create-release.sh
@@ -3,7 +3,7 @@
 # $1 is expected to be $TRAVIS_OS_NAME
 
 ./Configure dist
-if [ "$1" == osx ]; then
+if [ "$1" = osx ]; then
     make NAME='_srcdist' TARFILE='_srcdist.tar' \
          TAR_COMMAND='$(TAR) $(TARFLAGS) -cvf -' tar
 else