pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/ovmf
Module Name: pkgsrc
Committed By: ryoon
Date: Tue Feb 19 16:45:45 UTC 2019
Modified Files:
pkgsrc/sysutils/ovmf: Makefile PLIST distinfo
Added Files:
pkgsrc/sysutils/ovmf/patches:
patch-CryptoPkg_Library_OpensslLib_openssl_.travis-create-release.sh
Removed Files:
pkgsrc/sysutils/ovmf/patches: patch-BaseTools_Conf_tools__def.template
patch-BaseTools_Source_C_Common_CommonLib.c
patch-EmulatorPkg_build.sh
patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_InternalS3SaveState.h
patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_S3SaveState.c
patch-MdeModulePkg_Universal_Variable_RuntimeDxe_Variable.c
patch-MdePkg_Include_Library_UefiLib.h
patch-MdePkg_Include_Protocol_S3SaveState.h
patch-MdePkg_Library_UefiLib_UefiLib.c
patch-UefiCpuPkg_Library_MpInitLib_DxeMpLib.c
Log Message:
Update to 0.0.20181116
* Restrict supported platforms to i386 and amd64
* Build and install firmware(s) for i386 (and amd64)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/ovmf/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/ovmf/PLIST \
pkgsrc/sysutils/ovmf/distinfo
cvs rdiff -u -r1.2 -r0 \
pkgsrc/sysutils/ovmf/patches/patch-BaseTools_Conf_tools__def.template
cvs rdiff -u -r1.1 -r0 \
pkgsrc/sysutils/ovmf/patches/patch-BaseTools_Source_C_Common_CommonLib.c \
pkgsrc/sysutils/ovmf/patches/patch-EmulatorPkg_build.sh \
pkgsrc/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_InternalS3SaveState.h \
pkgsrc/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_S3SaveState.c \
pkgsrc/sysutils/ovmf/patches/patch-MdeModulePkg_Universal_Variable_RuntimeDxe_Variable.c \
pkgsrc/sysutils/ovmf/patches/patch-MdePkg_Include_Library_UefiLib.h \
pkgsrc/sysutils/ovmf/patches/patch-MdePkg_Include_Protocol_S3SaveState.h \
pkgsrc/sysutils/ovmf/patches/patch-MdePkg_Library_UefiLib_UefiLib.c \
pkgsrc/sysutils/ovmf/patches/patch-UefiCpuPkg_Library_MpInitLib_DxeMpLib.c
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/ovmf/patches/patch-CryptoPkg_Library_OpensslLib_openssl_.travis-create-release.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/ovmf/Makefile
diff -u pkgsrc/sysutils/ovmf/Makefile:1.4 pkgsrc/sysutils/ovmf/Makefile:1.5
--- pkgsrc/sysutils/ovmf/Makefile:1.4 Fri Apr 20 15:34:36 2018
+++ pkgsrc/sysutils/ovmf/Makefile Tue Feb 19 16:45:45 2019
@@ -1,25 +1,38 @@
-# $NetBSD: Makefile,v 1.4 2018/04/20 15:34:36 maya Exp $
+# $NetBSD: Makefile,v 1.5 2019/02/19 16:45:45 ryoon Exp $
-GITHUB_PROJECT= edk2
-PKGNAME= OVMF-0.0.2017624
-DISTNAME= vUDK2017
+PKGNAME= OVMF-0.0.20181116
+DISTNAME= edk2-20181116
+MASTER_SITES= ${MASTER_SITE_LOCAL}
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=tianocore/}
-DIST_SUBDIR= ${GITHUB_PROJECT}
-GITHUB_TAG= ${DISTNAME}
+# Require openssl submodule
+#DISTNAME= edk2-${GITHUB_TAG}
+#MASTER_SITES= ${MASTER_SITE_GITHUB:=tianocore/}
+#GITHUB_PROJECT= edk2
+#GITHUB_TAG= edk2-stable201811
+#MASTER_SITES= ${MASTER_SITE_GITHUB:=tianocore/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/tianocore/edk2/
COMMENT= Sample UEFI firmware for virtual machines
LICENSE= modified-bsd
-WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
+SSP_SUPPORTED= no
+
+.include "../../mk/bsd.prefs.mk"
+ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64
+
+PLIST_VARS+= x64
+
+.if !empty(MACHINE_PLATFORM:M*-*-i386)
+TARGET_ARCHS= IA32
+.elif !empty(MACHINE_PLATFORM:M*-*-x86_64)
+TARGET_ARCHS= IA32 X64
+PLIST.x64= yes
+.endif
USE_TOOLS+= gmake bash
USE_LANGUAGES= c c++
-SSP_SUPPORTED= no
-
PYTHON_VERSIONS_ACCEPTED= 27
SUBST_CLASSES+= python
SUBST_STAGE.python= pre-configure
@@ -29,12 +42,16 @@ SUBST_FILES.python+= BaseTools/BinWrapp
SUBST_SED.python= -e 's,python2,${PYTHONBIN},g'
do-build:
+.for ARCH in ${TARGET_ARCHS}
cd ${WRKSRC}/OvmfPkg && \
- ${SETENV} ${MAKE_ENV} ./build.sh
+ ${SETENV} ${MAKE_ENV} ./build.sh -a ${ARCH}
+ ${CP} ${WRKSRC}/Build/Ovmf${ARCH:S/IA/Ia/}/*/FV/OVMF.fd \
+ ${WRKSRC}/OVMF${ARCH}.fd
+.endfor
-INSTALLATION_DIRS+= share
+INSTALLATION_DIRS+= share/ovmf
do-install:
- ${INSTALL_DATA} ${WRKSRC}/Build/Ovmf*/*/FV/OVMF.fd ${DESTDIR}${PREFIX}/share/OVMF.fd
+ ${INSTALL_DATA} ${WRKSRC}/OVMF*.fd ${DESTDIR}${PREFIX}/share/ovmf/
BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
Index: pkgsrc/sysutils/ovmf/PLIST
diff -u pkgsrc/sysutils/ovmf/PLIST:1.2 pkgsrc/sysutils/ovmf/PLIST:1.3
--- pkgsrc/sysutils/ovmf/PLIST:1.2 Mon Oct 23 14:42:45 2017
+++ pkgsrc/sysutils/ovmf/PLIST Tue Feb 19 16:45:45 2019
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2017/10/23 14:42:45 maya Exp $
-share/OVMF.fd
+@comment $NetBSD: PLIST,v 1.3 2019/02/19 16:45:45 ryoon Exp $
+share/ovmf/OVMFIA32.fd
+${PLIST.x64}share/ovmf/OVMFX64.fd
Index: pkgsrc/sysutils/ovmf/distinfo
diff -u pkgsrc/sysutils/ovmf/distinfo:1.2 pkgsrc/sysutils/ovmf/distinfo:1.3
--- pkgsrc/sysutils/ovmf/distinfo:1.2 Thu Dec 27 15:12:36 2018
+++ pkgsrc/sysutils/ovmf/distinfo Tue Feb 19 16:45:45 2019
@@ -1,17 +1,8 @@
-$NetBSD: distinfo,v 1.2 2018/12/27 15:12:36 joerg Exp $
+$NetBSD: distinfo,v 1.3 2019/02/19 16:45:45 ryoon Exp $
-SHA1 (edk2/vUDK2017.tar.gz) = 5bfb90aedb958d747eb8803b2a60d416842a39d6
-RMD160 (edk2/vUDK2017.tar.gz) = f8260ec115b2db0816cd9eb012b7ded77b151840
-SHA512 (edk2/vUDK2017.tar.gz) = d941a661d570b0f69962105920b3524c4aac1f4883468914305eb68015148d70f6593c52872a79a6143cf87dc44e9ce2b8957834b4524cb8a04b12473c6d7d81
-Size (edk2/vUDK2017.tar.gz) = 38737483 bytes
-SHA1 (patch-BaseTools_Conf_tools__def.template) = 4d89f44d4b952bbbef17e544532bb17e972bed83
-SHA1 (patch-BaseTools_Source_C_Common_CommonLib.c) = a0728ef64f805587566c8cd7929798e337dbe02a
-SHA1 (patch-EmulatorPkg_build.sh) = 3ad9cc36a05d5763b1b6eba75ae58ac16751a6fe
-SHA1 (patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_InternalS3SaveState.h) = 6ef1e77f59cad6a25906c2cc01be2998e5992925
-SHA1 (patch-MdeModulePkg_Universal_Acpi_S3SaveStateDxe_S3SaveState.c) = 3df87f9cd05f7c0751b7d4c3b6653995093dce74
-SHA1 (patch-MdeModulePkg_Universal_Variable_RuntimeDxe_Variable.c) = c9338ed699679cf3aa5e0a1940612b2a410c2c82
-SHA1 (patch-MdePkg_Include_Library_UefiLib.h) = 72a8ec0ffe3ba4c29540c62f972bf63ee6dea5d9
-SHA1 (patch-MdePkg_Include_Protocol_S3SaveState.h) = 7e57635ff6690b605ba1539bdb09ef650fca6a6f
-SHA1 (patch-MdePkg_Library_UefiLib_UefiLib.c) = 780edf9fd4b9c343f380046d6e9f8b4623c03127
+SHA1 (edk2-20181116.tar.gz) = 17a398f19f7633e4e6b1a7c40ff50509c2ee400c
+RMD160 (edk2-20181116.tar.gz) = 7c3b4e4768a45bce7e19a0890de8a489164061ff
+SHA512 (edk2-20181116.tar.gz) = 40e188c4b195a461d1f8890251470767b650e4a136883d69aecbc5eaeae7c081d2b5bf45d6143132c4bdc2d32e5b13875b15cf753160db4bc644925158a46839
+Size (edk2-20181116.tar.gz) = 44711685 bytes
+SHA1 (patch-CryptoPkg_Library_OpensslLib_openssl_.travis-create-release.sh) = c094db893686eff2ca6d3e49b3d4427233cc3fff
SHA1 (patch-OvmfPkg_build.sh) = 7555880aaadfda4954b0bf8beab9a5441cc8374c
-SHA1 (patch-UefiCpuPkg_Library_MpInitLib_DxeMpLib.c) = cfc2430249f1af7a1d91b3248fba42fdbb2fd6fb
Added files:
Index: pkgsrc/sysutils/ovmf/patches/patch-CryptoPkg_Library_OpensslLib_openssl_.travis-create-release.sh
diff -u /dev/null pkgsrc/sysutils/ovmf/patches/patch-CryptoPkg_Library_OpensslLib_openssl_.travis-create-release.sh:1.1
--- /dev/null Tue Feb 19 16:45:45 2019
+++ pkgsrc/sysutils/ovmf/patches/patch-CryptoPkg_Library_OpensslLib_openssl_.travis-create-release.sh Tue Feb 19 16:45:45 2019
@@ -0,0 +1,15 @@
+$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
Home |
Main Index |
Thread Index |
Old Index