* Re: [PR PATCH] [Updated] New packages: {edk2,ovmf-*}-202011
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
@ 2021-02-26 18:01 ` Logarithmus
2021-02-26 18:12 ` ericonr
` (35 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Logarithmus @ 2021-02-26 18:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages ovmf
https://github.com/void-linux/void-packages/pull/29074
New packages: {edk2,ovmf-*}-202011
[ci skip]
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29074.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ovmf-29074.patch --]
[-- Type: text/x-diff, Size: 18657 bytes --]
From 2c0aac7a0cf63531e1c411577607e160332b87f8 Mon Sep 17 00:00:00 2001
From: "Franc[e]sco" <lolisamurai@tfwno.gf>
Date: Sun, 8 Dec 2019 20:47:47 +0100
Subject: [PATCH] New package: {edk2,ovmf-*}-202011 [ci_skip]
---
srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json | 34 ++++
srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json | 35 ++++
srcpkgs/edk2/files/60-edk2-ovmf-ia32.json | 33 ++++
srcpkgs/edk2/files/60-edk2-ovmf-x64.json | 34 ++++
srcpkgs/edk2/template | 176 +++++++++++++++++++
srcpkgs/edk2/template.orig | 175 ++++++++++++++++++
srcpkgs/edk2/template.rej | 11 ++
srcpkgs/edk2/update | 2 +
srcpkgs/ovmf-ia32 | 1 +
srcpkgs/ovmf-x64 | 1 +
10 files changed, 502 insertions(+)
create mode 100644 srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
create mode 100644 srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
create mode 100644 srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
create mode 100644 srcpkgs/edk2/files/60-edk2-ovmf-x64.json
create mode 100644 srcpkgs/edk2/template
create mode 100644 srcpkgs/edk2/template.orig
create mode 100644 srcpkgs/edk2/template.rej
create mode 100644 srcpkgs/edk2/update
create mode 120000 srcpkgs/ovmf-ia32
create mode 120000 srcpkgs/ovmf-x64
diff --git a/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json b/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
new file mode 100644
index 00000000000..df80f1ed5ec
--- /dev/null
+++ b/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
@@ -0,0 +1,34 @@
+{
+ "description": "OVMF for i386, with SB+SMM, empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "i386",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "requires-smm",
+ "secure-boot",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json b/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
new file mode 100644
index 00000000000..99345cac2aa
--- /dev/null
+++ b/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
@@ -0,0 +1,35 @@
+{
+ "description": "OVMF for x86_64, with SB+SMM, empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "requires-smm",
+ "secure-boot",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json b/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
new file mode 100644
index 00000000000..d804b2ec7a5
--- /dev/null
+++ b/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
@@ -0,0 +1,33 @@
+{
+ "description": "OVMF for i386, without SB, without SMM, with empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "i386",
+ "machines": [
+ "pc-i440fx-*",
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/60-edk2-ovmf-x64.json b/srcpkgs/edk2/files/60-edk2-ovmf-x64.json
new file mode 100644
index 00000000000..355691bb5b5
--- /dev/null
+++ b/srcpkgs/edk2/files/60-edk2-ovmf-x64.json
@@ -0,0 +1,34 @@
+{
+ "description": "OVMF for x86_64, without SB, without SMM, with empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-i440fx-*",
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/template b/srcpkgs/edk2/template
new file mode 100644
index 00000000000..5027680a0f0
--- /dev/null
+++ b/srcpkgs/edk2/template
@@ -0,0 +1,176 @@
+# Template file for 'edk2'
+pkgname=edk2
+version=202011
+revision=1
+archs="x86_64* i686*"
+create_wrksrc=yes
+hostmakedepends="make python3 acpica-utils nasm libuuid-devel"
+short_desc="EFI Development Kit II"
+maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
+license="BSD-2-Clause-Patent, MIT, Apache-2.0"
+homepage="https://github.com/tianocore/edk2/tree/master/OvmfPkg"
+changelog="https://github.com/tianocore/edk2/releases"
+_openssl_ver=1.1.1g
+_brotli_commit=666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+distfiles="https://github.com/tianocore/edk2/archive/${pkgname}-stable${version}.tar.gz
+ https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz
+ https://github.com/google/brotli/archive/${_brotli_commit}.tar.gz"
+checksum="53e877c714426c2c1957d1e875d99c7eb6602a858d7ec8ba4eac42c37e3ce064
+ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+cd82ce69defa40e9e36443e59d90aa5f8c6013024fae6a2de8c31afc2c707065"
+_toolchain_opt=GCC5
+
+case ${XBPS_MACHINE} in
+ i686)
+ # edk2 doesn't find the correct host
+ # also, x64 can't be built on i686
+ _ovmf_host_arch=IA32
+ ;;
+ *)
+ _ovmf_build_x64=yes
+esac
+
+post_extract() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ ssldir=CryptoPkg/Library/OpensslLib/openssl
+ rm -rf "${ssldir}"
+ ln -sf "${wrksrc}/openssl-${_openssl_ver}" ${ssldir}
+ # openssl 1.1.1d has a typo that causes a compile error
+ sed -i 's/return return/return/g' ${ssldir}/crypto/threads_none.c
+
+ for brotlidir in BaseTools/Source/C/BrotliCompress/brotli \
+ MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+ do
+ rm -rf "${brotlidir}"
+ ln -sf "${wrksrc}/brotli-${_brotli_commit}" ${brotlidir}
+ done
+}
+
+do_build() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ _ovmf_common_flags="
+ -n ${XBPS_MAKEJOBS}
+ -b RELEASE
+ -D NETWORK_IP6_ENABLE
+ -D TPM2_ENABLE
+ "
+ _ovmf_x86_flags="
+ ${_ovmf_common_flags}
+ -D HTTP_BOOT_ENABLE
+ -D TLS_ENABLE
+ -D FD_SIZE_2MB
+ "
+ _ovmf_x86_sb_flags="
+ ${_ovmf_x86_flags}
+ -D SECURE_BOOT_ENABLE
+ -D SMM_REQUIRE
+ -D EXCLUDE_SHELL_FROM_FD
+ "
+ export HOST_ARCH=${_ovmf_host_arch}
+ export PATH="$(pwd)/BaseTools/BinWrappers/PosixLike/:$PATH"
+ export EDK_TOOLS_PATH="$(pwd)"/BaseTools
+ export PYTHON_COMMAND=python3
+ export WORKSPACE="$(pwd)"
+ export PACKAGES_PATH="$(pwd)"
+ bash -c ". ./edksetup.sh"
+ make -C BaseTools
+ if [ ${_ovmf_build_x64} ]; then
+ # x86_64, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfX64{,NoSb}
+ # x86_64, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_sb_flags}
+ fi
+ # ia32, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfIa32{,NoSb}
+ # ia32, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_sb_flags}
+}
+
+do_install() {
+ # development tools
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ for d in Conf Scripts Python; do
+ vmkdir /usr/share/${pkgname}/${d}
+ done
+ vmkdir /usr/lib/${pkgname}/bin
+ bins="BrotliCompress DevicePath EfiRom GenCrc32 GenFfs GenFv GenFw GenSec
+ LzmaCompress Split TianoCompress VfrCompile VolInfo"
+ for bin in $bins; do
+ vinstall BaseTools/Source/C/bin/${bin} 755 /usr/lib/${pkgname}/bin
+ done
+ vinstall BaseTools/BinWrappers/PosixLike/LzmaF86Compress 755 \
+ /usr/lib/${pkgname}/bin
+ vinstall BaseTools/BuildEnv 755 /usr/share/${pkgname}
+ for f in build_rule tools_def target; do
+ vinstall BaseTools/Conf/${f}.template 644 /usr/share/${pkgname}/Conf
+ done
+ vinstall BaseTools/Scripts/GccBase.lds 644 /usr/share/${pkgname}/Scripts
+ mkdir PythonBins
+ python_dirs="BPDG CommonDataClass PatchPcdValue Rsa2048Sha256Sign
+ Pkcs7Sign GenPatchPcdTable AutoGen GenFds Workspace Table Ecc Trim
+ TargetTool build Capsule Eot Common UPT"
+ for d in ${python_dirs}; do
+ fulldir=BaseTools/Source/Python/${d}
+ vcopy ${fulldir} /usr/share/edk2/Python/
+ [ -f "${fulldir}/${d}.py" ] || continue
+ cat > PythonBins/${d}.py <<- EOF
+ #!/bin/sh
+ export PYTHONPATH=/usr/share/${pkgname}/Python
+ exec python /usr/share/${pkgname}/Python/${d}/${d}.py "\$@"
+ EOF
+ vinstall PythonBins/${d}.py 755 /usr/lib/${pkgname}/bin
+ done
+
+ # ovmf uefi firmware
+ x=OVMF_CODE
+ if [ ${_ovmf_build_x64} ]; then
+ for f in OVMF_{CODE,VARS}; do
+ vinstall Build/OvmfX64NoSb/RELEASE_${_toolchain_opt}/FV/${f}.fd \
+ 644 /usr/share/edk2/ovmf/
+ done
+ vinstall Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf ${x}.secboot.fd
+ # libvirt hardcodes this directory name if no json manifests are present.
+ # also provides backwards compatibility with VMs created before the
+ # json manifests system
+ vmkdir /usr/share/OVMF
+ for f in OVMF_{CODE{,.secboot},VARS}.fd; do
+ ln -sf ../edk2/ovmf/${f} "${DESTDIR}/usr/share/OVMF/"
+ done
+ fi
+ vinstall Build/OvmfIa32NoSb/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32/
+ vinstall Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32 ${x}.secboot.fd
+ for x in 50-edk2-ovmf-{ia32,x64}-sb.json 60-edk2-ovmf-{ia32,x64}.json; do
+ vinstall ${FILESDIR}/$x 644 /usr/share/qemu/firmware
+ done
+ vlicense OvmfPkg/License.txt
+}
+
+_ovmf_basedesc="Tianocore UEFI firmware for qemu"
+
+ovmf-ia32_package() {
+ short_desc="${_ovmf_basedesc} ia32"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf-ia32
+ vmove usr/share/qemu/firmware/*edk2-ovmf-ia32*.json
+ }
+}
+
+if [ ${_ovmf_build_x64} ]; then
+ ovmf-x64_package() {
+ short_desc="${_ovmf_basedesc} x64"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf
+ vmove usr/share/OVMF
+ vmove usr/share/qemu/firmware/*edk2-ovmf-x64*.json
+ }
+ }
+fi
diff --git a/srcpkgs/edk2/template.orig b/srcpkgs/edk2/template.orig
new file mode 100644
index 00000000000..0487bb7d340
--- /dev/null
+++ b/srcpkgs/edk2/template.orig
@@ -0,0 +1,175 @@
+# Template file for 'edk2'
+pkgname=edk2
+version=202005
+revision=1
+archs="x86_64* i686*"
+create_wrksrc=yes
+hostmakedepends="make python3 acpica-utils nasm libuuid-devel"
+short_desc="EFI Development Kit II"
+maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
+license="BSD-2-Clause-Patent, MIT, Apache-2.0"
+homepage="https://github.com/tianocore/edk2/tree/master/OvmfPkg"
+_openssl_ver=1.1.1d
+_brotli_commit=666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+distfiles="https://github.com/tianocore/edk2/archive/${pkgname}-stable${version}.tar.gz
+ https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz
+ https://github.com/google/brotli/archive/${_brotli_commit}.tar.gz"
+checksum="373c3eff3497316a48fcf4be8dcee227431cbce86dcd80a004950e992f0297e2
+1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2
+cd82ce69defa40e9e36443e59d90aa5f8c6013024fae6a2de8c31afc2c707065"
+_toolchain_opt=GCC5
+
+case ${XBPS_MACHINE} in
+ i686)
+ # edk2 doesn't find the correct host
+ # also, x64 can't be built on i686
+ _ovmf_host_arch=IA32
+ ;;
+ *)
+ _ovmf_build_x64=yes
+esac
+
+post_extract() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ ssldir=CryptoPkg/Library/OpensslLib/openssl
+ rm -rf "${ssldir}"
+ ln -sf "${wrksrc}/openssl-${_openssl_ver}" ${ssldir}
+ # openssl 1.1.1d has a typo that causes a compile error
+ sed -i 's/return return/return/g' ${ssldir}/crypto/threads_none.c
+
+ for brotlidir in BaseTools/Source/C/BrotliCompress/brotli \
+ MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+ do
+ rm -rf "${brotlidir}"
+ ln -sf "${wrksrc}/brotli-${_brotli_commit}" ${brotlidir}
+ done
+}
+
+do_build() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ _ovmf_common_flags="
+ -n ${XBPS_MAKEJOBS}
+ -b RELEASE
+ -D NETWORK_IP6_ENABLE
+ -D TPM2_ENABLE
+ "
+ _ovmf_x86_flags="
+ ${_ovmf_common_flags}
+ -D HTTP_BOOT_ENABLE
+ -D TLS_ENABLE
+ -D FD_SIZE_2MB
+ "
+ _ovmf_x86_sb_flags="
+ ${_ovmf_x86_flags}
+ -D SECURE_BOOT_ENABLE
+ -D SMM_REQUIRE
+ -D EXCLUDE_SHELL_FROM_FD
+ "
+ export HOST_ARCH=${_ovmf_host_arch}
+ export PATH="$(pwd)/BaseTools/BinWrappers/PosixLike/:$PATH"
+ export EDK_TOOLS_PATH="$(pwd)"/BaseTools
+ export PYTHON_COMMAND=python3
+ export WORKSPACE="$(pwd)"
+ export PACKAGES_PATH="$(pwd)"
+ bash -c ". ./edksetup.sh"
+ make -C BaseTools
+ if [ ${_ovmf_build_x64} ]; then
+ # x86_64, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfX64{,NoSb}
+ # x86_64, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_sb_flags}
+ fi
+ # ia32, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfIa32{,NoSb}
+ # ia32, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_sb_flags}
+}
+
+do_install() {
+ # development tools
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ for d in Conf Scripts Python; do
+ vmkdir /usr/share/${pkgname}/${d}
+ done
+ vmkdir /usr/lib/${pkgname}/bin
+ bins="Brotli DevicePath EfiRom GenCrc32 GenFfs GenFv GenFw GenSec
+ LzmaCompress Split TianoCompress VfrCompile VolInfo"
+ for bin in $bins; do
+ vinstall BaseTools/Source/C/bin/${bin} 755 /usr/lib/${pkgname}/bin
+ done
+ vinstall BaseTools/BinWrappers/PosixLike/LzmaF86Compress 755 \
+ /usr/lib/${pkgname}/bin
+ vinstall BaseTools/BuildEnv 755 /usr/share/${pkgname}
+ for f in build_rule tools_def target; do
+ vinstall BaseTools/Conf/${f}.template 644 /usr/share/${pkgname}/Conf
+ done
+ vinstall BaseTools/Scripts/GccBase.lds 644 /usr/share/${pkgname}/Scripts
+ mkdir PythonBins
+ python_dirs="BPDG CommonDataClass PatchPcdValue Rsa2048Sha256Sign
+ Pkcs7Sign GenPatchPcdTable AutoGen GenFds Workspace Table Ecc Trim
+ TargetTool build Capsule Eot Common UPT"
+ for d in ${python_dirs}; do
+ fulldir=BaseTools/Source/Python/${d}
+ vcopy ${fulldir} /usr/share/edk2/Python/
+ [ -f "${fulldir}/${d}.py" ] || continue
+ cat > PythonBins/${d}.py <<- EOF
+ #!/bin/sh
+ export PYTHONPATH=/usr/share/${pkgname}/Python
+ exec python /usr/share/${pkgname}/Python/${d}/${d}.py "\$@"
+ EOF
+ vinstall PythonBins/${d}.py 755 /usr/lib/${pkgname}/bin
+ done
+
+ # ovmf uefi firmware
+ x=OVMF_CODE
+ if [ ${_ovmf_build_x64} ]; then
+ for f in OVMF_{CODE,VARS}; do
+ vinstall Build/OvmfX64NoSb/RELEASE_${_toolchain_opt}/FV/${f}.fd \
+ 644 /usr/share/edk2/ovmf/
+ done
+ vinstall Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf ${x}.secboot.fd
+ # libvirt hardcodes this directory name if no json manifests are present.
+ # also provides backwards compatibility with VMs created before the
+ # json manifests system
+ vmkdir /usr/share/OVMF
+ for f in OVMF_{CODE{,.secboot},VARS}.fd; do
+ ln -sf ../edk2/ovmf/${f} "${DESTDIR}/usr/share/OVMF/"
+ done
+ fi
+ vinstall Build/OvmfIa32NoSb/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32/
+ vinstall Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32 ${x}.secboot.fd
+ for x in 50-edk2-ovmf-{ia32,x64}-sb.json 60-edk2-ovmf-{ia32,x64}.json; do
+ vinstall ${FILESDIR}/$x 644 /usr/share/qemu/firmware
+ done
+ vlicense OvmfPkg/License.txt
+}
+
+_ovmf_basedesc="Tianocore UEFI firmware for qemu"
+
+ovmf-ia32_package() {
+ short_desc="${_ovmf_basedesc} ia32"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf-ia32
+ vmove usr/share/qemu/firmware/*edk2-ovmf-ia32*.json
+ }
+}
+
+if [ ${_ovmf_build_x64} ]; then
+ ovmf-x64_package() {
+ short_desc="${_ovmf_basedesc} x64"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf
+ vmove usr/share/OVMF
+ vmove usr/share/qemu/firmware/*edk2-ovmf-x64*.json
+ }
+ }
+fi
diff --git a/srcpkgs/edk2/template.rej b/srcpkgs/edk2/template.rej
new file mode 100644
index 00000000000..f6baaa271dd
--- /dev/null
+++ b/srcpkgs/edk2/template.rej
@@ -0,0 +1,11 @@
+--- srcpkgs/edk2/template
++++ srcpkgs/edk2/template
+@@ -98,7 +98,7 @@ do_install() {
+ vmkdir /usr/share/${pkgname}/${d}
+ done
+ vmkdir /usr/lib/${pkgname}/bin
+- bins="Brotli DevicePath EfiRom GenCrc32 GenFfs GenFv GenFw GenSec
++ bins="BrotliCompress DevicePath EfiRom GenCrc32 GenFfs GenFv GenFw GenSec
+ LzmaCompress Split TianoCompress VfrCompile VolInfo"
+ for bin in $bins; do
+ vinstall BaseTools/Source/C/bin/${bin} 755 /usr/lib/${pkgname}/bin``
diff --git a/srcpkgs/edk2/update b/srcpkgs/edk2/update
new file mode 100644
index 00000000000..551f406857f
--- /dev/null
+++ b/srcpkgs/edk2/update
@@ -0,0 +1,2 @@
+site="https://github.com/tianocore/edk2/tags"
+version="stable${version}"
diff --git a/srcpkgs/ovmf-ia32 b/srcpkgs/ovmf-ia32
new file mode 120000
index 00000000000..06c0198cb80
--- /dev/null
+++ b/srcpkgs/ovmf-ia32
@@ -0,0 +1 @@
+edk2
\ No newline at end of file
diff --git a/srcpkgs/ovmf-x64 b/srcpkgs/ovmf-x64
new file mode 120000
index 00000000000..06c0198cb80
--- /dev/null
+++ b/srcpkgs/ovmf-x64
@@ -0,0 +1 @@
+edk2
\ No newline at end of file
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202011
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
2021-02-26 18:01 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-02-26 18:12 ` ericonr
2021-02-26 18:13 ` [PR PATCH] [Updated] " Logarithmus
` (34 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: ericonr @ 2021-02-26 18:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-786809445
Comment:
Please clean up your commit, you have `.rej` and `.orig` files.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PR PATCH] [Updated] New packages: {edk2,ovmf-*}-202011
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
2021-02-26 18:01 ` [PR PATCH] [Updated] " Logarithmus
2021-02-26 18:12 ` ericonr
@ 2021-02-26 18:13 ` Logarithmus
2021-03-24 21:43 ` Xlaits
` (33 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Logarithmus @ 2021-02-26 18:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1791 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages ovmf
https://github.com/void-linux/void-packages/pull/29074
New packages: {edk2,ovmf-*}-202011
[ci skip]
Continues https://github.com/void-linux/void-packages/pull/17225
Closes https://github.com/void-linux/void-packages/issues/11243, https://github.com/void-linux/void-packages/issues/27229
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] x86_64
- [ ] x86_64-musl
- [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/29074.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ovmf-29074.patch --]
[-- Type: text/x-diff, Size: 11738 bytes --]
From 6e61a06e5c36e3113967feae2bf3f2bd1e8a952d Mon Sep 17 00:00:00 2001
From: "Franc[e]sco" <lolisamurai@tfwno.gf>
Date: Sun, 8 Dec 2019 20:47:47 +0100
Subject: [PATCH] New package: {edk2,ovmf-*}-202011 [ci_skip]
---
srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json | 34 ++++
srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json | 35 ++++
srcpkgs/edk2/files/60-edk2-ovmf-ia32.json | 33 ++++
srcpkgs/edk2/files/60-edk2-ovmf-x64.json | 34 ++++
srcpkgs/edk2/template | 176 +++++++++++++++++++
srcpkgs/edk2/update | 2 +
srcpkgs/ovmf-ia32 | 1 +
srcpkgs/ovmf-x64 | 1 +
8 files changed, 316 insertions(+)
create mode 100644 srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
create mode 100644 srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
create mode 100644 srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
create mode 100644 srcpkgs/edk2/files/60-edk2-ovmf-x64.json
create mode 100644 srcpkgs/edk2/template
create mode 100644 srcpkgs/edk2/update
create mode 120000 srcpkgs/ovmf-ia32
create mode 120000 srcpkgs/ovmf-x64
diff --git a/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json b/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
new file mode 100644
index 00000000000..df80f1ed5ec
--- /dev/null
+++ b/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
@@ -0,0 +1,34 @@
+{
+ "description": "OVMF for i386, with SB+SMM, empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "i386",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "requires-smm",
+ "secure-boot",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json b/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
new file mode 100644
index 00000000000..99345cac2aa
--- /dev/null
+++ b/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
@@ -0,0 +1,35 @@
+{
+ "description": "OVMF for x86_64, with SB+SMM, empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "requires-smm",
+ "secure-boot",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json b/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
new file mode 100644
index 00000000000..d804b2ec7a5
--- /dev/null
+++ b/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
@@ -0,0 +1,33 @@
+{
+ "description": "OVMF for i386, without SB, without SMM, with empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "i386",
+ "machines": [
+ "pc-i440fx-*",
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/60-edk2-ovmf-x64.json b/srcpkgs/edk2/files/60-edk2-ovmf-x64.json
new file mode 100644
index 00000000000..355691bb5b5
--- /dev/null
+++ b/srcpkgs/edk2/files/60-edk2-ovmf-x64.json
@@ -0,0 +1,34 @@
+{
+ "description": "OVMF for x86_64, without SB, without SMM, with empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-i440fx-*",
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/template b/srcpkgs/edk2/template
new file mode 100644
index 00000000000..5027680a0f0
--- /dev/null
+++ b/srcpkgs/edk2/template
@@ -0,0 +1,176 @@
+# Template file for 'edk2'
+pkgname=edk2
+version=202011
+revision=1
+archs="x86_64* i686*"
+create_wrksrc=yes
+hostmakedepends="make python3 acpica-utils nasm libuuid-devel"
+short_desc="EFI Development Kit II"
+maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
+license="BSD-2-Clause-Patent, MIT, Apache-2.0"
+homepage="https://github.com/tianocore/edk2/tree/master/OvmfPkg"
+changelog="https://github.com/tianocore/edk2/releases"
+_openssl_ver=1.1.1g
+_brotli_commit=666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+distfiles="https://github.com/tianocore/edk2/archive/${pkgname}-stable${version}.tar.gz
+ https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz
+ https://github.com/google/brotli/archive/${_brotli_commit}.tar.gz"
+checksum="53e877c714426c2c1957d1e875d99c7eb6602a858d7ec8ba4eac42c37e3ce064
+ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+cd82ce69defa40e9e36443e59d90aa5f8c6013024fae6a2de8c31afc2c707065"
+_toolchain_opt=GCC5
+
+case ${XBPS_MACHINE} in
+ i686)
+ # edk2 doesn't find the correct host
+ # also, x64 can't be built on i686
+ _ovmf_host_arch=IA32
+ ;;
+ *)
+ _ovmf_build_x64=yes
+esac
+
+post_extract() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ ssldir=CryptoPkg/Library/OpensslLib/openssl
+ rm -rf "${ssldir}"
+ ln -sf "${wrksrc}/openssl-${_openssl_ver}" ${ssldir}
+ # openssl 1.1.1d has a typo that causes a compile error
+ sed -i 's/return return/return/g' ${ssldir}/crypto/threads_none.c
+
+ for brotlidir in BaseTools/Source/C/BrotliCompress/brotli \
+ MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+ do
+ rm -rf "${brotlidir}"
+ ln -sf "${wrksrc}/brotli-${_brotli_commit}" ${brotlidir}
+ done
+}
+
+do_build() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ _ovmf_common_flags="
+ -n ${XBPS_MAKEJOBS}
+ -b RELEASE
+ -D NETWORK_IP6_ENABLE
+ -D TPM2_ENABLE
+ "
+ _ovmf_x86_flags="
+ ${_ovmf_common_flags}
+ -D HTTP_BOOT_ENABLE
+ -D TLS_ENABLE
+ -D FD_SIZE_2MB
+ "
+ _ovmf_x86_sb_flags="
+ ${_ovmf_x86_flags}
+ -D SECURE_BOOT_ENABLE
+ -D SMM_REQUIRE
+ -D EXCLUDE_SHELL_FROM_FD
+ "
+ export HOST_ARCH=${_ovmf_host_arch}
+ export PATH="$(pwd)/BaseTools/BinWrappers/PosixLike/:$PATH"
+ export EDK_TOOLS_PATH="$(pwd)"/BaseTools
+ export PYTHON_COMMAND=python3
+ export WORKSPACE="$(pwd)"
+ export PACKAGES_PATH="$(pwd)"
+ bash -c ". ./edksetup.sh"
+ make -C BaseTools
+ if [ ${_ovmf_build_x64} ]; then
+ # x86_64, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfX64{,NoSb}
+ # x86_64, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_sb_flags}
+ fi
+ # ia32, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfIa32{,NoSb}
+ # ia32, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_sb_flags}
+}
+
+do_install() {
+ # development tools
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ for d in Conf Scripts Python; do
+ vmkdir /usr/share/${pkgname}/${d}
+ done
+ vmkdir /usr/lib/${pkgname}/bin
+ bins="BrotliCompress DevicePath EfiRom GenCrc32 GenFfs GenFv GenFw GenSec
+ LzmaCompress Split TianoCompress VfrCompile VolInfo"
+ for bin in $bins; do
+ vinstall BaseTools/Source/C/bin/${bin} 755 /usr/lib/${pkgname}/bin
+ done
+ vinstall BaseTools/BinWrappers/PosixLike/LzmaF86Compress 755 \
+ /usr/lib/${pkgname}/bin
+ vinstall BaseTools/BuildEnv 755 /usr/share/${pkgname}
+ for f in build_rule tools_def target; do
+ vinstall BaseTools/Conf/${f}.template 644 /usr/share/${pkgname}/Conf
+ done
+ vinstall BaseTools/Scripts/GccBase.lds 644 /usr/share/${pkgname}/Scripts
+ mkdir PythonBins
+ python_dirs="BPDG CommonDataClass PatchPcdValue Rsa2048Sha256Sign
+ Pkcs7Sign GenPatchPcdTable AutoGen GenFds Workspace Table Ecc Trim
+ TargetTool build Capsule Eot Common UPT"
+ for d in ${python_dirs}; do
+ fulldir=BaseTools/Source/Python/${d}
+ vcopy ${fulldir} /usr/share/edk2/Python/
+ [ -f "${fulldir}/${d}.py" ] || continue
+ cat > PythonBins/${d}.py <<- EOF
+ #!/bin/sh
+ export PYTHONPATH=/usr/share/${pkgname}/Python
+ exec python /usr/share/${pkgname}/Python/${d}/${d}.py "\$@"
+ EOF
+ vinstall PythonBins/${d}.py 755 /usr/lib/${pkgname}/bin
+ done
+
+ # ovmf uefi firmware
+ x=OVMF_CODE
+ if [ ${_ovmf_build_x64} ]; then
+ for f in OVMF_{CODE,VARS}; do
+ vinstall Build/OvmfX64NoSb/RELEASE_${_toolchain_opt}/FV/${f}.fd \
+ 644 /usr/share/edk2/ovmf/
+ done
+ vinstall Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf ${x}.secboot.fd
+ # libvirt hardcodes this directory name if no json manifests are present.
+ # also provides backwards compatibility with VMs created before the
+ # json manifests system
+ vmkdir /usr/share/OVMF
+ for f in OVMF_{CODE{,.secboot},VARS}.fd; do
+ ln -sf ../edk2/ovmf/${f} "${DESTDIR}/usr/share/OVMF/"
+ done
+ fi
+ vinstall Build/OvmfIa32NoSb/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32/
+ vinstall Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32 ${x}.secboot.fd
+ for x in 50-edk2-ovmf-{ia32,x64}-sb.json 60-edk2-ovmf-{ia32,x64}.json; do
+ vinstall ${FILESDIR}/$x 644 /usr/share/qemu/firmware
+ done
+ vlicense OvmfPkg/License.txt
+}
+
+_ovmf_basedesc="Tianocore UEFI firmware for qemu"
+
+ovmf-ia32_package() {
+ short_desc="${_ovmf_basedesc} ia32"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf-ia32
+ vmove usr/share/qemu/firmware/*edk2-ovmf-ia32*.json
+ }
+}
+
+if [ ${_ovmf_build_x64} ]; then
+ ovmf-x64_package() {
+ short_desc="${_ovmf_basedesc} x64"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf
+ vmove usr/share/OVMF
+ vmove usr/share/qemu/firmware/*edk2-ovmf-x64*.json
+ }
+ }
+fi
diff --git a/srcpkgs/edk2/update b/srcpkgs/edk2/update
new file mode 100644
index 00000000000..551f406857f
--- /dev/null
+++ b/srcpkgs/edk2/update
@@ -0,0 +1,2 @@
+site="https://github.com/tianocore/edk2/tags"
+version="stable${version}"
diff --git a/srcpkgs/ovmf-ia32 b/srcpkgs/ovmf-ia32
new file mode 120000
index 00000000000..06c0198cb80
--- /dev/null
+++ b/srcpkgs/ovmf-ia32
@@ -0,0 +1 @@
+edk2
\ No newline at end of file
diff --git a/srcpkgs/ovmf-x64 b/srcpkgs/ovmf-x64
new file mode 120000
index 00000000000..06c0198cb80
--- /dev/null
+++ b/srcpkgs/ovmf-x64
@@ -0,0 +1 @@
+edk2
\ No newline at end of file
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202011
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (2 preceding siblings ...)
2021-02-26 18:13 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-03-24 21:43 ` Xlaits
2021-03-26 21:44 ` [PR PATCH] [Updated] " Logarithmus
` (32 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Xlaits @ 2021-03-24 21:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
New comment by Xlaits on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-806205493
Comment:
Getting errors attempting to build ovmf-*
```
=> ca-certificates-20210119_1: running pre-pkg hook: 90-set-timestamps ...
date: invalid date ‘@1616622037\n1616622037’
=> ERROR: ca-certificates-20210119_1: pre-pkg_90-set-timestamps: 'date --date "@$SOURCE_DATE_EPOCH"' exited with 1
=> ERROR: in hook() at common/hooks/pre-pkg/90-set-timestamps.sh:7
=> ERROR: in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR: in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR: in main() at common/xbps-src/libexec/xbps-src-prepkg.sh:47
=> ca-certificates-20210119_1: setting mtimes to
touch: invalid date format ‘@1616622037\n1616622037’
=> ERROR: ca-certificates-20210119_1: pre-pkg_90-set-timestamps: 'xargs -0 touch -h --date "@$SOURCE_DATE_EPOCH"' exited with 123
=> ERROR: in hook() at common/hooks/pre-pkg/90-set-timestamps.sh:8
=> ERROR: in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR: in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR: in main() at common/xbps-src/libexec/xbps-src-prepkg.sh:47
```
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PR PATCH] [Updated] New packages: {edk2,ovmf-*}-202011
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (3 preceding siblings ...)
2021-03-24 21:43 ` Xlaits
@ 2021-03-26 21:44 ` Logarithmus
2021-03-26 22:41 ` [PR PATCH] [Updated] New packages: {edk2,ovmf-*}-202102 Logarithmus
` (31 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Logarithmus @ 2021-03-26 21:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages ovmf
https://github.com/void-linux/void-packages/pull/29074
New packages: {edk2,ovmf-*}-202011
[ci skip]
Continues https://github.com/void-linux/void-packages/pull/17225
Closes https://github.com/void-linux/void-packages/issues/11243, https://github.com/void-linux/void-packages/issues/27229
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
#### Does it build and run successfully?
- [ ] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] x86_64
- [ ] x86_64-musl
- [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/29074.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ovmf-29074.patch --]
[-- Type: text/x-diff, Size: 11754 bytes --]
From b0db0da56234449bb3e7cf34947425c809a0277b Mon Sep 17 00:00:00 2001
From: "Franc[e]sco" <lolisamurai@tfwno.gf>
Date: Sun, 8 Dec 2019 20:47:47 +0100
Subject: [PATCH] New package: {edk2,ovmf-*}-202011 [ci_skip]
---
srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json | 34 ++++
srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json | 35 ++++
srcpkgs/edk2/files/60-edk2-ovmf-ia32.json | 33 ++++
srcpkgs/edk2/files/60-edk2-ovmf-x64.json | 34 ++++
srcpkgs/edk2/template | 176 +++++++++++++++++++
srcpkgs/edk2/update | 2 +
srcpkgs/ovmf-ia32 | 1 +
srcpkgs/ovmf-x64 | 1 +
8 files changed, 316 insertions(+)
create mode 100644 srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
create mode 100644 srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
create mode 100644 srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
create mode 100644 srcpkgs/edk2/files/60-edk2-ovmf-x64.json
create mode 100644 srcpkgs/edk2/template
create mode 100644 srcpkgs/edk2/update
create mode 120000 srcpkgs/ovmf-ia32
create mode 120000 srcpkgs/ovmf-x64
diff --git a/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json b/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
new file mode 100644
index 000000000000..df80f1ed5ecc
--- /dev/null
+++ b/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
@@ -0,0 +1,34 @@
+{
+ "description": "OVMF for i386, with SB+SMM, empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "i386",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "requires-smm",
+ "secure-boot",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json b/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
new file mode 100644
index 000000000000..99345cac2aa5
--- /dev/null
+++ b/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
@@ -0,0 +1,35 @@
+{
+ "description": "OVMF for x86_64, with SB+SMM, empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "requires-smm",
+ "secure-boot",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json b/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
new file mode 100644
index 000000000000..d804b2ec7a51
--- /dev/null
+++ b/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
@@ -0,0 +1,33 @@
+{
+ "description": "OVMF for i386, without SB, without SMM, with empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "i386",
+ "machines": [
+ "pc-i440fx-*",
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/60-edk2-ovmf-x64.json b/srcpkgs/edk2/files/60-edk2-ovmf-x64.json
new file mode 100644
index 000000000000..355691bb5b5e
--- /dev/null
+++ b/srcpkgs/edk2/files/60-edk2-ovmf-x64.json
@@ -0,0 +1,34 @@
+{
+ "description": "OVMF for x86_64, without SB, without SMM, with empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-i440fx-*",
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/template b/srcpkgs/edk2/template
new file mode 100644
index 000000000000..5027680a0f0b
--- /dev/null
+++ b/srcpkgs/edk2/template
@@ -0,0 +1,176 @@
+# Template file for 'edk2'
+pkgname=edk2
+version=202011
+revision=1
+archs="x86_64* i686*"
+create_wrksrc=yes
+hostmakedepends="make python3 acpica-utils nasm libuuid-devel"
+short_desc="EFI Development Kit II"
+maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
+license="BSD-2-Clause-Patent, MIT, Apache-2.0"
+homepage="https://github.com/tianocore/edk2/tree/master/OvmfPkg"
+changelog="https://github.com/tianocore/edk2/releases"
+_openssl_ver=1.1.1g
+_brotli_commit=666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+distfiles="https://github.com/tianocore/edk2/archive/${pkgname}-stable${version}.tar.gz
+ https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz
+ https://github.com/google/brotli/archive/${_brotli_commit}.tar.gz"
+checksum="53e877c714426c2c1957d1e875d99c7eb6602a858d7ec8ba4eac42c37e3ce064
+ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+cd82ce69defa40e9e36443e59d90aa5f8c6013024fae6a2de8c31afc2c707065"
+_toolchain_opt=GCC5
+
+case ${XBPS_MACHINE} in
+ i686)
+ # edk2 doesn't find the correct host
+ # also, x64 can't be built on i686
+ _ovmf_host_arch=IA32
+ ;;
+ *)
+ _ovmf_build_x64=yes
+esac
+
+post_extract() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ ssldir=CryptoPkg/Library/OpensslLib/openssl
+ rm -rf "${ssldir}"
+ ln -sf "${wrksrc}/openssl-${_openssl_ver}" ${ssldir}
+ # openssl 1.1.1d has a typo that causes a compile error
+ sed -i 's/return return/return/g' ${ssldir}/crypto/threads_none.c
+
+ for brotlidir in BaseTools/Source/C/BrotliCompress/brotli \
+ MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+ do
+ rm -rf "${brotlidir}"
+ ln -sf "${wrksrc}/brotli-${_brotli_commit}" ${brotlidir}
+ done
+}
+
+do_build() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ _ovmf_common_flags="
+ -n ${XBPS_MAKEJOBS}
+ -b RELEASE
+ -D NETWORK_IP6_ENABLE
+ -D TPM2_ENABLE
+ "
+ _ovmf_x86_flags="
+ ${_ovmf_common_flags}
+ -D HTTP_BOOT_ENABLE
+ -D TLS_ENABLE
+ -D FD_SIZE_2MB
+ "
+ _ovmf_x86_sb_flags="
+ ${_ovmf_x86_flags}
+ -D SECURE_BOOT_ENABLE
+ -D SMM_REQUIRE
+ -D EXCLUDE_SHELL_FROM_FD
+ "
+ export HOST_ARCH=${_ovmf_host_arch}
+ export PATH="$(pwd)/BaseTools/BinWrappers/PosixLike/:$PATH"
+ export EDK_TOOLS_PATH="$(pwd)"/BaseTools
+ export PYTHON_COMMAND=python3
+ export WORKSPACE="$(pwd)"
+ export PACKAGES_PATH="$(pwd)"
+ bash -c ". ./edksetup.sh"
+ make -C BaseTools
+ if [ ${_ovmf_build_x64} ]; then
+ # x86_64, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfX64{,NoSb}
+ # x86_64, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_sb_flags}
+ fi
+ # ia32, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfIa32{,NoSb}
+ # ia32, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_sb_flags}
+}
+
+do_install() {
+ # development tools
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ for d in Conf Scripts Python; do
+ vmkdir /usr/share/${pkgname}/${d}
+ done
+ vmkdir /usr/lib/${pkgname}/bin
+ bins="BrotliCompress DevicePath EfiRom GenCrc32 GenFfs GenFv GenFw GenSec
+ LzmaCompress Split TianoCompress VfrCompile VolInfo"
+ for bin in $bins; do
+ vinstall BaseTools/Source/C/bin/${bin} 755 /usr/lib/${pkgname}/bin
+ done
+ vinstall BaseTools/BinWrappers/PosixLike/LzmaF86Compress 755 \
+ /usr/lib/${pkgname}/bin
+ vinstall BaseTools/BuildEnv 755 /usr/share/${pkgname}
+ for f in build_rule tools_def target; do
+ vinstall BaseTools/Conf/${f}.template 644 /usr/share/${pkgname}/Conf
+ done
+ vinstall BaseTools/Scripts/GccBase.lds 644 /usr/share/${pkgname}/Scripts
+ mkdir PythonBins
+ python_dirs="BPDG CommonDataClass PatchPcdValue Rsa2048Sha256Sign
+ Pkcs7Sign GenPatchPcdTable AutoGen GenFds Workspace Table Ecc Trim
+ TargetTool build Capsule Eot Common UPT"
+ for d in ${python_dirs}; do
+ fulldir=BaseTools/Source/Python/${d}
+ vcopy ${fulldir} /usr/share/edk2/Python/
+ [ -f "${fulldir}/${d}.py" ] || continue
+ cat > PythonBins/${d}.py <<- EOF
+ #!/bin/sh
+ export PYTHONPATH=/usr/share/${pkgname}/Python
+ exec python /usr/share/${pkgname}/Python/${d}/${d}.py "\$@"
+ EOF
+ vinstall PythonBins/${d}.py 755 /usr/lib/${pkgname}/bin
+ done
+
+ # ovmf uefi firmware
+ x=OVMF_CODE
+ if [ ${_ovmf_build_x64} ]; then
+ for f in OVMF_{CODE,VARS}; do
+ vinstall Build/OvmfX64NoSb/RELEASE_${_toolchain_opt}/FV/${f}.fd \
+ 644 /usr/share/edk2/ovmf/
+ done
+ vinstall Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf ${x}.secboot.fd
+ # libvirt hardcodes this directory name if no json manifests are present.
+ # also provides backwards compatibility with VMs created before the
+ # json manifests system
+ vmkdir /usr/share/OVMF
+ for f in OVMF_{CODE{,.secboot},VARS}.fd; do
+ ln -sf ../edk2/ovmf/${f} "${DESTDIR}/usr/share/OVMF/"
+ done
+ fi
+ vinstall Build/OvmfIa32NoSb/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32/
+ vinstall Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32 ${x}.secboot.fd
+ for x in 50-edk2-ovmf-{ia32,x64}-sb.json 60-edk2-ovmf-{ia32,x64}.json; do
+ vinstall ${FILESDIR}/$x 644 /usr/share/qemu/firmware
+ done
+ vlicense OvmfPkg/License.txt
+}
+
+_ovmf_basedesc="Tianocore UEFI firmware for qemu"
+
+ovmf-ia32_package() {
+ short_desc="${_ovmf_basedesc} ia32"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf-ia32
+ vmove usr/share/qemu/firmware/*edk2-ovmf-ia32*.json
+ }
+}
+
+if [ ${_ovmf_build_x64} ]; then
+ ovmf-x64_package() {
+ short_desc="${_ovmf_basedesc} x64"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf
+ vmove usr/share/OVMF
+ vmove usr/share/qemu/firmware/*edk2-ovmf-x64*.json
+ }
+ }
+fi
diff --git a/srcpkgs/edk2/update b/srcpkgs/edk2/update
new file mode 100644
index 000000000000..551f406857f5
--- /dev/null
+++ b/srcpkgs/edk2/update
@@ -0,0 +1,2 @@
+site="https://github.com/tianocore/edk2/tags"
+version="stable${version}"
diff --git a/srcpkgs/ovmf-ia32 b/srcpkgs/ovmf-ia32
new file mode 120000
index 000000000000..06c0198cb809
--- /dev/null
+++ b/srcpkgs/ovmf-ia32
@@ -0,0 +1 @@
+edk2
\ No newline at end of file
diff --git a/srcpkgs/ovmf-x64 b/srcpkgs/ovmf-x64
new file mode 120000
index 000000000000..06c0198cb809
--- /dev/null
+++ b/srcpkgs/ovmf-x64
@@ -0,0 +1 @@
+edk2
\ No newline at end of file
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PR PATCH] [Updated] New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (4 preceding siblings ...)
2021-03-26 21:44 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-03-26 22:41 ` Logarithmus
2021-03-26 22:44 ` Logarithmus
` (30 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Logarithmus @ 2021-03-26 22:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages ovmf
https://github.com/void-linux/void-packages/pull/29074
New packages: {edk2,ovmf-*}-202102
[ci skip]
Continues https://github.com/void-linux/void-packages/pull/17225
Closes https://github.com/void-linux/void-packages/issues/11243, https://github.com/void-linux/void-packages/issues/27229
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
#### Does it build and run successfully?
- [ ] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] x86_64
- [ ] x86_64-musl
- [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/29074.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ovmf-29074.patch --]
[-- Type: text/x-diff, Size: 11748 bytes --]
From c006cf36975f58f4497c10cc31da0724a98194a8 Mon Sep 17 00:00:00 2001
From: "Franc[e]sco" <lolisamurai@tfwno.gf>
Date: Sun, 8 Dec 2019 20:47:47 +0100
Subject: [PATCH] New package: {edk2,ovmf-*}-202102 [ci_skip]
---
srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json | 34 ++++
srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json | 35 ++++
srcpkgs/edk2/files/60-edk2-ovmf-ia32.json | 33 ++++
srcpkgs/edk2/files/60-edk2-ovmf-x64.json | 34 ++++
srcpkgs/edk2/template | 176 +++++++++++++++++++
srcpkgs/edk2/update | 2 +
srcpkgs/ovmf-ia32 | 1 +
srcpkgs/ovmf-x64 | 1 +
8 files changed, 316 insertions(+)
create mode 100644 srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
create mode 100644 srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
create mode 100644 srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
create mode 100644 srcpkgs/edk2/files/60-edk2-ovmf-x64.json
create mode 100644 srcpkgs/edk2/template
create mode 100644 srcpkgs/edk2/update
create mode 120000 srcpkgs/ovmf-ia32
create mode 120000 srcpkgs/ovmf-x64
diff --git a/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json b/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
new file mode 100644
index 000000000000..df80f1ed5ecc
--- /dev/null
+++ b/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
@@ -0,0 +1,34 @@
+{
+ "description": "OVMF for i386, with SB+SMM, empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "i386",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "requires-smm",
+ "secure-boot",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json b/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
new file mode 100644
index 000000000000..99345cac2aa5
--- /dev/null
+++ b/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
@@ -0,0 +1,35 @@
+{
+ "description": "OVMF for x86_64, with SB+SMM, empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "requires-smm",
+ "secure-boot",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json b/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
new file mode 100644
index 000000000000..d804b2ec7a51
--- /dev/null
+++ b/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
@@ -0,0 +1,33 @@
+{
+ "description": "OVMF for i386, without SB, without SMM, with empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "i386",
+ "machines": [
+ "pc-i440fx-*",
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/60-edk2-ovmf-x64.json b/srcpkgs/edk2/files/60-edk2-ovmf-x64.json
new file mode 100644
index 000000000000..355691bb5b5e
--- /dev/null
+++ b/srcpkgs/edk2/files/60-edk2-ovmf-x64.json
@@ -0,0 +1,34 @@
+{
+ "description": "OVMF for x86_64, without SB, without SMM, with empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-i440fx-*",
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/template b/srcpkgs/edk2/template
new file mode 100644
index 000000000000..39696d971aaa
--- /dev/null
+++ b/srcpkgs/edk2/template
@@ -0,0 +1,176 @@
+# Template file for 'edk2'
+pkgname=edk2
+version=202102
+revision=1
+archs="x86_64* i686*"
+create_wrksrc=yes
+hostmakedepends="make python3 acpica-utils nasm libuuid-devel"
+short_desc="EFI Development Kit II"
+maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
+license="BSD-2-Clause-Patent, MIT, Apache-2.0"
+homepage="https://github.com/tianocore/edk2/tree/master/OvmfPkg"
+changelog="https://github.com/tianocore/edk2/releases"
+_openssl_ver=1.1.1g
+_brotli_commit=666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+distfiles="https://github.com/tianocore/edk2/archive/${pkgname}-stable${version}.tar.gz
+ https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz
+ https://github.com/google/brotli/archive/${_brotli_commit}.tar.gz"
+checksum="268591f0db8fd1f8c977509e8ac37bd6090c8373bf63a9657c88bb27bb43a279
+ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+cd82ce69defa40e9e36443e59d90aa5f8c6013024fae6a2de8c31afc2c707065"
+_toolchain_opt=GCC5
+
+case ${XBPS_MACHINE} in
+ i686)
+ # edk2 doesn't find the correct host
+ # also, x64 can't be built on i686
+ _ovmf_host_arch=IA32
+ ;;
+ *)
+ _ovmf_build_x64=yes
+esac
+
+post_extract() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ ssldir=CryptoPkg/Library/OpensslLib/openssl
+ rm -rf "${ssldir}"
+ ln -sf "${wrksrc}/openssl-${_openssl_ver}" ${ssldir}
+ # openssl 1.1.1d has a typo that causes a compile error
+ sed -i 's/return return/return/g' ${ssldir}/crypto/threads_none.c
+
+ for brotlidir in BaseTools/Source/C/BrotliCompress/brotli \
+ MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+ do
+ rm -rf "${brotlidir}"
+ ln -sf "${wrksrc}/brotli-${_brotli_commit}" ${brotlidir}
+ done
+}
+
+do_build() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ _ovmf_common_flags="
+ -n ${XBPS_MAKEJOBS}
+ -b RELEASE
+ -D NETWORK_IP6_ENABLE
+ -D TPM2_ENABLE
+ "
+ _ovmf_x86_flags="
+ ${_ovmf_common_flags}
+ -D HTTP_BOOT_ENABLE
+ -D TLS_ENABLE
+ -D FD_SIZE_2MB
+ "
+ _ovmf_x86_sb_flags="
+ ${_ovmf_x86_flags}
+ -D SECURE_BOOT_ENABLE
+ -D SMM_REQUIRE
+ -D EXCLUDE_SHELL_FROM_FD
+ "
+ export HOST_ARCH=${_ovmf_host_arch}
+ export PATH="$(pwd)/BaseTools/BinWrappers/PosixLike/:$PATH"
+ export EDK_TOOLS_PATH="$(pwd)"/BaseTools
+ export PYTHON_COMMAND=python3
+ export WORKSPACE="$(pwd)"
+ export PACKAGES_PATH="$(pwd)"
+ bash -c ". ./edksetup.sh"
+ make -C BaseTools
+ if [ ${_ovmf_build_x64} ]; then
+ # x86_64, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfX64{,NoSb}
+ # x86_64, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_sb_flags}
+ fi
+ # ia32, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfIa32{,NoSb}
+ # ia32, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_sb_flags}
+}
+
+do_install() {
+ # development tools
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ for d in Conf Scripts Python; do
+ vmkdir /usr/share/${pkgname}/${d}
+ done
+ vmkdir /usr/lib/${pkgname}/bin
+ bins="BrotliCompress DevicePath EfiRom GenCrc32 GenFfs GenFv GenFw GenSec
+ LzmaCompress TianoCompress VfrCompile VolInfo"
+ for bin in $bins; do
+ vinstall BaseTools/Source/C/bin/${bin} 755 /usr/lib/${pkgname}/bin
+ done
+ vinstall BaseTools/BinWrappers/PosixLike/LzmaF86Compress 755 \
+ /usr/lib/${pkgname}/bin
+ vinstall BaseTools/BuildEnv 755 /usr/share/${pkgname}
+ for f in build_rule tools_def target; do
+ vinstall BaseTools/Conf/${f}.template 644 /usr/share/${pkgname}/Conf
+ done
+ vinstall BaseTools/Scripts/GccBase.lds 644 /usr/share/${pkgname}/Scripts
+ mkdir PythonBins
+ python_dirs="BPDG CommonDataClass PatchPcdValue Rsa2048Sha256Sign
+ Pkcs7Sign GenPatchPcdTable AutoGen GenFds Workspace Table Ecc Trim
+ TargetTool build Capsule Eot Common UPT"
+ for d in ${python_dirs}; do
+ fulldir=BaseTools/Source/Python/${d}
+ vcopy ${fulldir} /usr/share/edk2/Python/
+ [ -f "${fulldir}/${d}.py" ] || continue
+ cat > PythonBins/${d}.py <<- EOF
+ #!/bin/sh
+ export PYTHONPATH=/usr/share/${pkgname}/Python
+ exec python /usr/share/${pkgname}/Python/${d}/${d}.py "\$@"
+ EOF
+ vinstall PythonBins/${d}.py 755 /usr/lib/${pkgname}/bin
+ done
+
+ # ovmf uefi firmware
+ x=OVMF_CODE
+ if [ ${_ovmf_build_x64} ]; then
+ for f in OVMF_{CODE,VARS}; do
+ vinstall Build/OvmfX64NoSb/RELEASE_${_toolchain_opt}/FV/${f}.fd \
+ 644 /usr/share/edk2/ovmf/
+ done
+ vinstall Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf ${x}.secboot.fd
+ # libvirt hardcodes this directory name if no json manifests are present.
+ # also provides backwards compatibility with VMs created before the
+ # json manifests system
+ vmkdir /usr/share/OVMF
+ for f in OVMF_{CODE{,.secboot},VARS}.fd; do
+ ln -sf ../edk2/ovmf/${f} "${DESTDIR}/usr/share/OVMF/"
+ done
+ fi
+ vinstall Build/OvmfIa32NoSb/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32/
+ vinstall Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32 ${x}.secboot.fd
+ for x in 50-edk2-ovmf-{ia32,x64}-sb.json 60-edk2-ovmf-{ia32,x64}.json; do
+ vinstall ${FILESDIR}/$x 644 /usr/share/qemu/firmware
+ done
+ vlicense OvmfPkg/License.txt
+}
+
+_ovmf_basedesc="Tianocore UEFI firmware for qemu"
+
+ovmf-ia32_package() {
+ short_desc="${_ovmf_basedesc} ia32"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf-ia32
+ vmove usr/share/qemu/firmware/*edk2-ovmf-ia32*.json
+ }
+}
+
+if [ ${_ovmf_build_x64} ]; then
+ ovmf-x64_package() {
+ short_desc="${_ovmf_basedesc} x64"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf
+ vmove usr/share/OVMF
+ vmove usr/share/qemu/firmware/*edk2-ovmf-x64*.json
+ }
+ }
+fi
diff --git a/srcpkgs/edk2/update b/srcpkgs/edk2/update
new file mode 100644
index 000000000000..551f406857f5
--- /dev/null
+++ b/srcpkgs/edk2/update
@@ -0,0 +1,2 @@
+site="https://github.com/tianocore/edk2/tags"
+version="stable${version}"
diff --git a/srcpkgs/ovmf-ia32 b/srcpkgs/ovmf-ia32
new file mode 120000
index 000000000000..06c0198cb809
--- /dev/null
+++ b/srcpkgs/ovmf-ia32
@@ -0,0 +1 @@
+edk2
\ No newline at end of file
diff --git a/srcpkgs/ovmf-x64 b/srcpkgs/ovmf-x64
new file mode 120000
index 000000000000..06c0198cb809
--- /dev/null
+++ b/srcpkgs/ovmf-x64
@@ -0,0 +1 @@
+edk2
\ No newline at end of file
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (5 preceding siblings ...)
2021-03-26 22:41 ` [PR PATCH] [Updated] New packages: {edk2,ovmf-*}-202102 Logarithmus
@ 2021-03-26 22:44 ` Logarithmus
2021-03-26 22:46 ` [PR PATCH] [Updated] " Logarithmus
` (29 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Logarithmus @ 2021-03-26 22:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1301 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-808567014
Comment:
> Getting errors attempting to build ovmf-*
>
> ```
> => ca-certificates-20210119_1: running pre-pkg hook: 90-set-timestamps ...
> date: invalid date ‘@1616622037\n1616622037’
> => ERROR: ca-certificates-20210119_1: pre-pkg_90-set-timestamps: 'date --date "@$SOURCE_DATE_EPOCH"' exited with 1
> => ERROR: in hook() at common/hooks/pre-pkg/90-set-timestamps.sh:7
> => ERROR: in run_func() at common/xbps-src/shutils/common.sh:21
> => ERROR: in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
> => ERROR: in main() at common/xbps-src/libexec/xbps-src-prepkg.sh:47
> => ca-certificates-20210119_1: setting mtimes to
> touch: invalid date format ‘@1616622037\n1616622037’
> => ERROR: ca-certificates-20210119_1: pre-pkg_90-set-timestamps: 'xargs -0 touch -h --date "@$SOURCE_DATE_EPOCH"' exited with 123
> => ERROR: in hook() at common/hooks/pre-pkg/90-set-timestamps.sh:8
> => ERROR: in run_func() at common/xbps-src/shutils/common.sh:21
> => ERROR: in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
> => ERROR: in main() at common/xbps-src/libexec/xbps-src-prepkg.sh:47
> ```
Please, check now
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PR PATCH] [Updated] New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (6 preceding siblings ...)
2021-03-26 22:44 ` Logarithmus
@ 2021-03-26 22:46 ` Logarithmus
2021-03-27 13:09 ` Logarithmus
` (28 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Logarithmus @ 2021-03-26 22:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages ovmf
https://github.com/void-linux/void-packages/pull/29074
New packages: {edk2,ovmf-*}-202102
Continues https://github.com/void-linux/void-packages/pull/17225
Closes https://github.com/void-linux/void-packages/issues/11243, https://github.com/void-linux/void-packages/issues/27229
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
#### Does it build and run successfully?
- [ ] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] x86_64
- [x] x86_64-musl
- [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/29074.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ovmf-29074.patch --]
[-- Type: text/x-diff, Size: 11742 bytes --]
From 93287abe2fdbba27a9f192884f1f7832863188b3 Mon Sep 17 00:00:00 2001
From: "Franc[e]sco" <lolisamurai@tfwno.gf>
Date: Sun, 8 Dec 2019 20:47:47 +0100
Subject: [PATCH] New package: {edk2,ovmf-*}-202102
---
srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json | 34 ++++
srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json | 35 ++++
srcpkgs/edk2/files/60-edk2-ovmf-ia32.json | 33 ++++
srcpkgs/edk2/files/60-edk2-ovmf-x64.json | 34 ++++
srcpkgs/edk2/template | 176 +++++++++++++++++++
srcpkgs/edk2/update | 2 +
srcpkgs/ovmf-ia32 | 1 +
srcpkgs/ovmf-x64 | 1 +
8 files changed, 316 insertions(+)
create mode 100644 srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
create mode 100644 srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
create mode 100644 srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
create mode 100644 srcpkgs/edk2/files/60-edk2-ovmf-x64.json
create mode 100644 srcpkgs/edk2/template
create mode 100644 srcpkgs/edk2/update
create mode 120000 srcpkgs/ovmf-ia32
create mode 120000 srcpkgs/ovmf-x64
diff --git a/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json b/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
new file mode 100644
index 000000000000..df80f1ed5ecc
--- /dev/null
+++ b/srcpkgs/edk2/files/50-edk2-ovmf-ia32-sb.json
@@ -0,0 +1,34 @@
+{
+ "description": "OVMF for i386, with SB+SMM, empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "i386",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "requires-smm",
+ "secure-boot",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json b/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
new file mode 100644
index 000000000000..99345cac2aa5
--- /dev/null
+++ b/srcpkgs/edk2/files/50-edk2-ovmf-x64-sb.json
@@ -0,0 +1,35 @@
+{
+ "description": "OVMF for x86_64, with SB+SMM, empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "requires-smm",
+ "secure-boot",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json b/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
new file mode 100644
index 000000000000..d804b2ec7a51
--- /dev/null
+++ b/srcpkgs/edk2/files/60-edk2-ovmf-ia32.json
@@ -0,0 +1,33 @@
+{
+ "description": "OVMF for i386, without SB, without SMM, with empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "i386",
+ "machines": [
+ "pc-i440fx-*",
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/files/60-edk2-ovmf-x64.json b/srcpkgs/edk2/files/60-edk2-ovmf-x64.json
new file mode 100644
index 000000000000..355691bb5b5e
--- /dev/null
+++ b/srcpkgs/edk2/files/60-edk2-ovmf-x64.json
@@ -0,0 +1,34 @@
+{
+ "description": "OVMF for x86_64, without SB, without SMM, with empty varstore",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-i440fx-*",
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/srcpkgs/edk2/template b/srcpkgs/edk2/template
new file mode 100644
index 000000000000..9ad4647074d3
--- /dev/null
+++ b/srcpkgs/edk2/template
@@ -0,0 +1,176 @@
+# Template file for 'edk2'
+pkgname=edk2
+version=202102
+revision=1
+archs="x86_64* i686*"
+create_wrksrc=yes
+hostmakedepends="make python3 acpica-utils nasm libuuid-devel"
+short_desc="EFI Development Kit II"
+maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
+license="BSD-2-Clause-Patent, MIT, Apache-2.0"
+homepage="https://github.com/tianocore/edk2/tree/master/OvmfPkg"
+changelog="https://github.com/tianocore/edk2/releases"
+_openssl_ver=1.1.1g
+_brotli_commit=666c3280cc11dc433c303d79a83d4ffbdd12cc8d
+distfiles="https://github.com/tianocore/edk2/archive/${pkgname}-stable${version}.tar.gz
+ https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz
+ https://github.com/google/brotli/archive/${_brotli_commit}.tar.gz"
+checksum="268591f0db8fd1f8c977509e8ac37bd6090c8373bf63a9657c88bb27bb43a279
+ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+cd82ce69defa40e9e36443e59d90aa5f8c6013024fae6a2de8c31afc2c707065"
+_toolchain_opt=GCC5
+
+case ${XBPS_MACHINE} in
+ i686)
+ # edk2 doesn't find the correct host
+ # also, x64 can't be built on i686
+ _ovmf_host_arch=IA32
+ ;;
+ *)
+ _ovmf_build_x64=yes
+esac
+
+post_extract() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ ssldir=CryptoPkg/Library/OpensslLib/openssl
+ rm -rf "${ssldir}"
+ ln -sf "${wrksrc}/openssl-${_openssl_ver}" ${ssldir}
+ # openssl 1.1.1d has a typo that causes a compile error
+ sed -i 's/return return/return/g' ${ssldir}/crypto/threads_none.c
+
+ for brotlidir in BaseTools/Source/C/BrotliCompress/brotli \
+ MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+ do
+ rm -rf "${brotlidir}"
+ ln -sf "${wrksrc}/brotli-${_brotli_commit}" ${brotlidir}
+ done
+}
+
+do_build() {
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ _ovmf_common_flags="
+ -n ${XBPS_MAKEJOBS}
+ -b RELEASE
+ -D NETWORK_IP6_ENABLE
+ -D TPM2_ENABLE
+ "
+ _ovmf_x86_flags="
+ ${_ovmf_common_flags}
+ -D HTTP_BOOT_ENABLE
+ -D TLS_ENABLE
+ -D FD_SIZE_2MB
+ "
+ _ovmf_x86_sb_flags="
+ ${_ovmf_x86_flags}
+ -D SECURE_BOOT_ENABLE
+ -D SMM_REQUIRE
+ -D EXCLUDE_SHELL_FROM_FD
+ "
+ export HOST_ARCH=${_ovmf_host_arch}
+ export PATH="$(pwd)/BaseTools/BinWrappers/PosixLike/:$PATH"
+ export EDK_TOOLS_PATH="$(pwd)"/BaseTools
+ export PYTHON_COMMAND=python3
+ export WORKSPACE="$(pwd)"
+ export PACKAGES_PATH="$(pwd)"
+ bash -c ". ./edksetup.sh"
+ make -C BaseTools
+ if [ ${_ovmf_build_x64} ]; then
+ # x86_64, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfX64{,NoSb}
+ # x86_64, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${_ovmf_x86_sb_flags}
+ fi
+ # ia32, no secure boot, no smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_flags}
+ mv Build/OvmfIa32{,NoSb}
+ # ia32, secure boot, smm
+ command build -t ${_toolchain_opt} \
+ -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc ${_ovmf_x86_sb_flags}
+}
+
+do_install() {
+ # development tools
+ cd "${wrksrc}/${pkgname}-${pkgname}-stable${version}"
+ for d in Conf Scripts Python; do
+ vmkdir /usr/share/${pkgname}/${d}
+ done
+ vmkdir /usr/lib/${pkgname}/bin
+ bins="BrotliCompress DevicePath EfiRom GenCrc32 GenFfs GenFv GenFw GenSec
+ LzmaCompress TianoCompress VfrCompile VolInfo"
+ for bin in $bins; do
+ vinstall BaseTools/Source/C/bin/${bin} 755 /usr/lib/${pkgname}/bin
+ done
+ vinstall BaseTools/BinWrappers/PosixLike/LzmaF86Compress 755 \
+ /usr/lib/${pkgname}/bin
+ vinstall BaseTools/BuildEnv 755 /usr/share/${pkgname}
+ for f in build_rule tools_def target; do
+ vinstall BaseTools/Conf/${f}.template 644 /usr/share/${pkgname}/Conf
+ done
+ vinstall BaseTools/Scripts/GccBase.lds 644 /usr/share/${pkgname}/Scripts
+ mkdir PythonBins
+ python_dirs="BPDG CommonDataClass PatchPcdValue Rsa2048Sha256Sign
+ Pkcs7Sign GenPatchPcdTable AutoGen GenFds Workspace Table Ecc Trim
+ TargetTool build Capsule Eot Common UPT"
+ for d in ${python_dirs}; do
+ fulldir=BaseTools/Source/Python/${d}
+ vcopy ${fulldir} /usr/share/edk2/Python/
+ [ -f "${fulldir}/${d}.py" ] || continue
+ cat > PythonBins/${d}.py <<- EOF
+ #!/bin/sh
+ export PYTHONPATH=/usr/share/${pkgname}/Python
+ exec python /usr/share/${pkgname}/Python/${d}/${d}.py "\$@"
+ EOF
+ vinstall PythonBins/${d}.py 755 /usr/lib/${pkgname}/bin
+ done
+
+ # ovmf uefi firmware
+ x=OVMF_CODE
+ if [ ${_ovmf_build_x64} ]; then
+ for f in OVMF_{CODE,VARS}; do
+ vinstall Build/OvmfX64NoSb/RELEASE_${_toolchain_opt}/FV/${f}.fd \
+ 644 /usr/share/edk2/ovmf/
+ done
+ vinstall Build/OvmfX64/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf ${x}.secboot.fd
+ # libvirt hardcodes this directory name if no json manifests are present.
+ # also provides backwards compatibility with VMs created before the
+ # json manifests system
+ vmkdir /usr/share/OVMF
+ for f in OVMF_{CODE{,.secboot},VARS}.fd; do
+ ln -sf ../edk2/ovmf/${f} "${DESTDIR}/usr/share/OVMF/"
+ done
+ fi
+ vinstall Build/OvmfIa32NoSb/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32/
+ vinstall Build/OvmfIa32/RELEASE_${_toolchain_opt}/FV/${x}.fd \
+ 644 /usr/share/edk2/ovmf-ia32 ${x}.secboot.fd
+ for x in 50-edk2-ovmf-{ia32,x64}-sb.json 60-edk2-ovmf-{ia32,x64}.json; do
+ vinstall ${FILESDIR}/$x 644 /usr/share/qemu/firmware
+ done
+ vlicense OvmfPkg/License.txt
+}
+
+_ovmf_basedesc="Tianocore UEFI firmware for qemu"
+
+ovmf-ia32_package() {
+ short_desc="${_ovmf_basedesc} (ia32)"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf-ia32
+ vmove usr/share/qemu/firmware/*edk2-ovmf-ia32*.json
+ }
+}
+
+if [ ${_ovmf_build_x64} ]; then
+ ovmf-x64_package() {
+ short_desc="${_ovmf_basedesc} (x64)"
+ pkg_install() {
+ vmove usr/share/edk2/ovmf
+ vmove usr/share/OVMF
+ vmove usr/share/qemu/firmware/*edk2-ovmf-x64*.json
+ }
+ }
+fi
diff --git a/srcpkgs/edk2/update b/srcpkgs/edk2/update
new file mode 100644
index 000000000000..551f406857f5
--- /dev/null
+++ b/srcpkgs/edk2/update
@@ -0,0 +1,2 @@
+site="https://github.com/tianocore/edk2/tags"
+version="stable${version}"
diff --git a/srcpkgs/ovmf-ia32 b/srcpkgs/ovmf-ia32
new file mode 120000
index 000000000000..06c0198cb809
--- /dev/null
+++ b/srcpkgs/ovmf-ia32
@@ -0,0 +1 @@
+edk2
\ No newline at end of file
diff --git a/srcpkgs/ovmf-x64 b/srcpkgs/ovmf-x64
new file mode 120000
index 000000000000..06c0198cb809
--- /dev/null
+++ b/srcpkgs/ovmf-x64
@@ -0,0 +1 @@
+edk2
\ No newline at end of file
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (7 preceding siblings ...)
2021-03-26 22:46 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-03-27 13:09 ` Logarithmus
2021-03-29 4:38 ` Xlaits
` (27 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Logarithmus @ 2021-03-27 13:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-808730645
Comment:
CI passed, tested on x86_64-musl, works fine. Ready for review & merge I think.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (8 preceding siblings ...)
2021-03-27 13:09 ` Logarithmus
@ 2021-03-29 4:38 ` Xlaits
2021-03-29 6:25 ` Logarithmus
` (26 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Xlaits @ 2021-03-29 4:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New comment by Xlaits on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-809059492
Comment:
Still having the same issue.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (9 preceding siblings ...)
2021-03-29 4:38 ` Xlaits
@ 2021-03-29 6:25 ` Logarithmus
2021-03-29 6:25 ` Logarithmus
` (25 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Logarithmus @ 2021-03-29 6:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-809105132
Comment:
> Still having the same issue.
Maybe the issue is your date? Check if it's correct. The package have built successfully both on my laptop and CI/CD.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (10 preceding siblings ...)
2021-03-29 6:25 ` Logarithmus
@ 2021-03-29 6:25 ` Logarithmus
2021-03-29 12:50 ` Xlaits
` (24 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Logarithmus @ 2021-03-29 6:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-809105132
Comment:
> Still having the same issue.
Maybe the issue is your date? Check if it's correct. The package have built successfully both on my laptop and CI/CD. Can someone else test it?
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (11 preceding siblings ...)
2021-03-29 6:25 ` Logarithmus
@ 2021-03-29 12:50 ` Xlaits
2021-04-10 1:44 ` noarchwastaken
` (23 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Xlaits @ 2021-03-29 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 698 bytes --]
New comment by Xlaits on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-809350913
Comment:
Date and time are correct.
On Mon, Mar 29, 2021, 2:25 AM Artur Sinila ***@***.***> wrote:
> Still having the same issue.
>
> Maybe the issue is your date? Check if it's correct. The package have
> built successfully both on my laptop and CI/CD.
>
> —
> You are receiving this because you commented.
> Reply to this email directly, view it on GitHub
> <https://github.com/void-linux/void-packages/pull/29074#issuecomment-809105132>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AHX2YDM64PVNQOCBQ5XEPA3TGAMNPANCNFSM4YI3T56Q>
> .
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (12 preceding siblings ...)
2021-03-29 12:50 ` Xlaits
@ 2021-04-10 1:44 ` noarchwastaken
2021-04-10 1:57 ` noarchwastaken
` (22 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: noarchwastaken @ 2021-04-10 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New comment by noarchwastaken on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-817051012
Comment:
The packages built with no problems for me on x86_64-glibc.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (13 preceding siblings ...)
2021-04-10 1:44 ` noarchwastaken
@ 2021-04-10 1:57 ` noarchwastaken
2021-05-10 7:27 ` eoli3n
` (21 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: noarchwastaken @ 2021-04-10 1:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 355 bytes --]
New comment by noarchwastaken on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-817052670
Comment:
I noticed that the VM starts up to a black screen if I have OpenGL enabled for Spice... the VM only starts to display when the OS has booted to a certain point. I'm not sure if it's an upstream issue though.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (14 preceding siblings ...)
2021-04-10 1:57 ` noarchwastaken
@ 2021-05-10 7:27 ` eoli3n
2021-05-18 19:26 ` eoli3n
` (20 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: eoli3n @ 2021-05-10 7:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 142 bytes --]
New comment by eoli3n on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-836293378
Comment:
up
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (15 preceding siblings ...)
2021-05-10 7:27 ` eoli3n
@ 2021-05-18 19:26 ` eoli3n
2021-05-31 21:12 ` NeonOverflow
` (19 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: eoli3n @ 2021-05-18 19:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by eoli3n on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-843472504
Comment:
> The packages built with no problems for me on x86_64-glibc.
Same here, i will test later.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (16 preceding siblings ...)
2021-05-18 19:26 ` eoli3n
@ 2021-05-31 21:12 ` NeonOverflow
2021-05-31 22:21 ` eoli3n
` (18 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: NeonOverflow @ 2021-05-31 21:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New comment by NeonOverflow on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-851683785
Comment:
Please merge this!
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (17 preceding siblings ...)
2021-05-31 21:12 ` NeonOverflow
@ 2021-05-31 22:21 ` eoli3n
2021-06-03 0:37 ` NeonOverflow
` (17 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: eoli3n @ 2021-05-31 22:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New comment by eoli3n on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-851702557
Comment:
ping @ericonr
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (18 preceding siblings ...)
2021-05-31 22:21 ` eoli3n
@ 2021-06-03 0:37 ` NeonOverflow
2021-06-03 0:50 ` ericonr
` (16 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: NeonOverflow @ 2021-06-03 0:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New comment by NeonOverflow on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-853472311
Comment:
@ericonr
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (19 preceding siblings ...)
2021-06-03 0:37 ` NeonOverflow
@ 2021-06-03 0:50 ` ericonr
2021-06-03 1:29 ` ahesford
` (15 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: ericonr @ 2021-06-03 0:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 257 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-853476847
Comment:
I only made a lint comment, and haven't claimed this PR. It's a big package that I'm not in a position to review rn.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (20 preceding siblings ...)
2021-06-03 0:50 ` ericonr
@ 2021-06-03 1:29 ` ahesford
2021-06-03 2:16 ` ericonr
` (14 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: ahesford @ 2021-06-03 1:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-853491614
Comment:
I really don't see this being merged without massive upstream work. The template is a jumble of manual steps and questionable vendoring (brotli? openssl???). I suspect the only truly valuable part of this package is the half-dozen firmware blobs and associated JSON descriptors, all of which I just manually unpack from an Arch Linux package and be on my way.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (21 preceding siblings ...)
2021-06-03 1:29 ` ahesford
@ 2021-06-03 2:16 ` ericonr
2021-06-04 0:28 ` NeonOverflow
` (13 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: ericonr @ 2021-06-03 2:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-853507830
Comment:
I don't want to involve myself, but from https://github.com/tianocore/edk2/blob/master/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt it would seem at least openssl is used to provide crypto stuff and it would have to be compiled specially for that, which is why they pull it in.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (22 preceding siblings ...)
2021-06-03 2:16 ` ericonr
@ 2021-06-04 0:28 ` NeonOverflow
2021-06-04 0:37 ` ahesford
` (12 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: NeonOverflow @ 2021-06-04 0:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New comment by NeonOverflow on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-854270171
Comment:
@ahesford The firmware files are primarily used by GPU passthrough users.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (23 preceding siblings ...)
2021-06-04 0:28 ` NeonOverflow
@ 2021-06-04 0:37 ` ahesford
2021-06-04 1:03 ` NeonOverflow
` (11 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: ahesford @ 2021-06-04 0:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 666 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-854273049
Comment:
I understand the utility of the firmware files; I use them in all of my VMs. My point is that the template requires a lot of manual effort because the EDK build system isn't sane, and these steps are likely to break from one release to the next. Void is a small team and fragile templates that require a lot of manual work become disproportionate time sinks.
In the meantime, the firmware blobs can be manually extracted from packages of other distributions and used in Qemu/KVM installations in Void with minimal effort.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (24 preceding siblings ...)
2021-06-04 0:37 ` ahesford
@ 2021-06-04 1:03 ` NeonOverflow
2021-06-04 6:17 ` eoli3n
` (10 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: NeonOverflow @ 2021-06-04 1:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New comment by NeonOverflow on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-854281895
Comment:
Understandable. I'll probably just do as you said in the meantime.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (25 preceding siblings ...)
2021-06-04 1:03 ` NeonOverflow
@ 2021-06-04 6:17 ` eoli3n
2021-06-04 6:17 ` eoli3n
` (9 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: eoli3n @ 2021-06-04 6:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 714 bytes --]
New comment by eoli3n on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-854393063
Comment:
> I understand the utility of the firmware files; I use them in all of my VMs. My point is that the template requires a lot of manual effort because the EDK build system isn't sane, and these steps are likely to break from one release to the next. Void is a small team and fragile templates that require a lot of manual work become disproportionate time sinks.
>
> In the meantime, the firmware blobs can be manually extracted from packages of other distributions and used in Qemu/KVM installations in Void with minimal effort.
So why not pulling this in the package ?
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (26 preceding siblings ...)
2021-06-04 6:17 ` eoli3n
@ 2021-06-04 6:17 ` eoli3n
2021-07-26 17:56 ` Matthew-Tate-Scarbrough
` (8 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: eoli3n @ 2021-06-04 6:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 348 bytes --]
New comment by eoli3n on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-854393063
Comment:
> In the meantime, the firmware blobs can be manually extracted from packages of other distributions and used in Qemu/KVM installations in Void with minimal effort.
So why not pulling this in the package ?
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (27 preceding siblings ...)
2021-06-04 6:17 ` eoli3n
@ 2021-07-26 17:56 ` Matthew-Tate-Scarbrough
2021-08-26 19:52 ` RononDex
` (7 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Matthew-Tate-Scarbrough @ 2021-07-26 17:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
New comment by Matthew-Tate-Scarbrough on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-886908099
Comment:
> In the meantime, the firmware blobs can be manually extracted from packages of other distributions and used in Qemu/KVM installations in Void with minimal effort.
Would it be a advantageous/within scope of void-packages to just write a script that just steals them from Arch or another popular distro's repos?
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (28 preceding siblings ...)
2021-07-26 17:56 ` Matthew-Tate-Scarbrough
@ 2021-08-26 19:52 ` RononDex
2022-01-10 15:14 ` wael444
` (6 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: RononDex @ 2021-08-26 19:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
New comment by RononDex on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-906698215
Comment:
Is there any update on the state of the PR? Trying to setup UEFI with qemu
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (29 preceding siblings ...)
2021-08-26 19:52 ` RononDex
@ 2022-01-10 15:14 ` wael444
2022-01-10 20:19 ` HadetTheUndying
` (5 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: wael444 @ 2022-01-10 15:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New comment by wael444 on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-1008972125
Comment:
uh? when?
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (30 preceding siblings ...)
2022-01-10 15:14 ` wael444
@ 2022-01-10 20:19 ` HadetTheUndying
2022-01-11 12:50 ` wael444
` (4 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: HadetTheUndying @ 2022-01-10 20:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1132 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-1009308697
Comment:
> uh? when?
The `qemu` package includes the following:
````
qemu-6.1.0_3 /usr/share/qemu/edk2-aarch64-code.fd
qemu-6.1.0_3 /usr/share/qemu/edk2-arm-code.fd
qemu-6.1.0_3 /usr/share/qemu/edk2-arm-vars.fd
qemu-6.1.0_3 /usr/share/qemu/edk2-i386-code.fd
qemu-6.1.0_3 /usr/share/qemu/edk2-i386-secure-code.fd
qemu-6.1.0_3 /usr/share/qemu/edk2-i386-vars.fd
qemu-6.1.0_3 /usr/share/qemu/edk2-licenses.txt
qemu-6.1.0_3 /usr/share/qemu/edk2-x86_64-code.fd
qemu-6.1.0_3 /usr/share/qemu/edk2-x86_64-secure-code.fd
qemu-6.1.0_3 /usr/share/qemu/firmware/50-edk2-i386-secure.json
qemu-6.1.0_3 /usr/share/qemu/firmware/50-edk2-x86_64-secure.json
qemu-6.1.0_3 /usr/share/qemu/firmware/60-edk2-aarch64.json
qemu-6.1.0_3 /usr/share/qemu/firmware/60-edk2-arm.json
qemu-6.1.0_3 /usr/share/qemu/firmware/60-edk2-i386.json
qemu-6.1.0_3 /usr/share/qemu/firmware/60-edk2-x86_64.json
```
I have tested the x86_64 firmware with GPU passthrough to a Windows VM and can confirm it works.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (31 preceding siblings ...)
2022-01-10 20:19 ` HadetTheUndying
@ 2022-01-11 12:50 ` wael444
2022-01-11 13:15 ` ahesford
` (3 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: wael444 @ 2022-01-11 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
New comment by wael444 on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-1009933676
Comment:
> The `qemu` package includes the following:
>
> ```
>...
> qemu-6.1.0_3 /usr/share/qemu/edk2-x86_64-code.fd
> qemu-6.1.0_3 /usr/share/qemu/edk2-x86_64-secure-code.fd
> qemu-6.1.0_3 /usr/share/qemu/firmware/60-edk2-x86_64.json
>...
> ```
>
> I have tested the x86_64 firmware with GPU passthrough to a Windows VM and can confirm it works.
the fact that it was in `qemu` this whole time and i never noticed... thanks for telling me this!
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (32 preceding siblings ...)
2022-01-11 12:50 ` wael444
@ 2022-01-11 13:15 ` ahesford
2022-01-11 13:15 ` [PR PATCH] [Closed]: " ahesford
` (2 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: ahesford @ 2022-01-11 13:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-1009953635
Comment:
Because it seems that qemu already ships viable EFI image and EDK2 is such a nightmare to build, let's close this and revisit if there is a compelling need and we can construct a more maintainable template.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PR PATCH] [Closed]: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (33 preceding siblings ...)
2022-01-11 13:15 ` ahesford
@ 2022-01-11 13:15 ` ahesford
2022-02-03 9:57 ` eoli3n
2023-06-14 9:44 ` junkminerman
36 siblings, 0 replies; 38+ messages in thread
From: ahesford @ 2022-01-11 13:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
There's a closed pull request on the void-packages repository
New packages: {edk2,ovmf-*}-202102
https://github.com/void-linux/void-packages/pull/29074
Description:
Continues https://github.com/void-linux/void-packages/pull/17225
Closes https://github.com/void-linux/void-packages/issues/11243, https://github.com/void-linux/void-packages/issues/27229
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
#### Does it build and run successfully?
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] x86_64
- [x] x86_64-musl
- [ ] i686
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (34 preceding siblings ...)
2022-01-11 13:15 ` [PR PATCH] [Closed]: " ahesford
@ 2022-02-03 9:57 ` eoli3n
2023-06-14 9:44 ` junkminerman
36 siblings, 0 replies; 38+ messages in thread
From: eoli3n @ 2022-02-03 9:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New comment by eoli3n on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-1028806811
Comment:
I can't find a way to run that firmware with vagrant-libvirt : https://github.com/vagrant-libvirt/vagrant-libvirt/issues/1443
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: New packages: {edk2,ovmf-*}-202102
2021-02-26 17:59 [PR PATCH] New packages: {edk2,ovmf-*}-202011 Logarithmus
` (35 preceding siblings ...)
2022-02-03 9:57 ` eoli3n
@ 2023-06-14 9:44 ` junkminerman
36 siblings, 0 replies; 38+ messages in thread
From: junkminerman @ 2023-06-14 9:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New comment by junkminerman on void-packages repository
https://github.com/void-linux/void-packages/pull/29074#issuecomment-1590859727
Comment:
Has anyone gotten the EFI images shipped with qemu to work for enabling secure boot and creating a Windows 11 VM?
^ permalink raw reply [flat|nested] 38+ messages in thread