[arch-commits] Commit in edk2/repos/extra-any (18 files)
David Runge
dvzrv at archlinux.org
Mon May 31 17:15:23 UTC 2021
Date: Monday, May 31, 2021 @ 17:15:23
Author: dvzrv
Revision: 416881
archrelease: copy trunk to extra-any
Added:
edk2/repos/extra-any/50-edk2-ovmf-i386-secure.json
(from rev 416880, edk2/trunk/50-edk2-ovmf-i386-secure.json)
edk2/repos/extra-any/50-edk2-ovmf-x86_64-secure.json
(from rev 416880, edk2/trunk/50-edk2-ovmf-x86_64-secure.json)
edk2/repos/extra-any/60-edk2-ovmf-i386.json
(from rev 416880, edk2/trunk/60-edk2-ovmf-i386.json)
edk2/repos/extra-any/60-edk2-ovmf-x86_64.json
(from rev 416880, edk2/trunk/60-edk2-ovmf-x86_64.json)
edk2/repos/extra-any/70-edk2-armvirt-aarch64.json
(from rev 416880, edk2/trunk/70-edk2-armvirt-aarch64.json)
edk2/repos/extra-any/PKGBUILD
(from rev 416880, edk2/trunk/PKGBUILD)
edk2/repos/extra-any/edk2-202102-brotli-1.0.9.patch
(from rev 416880, edk2/trunk/edk2-202102-brotli-1.0.9.patch)
edk2/repos/extra-any/edk2-ovmf.install
(from rev 416880, edk2/trunk/edk2-ovmf.install)
edk2/repos/extra-any/edk2-shell.install
(from rev 416880, edk2/trunk/edk2-shell.install)
Deleted:
edk2/repos/extra-any/50-edk2-ovmf-i386-secure.json
edk2/repos/extra-any/50-edk2-ovmf-x86_64-secure.json
edk2/repos/extra-any/60-edk2-ovmf-i386.json
edk2/repos/extra-any/60-edk2-ovmf-x86_64.json
edk2/repos/extra-any/70-edk2-armvirt-aarch64.json
edk2/repos/extra-any/PKGBUILD
edk2/repos/extra-any/edk2-202102-brotli-1.0.9.patch
edk2/repos/extra-any/edk2-ovmf.install
edk2/repos/extra-any/edk2-shell.install
---------------------------------+
50-edk2-ovmf-i386-secure.json | 68 ++--
50-edk2-ovmf-x86_64-secure.json | 70 ++---
60-edk2-ovmf-i386.json | 66 ++--
60-edk2-ovmf-x86_64.json | 68 ++--
70-edk2-armvirt-aarch64.json | 62 ++--
PKGBUILD | 530 +++++++++++++++++++-------------------
edk2-202102-brotli-1.0.9.patch | 58 ++--
edk2-ovmf.install | 12
edk2-shell.install | 2
9 files changed, 468 insertions(+), 468 deletions(-)
Deleted: 50-edk2-ovmf-i386-secure.json
===================================================================
--- 50-edk2-ovmf-i386-secure.json 2021-05-31 17:15:03 UTC (rev 416880)
+++ 50-edk2-ovmf-i386-secure.json 2021-05-31 17:15:23 UTC (rev 416881)
@@ -1,34 +0,0 @@
-{
- "description": "UEFI firmware for i386, with Secure Boot and SMM",
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/50-edk2-ovmf-i386-secure.json (from rev 416880, edk2/trunk/50-edk2-ovmf-i386-secure.json)
===================================================================
--- 50-edk2-ovmf-i386-secure.json (rev 0)
+++ 50-edk2-ovmf-i386-secure.json 2021-05-31 17:15:23 UTC (rev 416881)
@@ -0,0 +1,34 @@
+{
+ "description": "UEFI firmware for i386, with Secure Boot and SMM",
+ "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": [
+
+ ]
+}
Deleted: 50-edk2-ovmf-x86_64-secure.json
===================================================================
--- 50-edk2-ovmf-x86_64-secure.json 2021-05-31 17:15:03 UTC (rev 416880)
+++ 50-edk2-ovmf-x86_64-secure.json 2021-05-31 17:15:23 UTC (rev 416881)
@@ -1,35 +0,0 @@
-{
- "description": "UEFI firmware for x86_64, with Secure Boot and SMM",
- "interface-types": [
- "uefi"
- ],
- "mapping": {
- "device": "flash",
- "executable": {
- "filename": "/usr/share/edk2-ovmf/x64/OVMF_CODE.secboot.fd",
- "format": "raw"
- },
- "nvram-template": {
- "filename": "/usr/share/edk2-ovmf/x64/OVMF_VARS.fd",
- "format": "raw"
- }
- },
- "targets": [
- {
- "architecture": "x86_64",
- "machines": [
- "pc-q35-*"
- ]
- }
- ],
- "features": [
- "acpi-s3",
- "amd-sev",
- "requires-smm",
- "secure-boot",
- "verbose-dynamic"
- ],
- "tags": [
-
- ]
-}
Copied: edk2/repos/extra-any/50-edk2-ovmf-x86_64-secure.json (from rev 416880, edk2/trunk/50-edk2-ovmf-x86_64-secure.json)
===================================================================
--- 50-edk2-ovmf-x86_64-secure.json (rev 0)
+++ 50-edk2-ovmf-x86_64-secure.json 2021-05-31 17:15:23 UTC (rev 416881)
@@ -0,0 +1,35 @@
+{
+ "description": "UEFI firmware for x86_64, with Secure Boot and SMM",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2-ovmf/x64/OVMF_CODE.secboot.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2-ovmf/x64/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "requires-smm",
+ "secure-boot",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
Deleted: 60-edk2-ovmf-i386.json
===================================================================
--- 60-edk2-ovmf-i386.json 2021-05-31 17:15:03 UTC (rev 416880)
+++ 60-edk2-ovmf-i386.json 2021-05-31 17:15:23 UTC (rev 416881)
@@ -1,33 +0,0 @@
-{
- "description": "UEFI firmware for i386",
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/60-edk2-ovmf-i386.json (from rev 416880, edk2/trunk/60-edk2-ovmf-i386.json)
===================================================================
--- 60-edk2-ovmf-i386.json (rev 0)
+++ 60-edk2-ovmf-i386.json 2021-05-31 17:15:23 UTC (rev 416881)
@@ -0,0 +1,33 @@
+{
+ "description": "UEFI firmware for i386",
+ "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": [
+
+ ]
+}
Deleted: 60-edk2-ovmf-x86_64.json
===================================================================
--- 60-edk2-ovmf-x86_64.json 2021-05-31 17:15:03 UTC (rev 416880)
+++ 60-edk2-ovmf-x86_64.json 2021-05-31 17:15:23 UTC (rev 416881)
@@ -1,34 +0,0 @@
-{
- "description": "UEFI firmware for x86_64",
- "interface-types": [
- "uefi"
- ],
- "mapping": {
- "device": "flash",
- "executable": {
- "filename": "/usr/share/edk2-ovmf/x64/OVMF_CODE.fd",
- "format": "raw"
- },
- "nvram-template": {
- "filename": "/usr/share/edk2-ovmf/x64/OVMF_VARS.fd",
- "format": "raw"
- }
- },
- "targets": [
- {
- "architecture": "x86_64",
- "machines": [
- "pc-i440fx-*",
- "pc-q35-*"
- ]
- }
- ],
- "features": [
- "acpi-s3",
- "amd-sev",
- "verbose-dynamic"
- ],
- "tags": [
-
- ]
-}
Copied: edk2/repos/extra-any/60-edk2-ovmf-x86_64.json (from rev 416880, edk2/trunk/60-edk2-ovmf-x86_64.json)
===================================================================
--- 60-edk2-ovmf-x86_64.json (rev 0)
+++ 60-edk2-ovmf-x86_64.json 2021-05-31 17:15:23 UTC (rev 416881)
@@ -0,0 +1,34 @@
+{
+ "description": "UEFI firmware for x86_64",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2-ovmf/x64/OVMF_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2-ovmf/x64/OVMF_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-i440fx-*",
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "acpi-s3",
+ "amd-sev",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
Deleted: 70-edk2-armvirt-aarch64.json
===================================================================
--- 70-edk2-armvirt-aarch64.json 2021-05-31 17:15:03 UTC (rev 416880)
+++ 70-edk2-armvirt-aarch64.json 2021-05-31 17:15:23 UTC (rev 416881)
@@ -1,31 +0,0 @@
-{
- "description": "UEFI firmware for aarch64",
- "interface-types": [
- "uefi"
- ],
- "mapping": {
- "device": "flash",
- "executable": {
- "filename": "/usr/share/edk2-armvirt/aarch64/QEMU_CODE.fd",
- "format": "raw"
- },
- "nvram-template": {
- "filename": "/usr/share/edk2-armvirt/aarch64/QEMU_VARS.fd",
- "format": "raw"
- }
- },
- "targets": [
- {
- "architecture": "aarch64",
- "machines": [
- "virt-*"
- ]
- }
- ],
- "features": [
- "verbose-static"
- ],
- "tags": [
-
- ]
-}
Copied: edk2/repos/extra-any/70-edk2-armvirt-aarch64.json (from rev 416880, edk2/trunk/70-edk2-armvirt-aarch64.json)
===================================================================
--- 70-edk2-armvirt-aarch64.json (rev 0)
+++ 70-edk2-armvirt-aarch64.json 2021-05-31 17:15:23 UTC (rev 416881)
@@ -0,0 +1,31 @@
+{
+ "description": "UEFI firmware for aarch64",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "executable": {
+ "filename": "/usr/share/edk2-armvirt/aarch64/QEMU_CODE.fd",
+ "format": "raw"
+ },
+ "nvram-template": {
+ "filename": "/usr/share/edk2-armvirt/aarch64/QEMU_VARS.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "aarch64",
+ "machines": [
+ "virt-*"
+ ]
+ }
+ ],
+ "features": [
+ "verbose-static"
+ ],
+ "tags": [
+
+ ]
+}
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-31 17:15:03 UTC (rev 416880)
+++ PKGBUILD 2021-05-31 17:15:23 UTC (rev 416881)
@@ -1,265 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-_brotli_ver=1.0.9
-_openssl_ver=1.1.1j
-pkgbase=edk2
-pkgname=('edk2-armvirt' 'edk2-shell' 'edk2-ovmf')
-pkgver=202102
-pkgrel=1
-pkgdesc="Modern, feature-rich firmware development environment for the UEFI specifications"
-arch=('any')
-url="https://github.com/tianocore/edk2"
-license=('BSD')
-makedepends=('aarch64-linux-gnu-gcc' 'acpica' 'git' 'iasl' 'util-linux-libs' 'nasm' 'python')
-options=(!makeflags)
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/tianocore/${pkgbase}/archive/${pkgbase}-stable${pkgver}.tar.gz"
- "https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz"{,.asc}
- "brotli-${_brotli_ver}.tar.gz::https://github.com/google/brotli/archive/v${_brotli_ver}.tar.gz"
- "${pkgbase}-202102-brotli-1.0.9.patch"
- "50-edk2-ovmf-i386-secure.json"
- "50-edk2-ovmf-x86_64-secure.json"
- "60-edk2-ovmf-i386.json"
- "60-edk2-ovmf-x86_64.json"
- "70-edk2-armvirt-aarch64.json")
-sha512sums=('d3dab4559b5d24b03d1066039beac787f6c8d3c4fbc14294c4836bcdf6eaa9d1f9654b65e24eeb0709348b63a9b13ebbfcfa11609ff710374838d91b51b9f414'
- '51e44995663b5258b0018bdc1e2b0e7e8e0cce111138ca1f80514456af920fce4e409a411ce117c0f3eb9190ac3e47c53a43f39b06acd35b7494e2bec4a607d5'
- 'SKIP'
- 'b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5'
- 'fe0fd592d4b436a35a49a74ad5dd989311b297b9abacb13ed8d4da0986169c91ffbc34cef0f2d52bf40c833d252f6e65311ab0e4e4ca6798390febfb9a787a4a'
- '55e4187b11b27737f61e528c02ff43b9381c0cb09140e803531616766f9cb9401115d88d946b56171784cc028f9571279640eb39b6a9fa8e02ec0c8d1b036a3e'
- 'a1236585b30d720540de2e9527d8c90ff2d428e800b3da545b23461dc698dc91fe441b62bb8cbca76e08f4ec1eb485619e9ab26157deb06e7fb33e7f5f9dd8b6'
- 'c81e072aabfb01d29cf5194111524e2c4c8684979de6b6793db10299c95bb94f7b1d0a98b057df0664d7a894a2b40e9b4c3576112fae400a95eaf5fe5fc9369b'
- '2030dc1d49d56fce8af56c5777fd40f04041e39ff806dd8c021e161227bdd646982024db6758230b8332dc68f16bc6918e1d54ad3c022e21e148d6b65ea778b3'
- 'fa6d36a3c0225e4a5df532e77b18a035d65b0856d6a48875def5007de3f83d8d1d202d5b91e887d424112a3fa377dc9a09bdf44e5fcdccc36854675f95a211a4')
-b2sums=('48a0804ad92cce9d5783dc9ea1e8815414f77fb49d7f51401f314215d203a4be2b70e446267200366e2d0c41df92aa07d399207be3c0dbf565bece1b7eb452dd'
- 'e5699abeca83acd82546e74a0645f2a765d51f22226f8c537d92285eb0b11e12b0a9476cbd3cb6a594e9840433d713be39884fb4dcd5c3968b36ad4f582ed23a'
- 'SKIP'
- '8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904'
- 'eb549f711aa31b0a46f3e9b74076e52e0e1734045c227f410016c6de46a3b7b2959287d49b5ef853236c57fa3b3143b1da31fd9ef6fd592ba22ba9af15941a76'
- '96502e0c8b748d6db0fcd4e767264f778319b4517fe4bf2e6e4f92e35bf09f388fb7f39c349e66444368820c31a6ff76e952053ac9f9696a59f7f0a929a650d1'
- '4a438a2f7726c6a9ff1a40506ddb5f724d5c220b57997784fefe4a180e249b4f1e9adc8e353e7dbc492a1bde0165442d873409656ce2fbbc9fd35c690b7692e4'
- '5da17cfe08368542f04b47121b296c56a6702233207b1cdb822eea42c8fb43d8856e86d19122621caf97e4332814c839204d7ce191041128ee3921b23f137bb6'
- '1b935f3ad0bd3f10a90430a2873bf592950e9c49c828b50bb1ae48634cee01cc571aeff1c5b4695e0b4faa6274afc0a92fdcc88e283029298bba5e11b2bd2904'
- '2fd510c533913bbd13fa31b3fdc8c4435bb3dee4ae8d34a516344da7a31ee036b23ac21e09b59b11f507520abeea89271601228f485ee80866bade0140c81742')
-validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') # Matt Caswell <matt at openssl.org>
-_arch_list=('AARCH64' 'IA32' 'X64')
-_build_type='RELEASE'
-_build_plugin='GCC5'
-
-prepare() {
- mv -v "$pkgbase-$pkgbase-stable$pkgver" "$pkgbase-$pkgver"
- cd "$pkgbase-$pkgver"
- # patch to be able to use brotli 1.0.9
- patch -Np1 -i "../${pkgbase}-202102-brotli-1.0.9.patch"
- # NOTE: patching brotli itself is not necessary (extra/brotli cherry-picks a patch for the pkgconfig integration)
-
- # symlinking openssl into place
- rm -rfv CryptoPkg/Library/OpensslLib/openssl
- ln -sfv "${srcdir}/openssl-$_openssl_ver" CryptoPkg/Library/OpensslLib/openssl
-
- # symlinking brotli into place
- rm -rfv BaseTools/Source/C/BrotliCompress/brotli MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
- ln -sfv "${srcdir}/brotli-${_brotli_ver}" BaseTools/Source/C/BrotliCompress/brotli
- ln -sfv "${srcdir}/brotli-${_brotli_ver}" MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
-
- # -Werror, not even once
- sed -e 's/ -Werror//g' \
- -i BaseTools/Conf/*.template BaseTools/Source/C/Makefiles/*.makefile
-}
-
-build() {
- cd "$pkgbase-$pkgver"
- export GCC5_IA32_PREFIX="x86_64-linux-gnu-"
- export GCC5_X64_PREFIX="x86_64-linux-gnu-"
- export GCC5_AARCH64_PREFIX="aarch64-linux-gnu-"
- local _arch
- echo "Building base tools (AARCH64)"
- ARCH=AARCH64 make -C BaseTools
- echo "Building base tools"
- make -C BaseTools
- . edksetup.sh
- for _arch in ${_arch_list[@]}; do
- # shell
- echo "Building shell (${_arch})."
- BaseTools/BinWrappers/PosixLike/build -p ShellPkg/ShellPkg.dsc \
- -a "${_arch}" \
- -b "${_build_type}" \
- -n "$(nproc)" \
- -t "${_build_plugin}"
- # ovmf
- if [[ "${_arch}" == 'IA32' ]]; then
- echo "Building ovmf (${_arch}) with secure boot"
- OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \
- -a "${_arch}" \
- -b "${_build_type}" \
- -n "$(nproc)" \
- -t "${_build_plugin}" \
- -D LOAD_X64_ON_IA32_ENABLE \
- -D NETWORK_IP6_ENABLE \
- -D TPM_ENABLE \
- -D HTTP_BOOT_ENABLE \
- -D TLS_ENABLE \
- -D FD_SIZE_2MB \
- -D SECURE_BOOT_ENABLE \
- -D SMM_REQUIRE \
- -D EXCLUDE_SHELL_FROM_FD
- mv -v Build/Ovmf{Ia32,IA32-secure}
- echo "Building ovmf (${_arch}) without secure boot"
- OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \
- -a "${_arch}" \
- -b "${_build_type}" \
- -n "$(nproc)" \
- -t "${_build_plugin}" \
- -D LOAD_X64_ON_IA32_ENABLE \
- -D NETWORK_IP6_ENABLE \
- -D TPM_ENABLE \
- -D HTTP_BOOT_ENABLE \
- -D TLS_ENABLE \
- -D FD_SIZE_2MB
- mv -v Build/Ovmf{Ia32,IA32}
- fi
- if [[ "${_arch}" == 'X64' ]]; then
- echo "Building ovmf (${_arch}) with secure boot"
- OvmfPkg/build.sh -p "OvmfPkg/OvmfPkg${_arch}.dsc" \
- -a "${_arch}" \
- -b "${_build_type}" \
- -n "$(nproc)" \
- -t "${_build_plugin}" \
- -D NETWORK_IP6_ENABLE \
- -D TPM_ENABLE \
- -D FD_SIZE_2MB \
- -D TLS_ENABLE \
- -D HTTP_BOOT_ENABLE \
- -D SECURE_BOOT_ENABLE \
- -D SMM_REQUIRE \
- -D EXCLUDE_SHELL_FROM_FD
- mv -v Build/OvmfX64{,-secure}
- echo "Building ovmf (${_arch}) without secure boot"
- OvmfPkg/build.sh -p "OvmfPkg/OvmfPkg${_arch}.dsc" \
- -a "${_arch}" \
- -b "${_build_type}" \
- -n "$(nproc)" \
- -t "${_build_plugin}" \
- -D NETWORK_IP6_ENABLE \
- -D TPM_ENABLE \
- -D FD_SIZE_2MB \
- -D TLS_ENABLE \
- -D HTTP_BOOT_ENABLE
- fi
- if [[ "${_arch}" == 'AARCH64' ]]; then
- echo "Building ovmf (${_arch}) with secure boot"
- BaseTools/BinWrappers/PosixLike/build -p "ArmVirtPkg/ArmVirtQemu.dsc" \
- -a "${_arch}" \
- -b "${_build_type}" \
- -n "$(nproc)" \
- -t "${_build_plugin}" \
- -D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE \
- -D NETWORK_TLS_ENABLE \
- -D SECURE_BOOT_ENABLE \
- -D TPM_ENABLE \
- -D TPM_CONFIG_ENABLE
- dd if="/dev/zero" \
- of="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_CODE.fd" \
- bs=1M count=64
- dd if="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_EFI.fd" \
- of="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_CODE.fd" \
- conv=notrunc
- dd if="/dev/zero" \
- of="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_VARS.fd" \
- bs=1M count=64
- fi
- done
-}
-
-package_edk2-armvirt() {
- pkgdesc="Firmware for Virtual Machines (aarch64)"
- local _arch=AARCH64
-
- cd "$pkgbase-$pkgver"
- install -vDm 644 "Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/"*.fd \
- -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}/"
- # add libvirt compatibility (which hardcodes the following paths)
- install -vdm 755 "${pkgdir}/usr/share/AAVMF"
- ln -svf "/usr/share/${pkgname}/${_arch,,}/QEMU_CODE.fd" \
- "${pkgdir}/usr/share/AAVMF/AAVMF_CODE.fd"
- ln -svf "/usr/share/${pkgname}/${_arch,,}/QEMU_VARS.fd" \
- "${pkgdir}/usr/share/AAVMF/AAVMF_VARS.fd"
- # install qemu descriptors in accordance with qemu:
- # https://git.qemu.org/?p=qemu.git;a=tree;f=pc-bios/descriptors
- install -vDm 644 ../*"${pkgname}"*.json -t "${pkgdir}/usr/share/qemu/firmware"
- # license
- install -vDm 644 License.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_edk2-shell() {
- pkgdesc="EDK2 UEFI Shell"
- provides=('uefi-shell')
-
- cd "$pkgbase-$pkgver"
- local _arch
- # minimal UEFI shell, as defined in ShellPkg/Application/Shell/ShellPkg.inf
- local _min='7C04A583-9E3E-4f1c-AD65-E05268D0B4D1'
- # full UEFI shell, as defined in ShellPkg/ShellPkg.dsc
- local _full='EA4BB293-2D7F-4456-A681-1F22F42CD0BC'
- for _arch in ${_arch_list[@]}; do
- if [[ "${_arch}" == 'AARCH64' ]]; then
- install -vDm 644 "Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/${_arch}/Shell.efi" \
- -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}/"
- else
- install -vDm 644 "Build/Shell/${_build_type}_${_build_plugin}/${_arch}/Shell_${_min}.efi" \
- "${pkgdir}/usr/share/${pkgname}/${_arch,,}/Shell.efi"
- install -vDm 644 "Build/Shell/${_build_type}_${_build_plugin}/${_arch}/Shell_${_full}.efi" \
- "${pkgdir}/usr/share/${pkgname}/${_arch,,}/Shell_Full.efi"
- fi
- done
- # license
- install -vDm 644 License.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
- # docs
- install -vDm 644 {ReadMe.rst,Maintainers.txt} \
- -t "${pkgdir}/usr/share/doc/${pkgname}"
-}
-
-package_edk2-ovmf() {
- pkgdesc="Firmware for Virtual Machines (x86_64, i686)"
- provides=('ovmf')
- conflicts=('ovmf')
- replaces=('ovmf')
- license+=('MIT')
- install="${pkgname}.install"
-
- cd "$pkgbase-$pkgver"
- local _arch
- # installing the various firmwares
- for _arch in ${_arch_list[@]}; do
- if [[ "${_arch}" == 'AARCH64' ]]; then
- continue
- else
- # installing OVMF.fd for xen: https://bugs.archlinux.org/task/58635
- install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF.fd" \
- -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
- install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
- -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
- install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF_VARS.fd" \
- -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
- install -vDm 644 "Build/Ovmf${_arch}-secure/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
- "${pkgdir}/usr/share/${pkgname}/${_arch,,}/OVMF_CODE.secboot.fd"
- fi
- done
- # installing qemu descriptors in accordance with qemu:
- # https://git.qemu.org/?p=qemu.git;a=tree;f=pc-bios/descriptors
- # https://bugs.archlinux.org/task/64206
- install -vDm 644 ../*"${pkgname}"*.json -t "${pkgdir}/usr/share/qemu/firmware"
- # adding symlink for previous ovmf location
- # https://bugs.archlinux.org/task/66528
- ln -svf "/usr/share/${pkgname}" "${pkgdir}/usr/share/ovmf"
- # adding a symlink for applications with questionable heuristics (such as lxd)
- ln -svf "/usr/share/${pkgname}" "${pkgdir}/usr/share/OVMF"
- # licenses
- install -vDm 644 License.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
- install -vDm 644 OvmfPkg/License.txt \
- "${pkgdir}/usr/share/licenses/${pkgname}/OvmfPkg.License.txt"
- # docs
- install -vDm 644 {OvmfPkg/README,ReadMe.rst,Maintainers.txt} \
- -t "${pkgdir}/usr/share/doc/${pkgname}"
-}
Copied: edk2/repos/extra-any/PKGBUILD (from rev 416880, edk2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-31 17:15:23 UTC (rev 416881)
@@ -0,0 +1,265 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+_brotli_ver=1.0.9
+_openssl_ver=1.1.1k
+pkgbase=edk2
+pkgname=('edk2-armvirt' 'edk2-shell' 'edk2-ovmf')
+pkgver=202105
+pkgrel=1
+pkgdesc="Modern, feature-rich firmware development environment for the UEFI specifications"
+arch=('any')
+url="https://github.com/tianocore/edk2"
+license=('BSD')
+makedepends=('aarch64-linux-gnu-gcc' 'acpica' 'git' 'iasl' 'util-linux-libs' 'nasm' 'python')
+options=(!makeflags)
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/tianocore/${pkgbase}/archive/${pkgbase}-stable${pkgver}.tar.gz"
+ "https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz"{,.asc}
+ "brotli-${_brotli_ver}.tar.gz::https://github.com/google/brotli/archive/v${_brotli_ver}.tar.gz"
+ "${pkgbase}-202102-brotli-1.0.9.patch"
+ "50-edk2-ovmf-i386-secure.json"
+ "50-edk2-ovmf-x86_64-secure.json"
+ "60-edk2-ovmf-i386.json"
+ "60-edk2-ovmf-x86_64.json"
+ "70-edk2-armvirt-aarch64.json")
+sha512sums=('c263345cbb243c63985f974a61f37c577a139d6a7099d2b8c9e1a553e5ebf16de12fb711b72624081c6bf637f8084bbf71731ab99e5747d81da460388ac25791'
+ '73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121'
+ 'SKIP'
+ 'b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5'
+ 'fe0fd592d4b436a35a49a74ad5dd989311b297b9abacb13ed8d4da0986169c91ffbc34cef0f2d52bf40c833d252f6e65311ab0e4e4ca6798390febfb9a787a4a'
+ '55e4187b11b27737f61e528c02ff43b9381c0cb09140e803531616766f9cb9401115d88d946b56171784cc028f9571279640eb39b6a9fa8e02ec0c8d1b036a3e'
+ 'a1236585b30d720540de2e9527d8c90ff2d428e800b3da545b23461dc698dc91fe441b62bb8cbca76e08f4ec1eb485619e9ab26157deb06e7fb33e7f5f9dd8b6'
+ 'c81e072aabfb01d29cf5194111524e2c4c8684979de6b6793db10299c95bb94f7b1d0a98b057df0664d7a894a2b40e9b4c3576112fae400a95eaf5fe5fc9369b'
+ '2030dc1d49d56fce8af56c5777fd40f04041e39ff806dd8c021e161227bdd646982024db6758230b8332dc68f16bc6918e1d54ad3c022e21e148d6b65ea778b3'
+ 'fa6d36a3c0225e4a5df532e77b18a035d65b0856d6a48875def5007de3f83d8d1d202d5b91e887d424112a3fa377dc9a09bdf44e5fcdccc36854675f95a211a4')
+b2sums=('3ec01d467562380ca2fd3bd807d2f6c55e4637c1afd71533f8f5b22cc634dc4c8cb63dab921677f8b315d17b3c9d0b6b00a0e2f3f8da61107033e9e81bf5a64d'
+ 'e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec'
+ 'SKIP'
+ '8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904'
+ 'eb549f711aa31b0a46f3e9b74076e52e0e1734045c227f410016c6de46a3b7b2959287d49b5ef853236c57fa3b3143b1da31fd9ef6fd592ba22ba9af15941a76'
+ '96502e0c8b748d6db0fcd4e767264f778319b4517fe4bf2e6e4f92e35bf09f388fb7f39c349e66444368820c31a6ff76e952053ac9f9696a59f7f0a929a650d1'
+ '4a438a2f7726c6a9ff1a40506ddb5f724d5c220b57997784fefe4a180e249b4f1e9adc8e353e7dbc492a1bde0165442d873409656ce2fbbc9fd35c690b7692e4'
+ '5da17cfe08368542f04b47121b296c56a6702233207b1cdb822eea42c8fb43d8856e86d19122621caf97e4332814c839204d7ce191041128ee3921b23f137bb6'
+ '1b935f3ad0bd3f10a90430a2873bf592950e9c49c828b50bb1ae48634cee01cc571aeff1c5b4695e0b4faa6274afc0a92fdcc88e283029298bba5e11b2bd2904'
+ '2fd510c533913bbd13fa31b3fdc8c4435bb3dee4ae8d34a516344da7a31ee036b23ac21e09b59b11f507520abeea89271601228f485ee80866bade0140c81742')
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') # Matt Caswell <matt at openssl.org>
+_arch_list=('AARCH64' 'IA32' 'X64')
+_build_type='RELEASE'
+_build_plugin='GCC5'
+
+prepare() {
+ mv -v "$pkgbase-$pkgbase-stable$pkgver" "$pkgbase-$pkgver"
+ cd "$pkgbase-$pkgver"
+ # patch to be able to use brotli 1.0.9
+ patch -Np1 -i "../${pkgbase}-202102-brotli-1.0.9.patch"
+ # NOTE: patching brotli itself is not necessary (extra/brotli cherry-picks a patch for the pkgconfig integration)
+
+ # symlinking openssl into place
+ rm -rfv CryptoPkg/Library/OpensslLib/openssl
+ ln -sfv "${srcdir}/openssl-$_openssl_ver" CryptoPkg/Library/OpensslLib/openssl
+
+ # symlinking brotli into place
+ rm -rfv BaseTools/Source/C/BrotliCompress/brotli MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+ ln -sfv "${srcdir}/brotli-${_brotli_ver}" BaseTools/Source/C/BrotliCompress/brotli
+ ln -sfv "${srcdir}/brotli-${_brotli_ver}" MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+
+ # -Werror, not even once
+ sed -e 's/ -Werror//g' \
+ -i BaseTools/Conf/*.template BaseTools/Source/C/Makefiles/*.makefile
+}
+
+build() {
+ cd "$pkgbase-$pkgver"
+ export GCC5_IA32_PREFIX="x86_64-linux-gnu-"
+ export GCC5_X64_PREFIX="x86_64-linux-gnu-"
+ export GCC5_AARCH64_PREFIX="aarch64-linux-gnu-"
+ local _arch
+ echo "Building base tools (AARCH64)"
+ ARCH=AARCH64 make -C BaseTools
+ echo "Building base tools"
+ make -C BaseTools
+ . edksetup.sh
+ for _arch in ${_arch_list[@]}; do
+ # shell
+ echo "Building shell (${_arch})."
+ BaseTools/BinWrappers/PosixLike/build -p ShellPkg/ShellPkg.dsc \
+ -a "${_arch}" \
+ -b "${_build_type}" \
+ -n "$(nproc)" \
+ -t "${_build_plugin}"
+ # ovmf
+ if [[ "${_arch}" == 'IA32' ]]; then
+ echo "Building ovmf (${_arch}) with secure boot"
+ OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \
+ -a "${_arch}" \
+ -b "${_build_type}" \
+ -n "$(nproc)" \
+ -t "${_build_plugin}" \
+ -D LOAD_X64_ON_IA32_ENABLE \
+ -D NETWORK_IP6_ENABLE \
+ -D TPM_ENABLE \
+ -D HTTP_BOOT_ENABLE \
+ -D TLS_ENABLE \
+ -D FD_SIZE_2MB \
+ -D SECURE_BOOT_ENABLE \
+ -D SMM_REQUIRE \
+ -D EXCLUDE_SHELL_FROM_FD
+ mv -v Build/Ovmf{Ia32,IA32-secure}
+ echo "Building ovmf (${_arch}) without secure boot"
+ OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \
+ -a "${_arch}" \
+ -b "${_build_type}" \
+ -n "$(nproc)" \
+ -t "${_build_plugin}" \
+ -D LOAD_X64_ON_IA32_ENABLE \
+ -D NETWORK_IP6_ENABLE \
+ -D TPM_ENABLE \
+ -D HTTP_BOOT_ENABLE \
+ -D TLS_ENABLE \
+ -D FD_SIZE_2MB
+ mv -v Build/Ovmf{Ia32,IA32}
+ fi
+ if [[ "${_arch}" == 'X64' ]]; then
+ echo "Building ovmf (${_arch}) with secure boot"
+ OvmfPkg/build.sh -p "OvmfPkg/OvmfPkg${_arch}.dsc" \
+ -a "${_arch}" \
+ -b "${_build_type}" \
+ -n "$(nproc)" \
+ -t "${_build_plugin}" \
+ -D NETWORK_IP6_ENABLE \
+ -D TPM_ENABLE \
+ -D FD_SIZE_2MB \
+ -D TLS_ENABLE \
+ -D HTTP_BOOT_ENABLE \
+ -D SECURE_BOOT_ENABLE \
+ -D SMM_REQUIRE \
+ -D EXCLUDE_SHELL_FROM_FD
+ mv -v Build/OvmfX64{,-secure}
+ echo "Building ovmf (${_arch}) without secure boot"
+ OvmfPkg/build.sh -p "OvmfPkg/OvmfPkg${_arch}.dsc" \
+ -a "${_arch}" \
+ -b "${_build_type}" \
+ -n "$(nproc)" \
+ -t "${_build_plugin}" \
+ -D NETWORK_IP6_ENABLE \
+ -D TPM_ENABLE \
+ -D FD_SIZE_2MB \
+ -D TLS_ENABLE \
+ -D HTTP_BOOT_ENABLE
+ fi
+ if [[ "${_arch}" == 'AARCH64' ]]; then
+ echo "Building ovmf (${_arch}) with secure boot"
+ BaseTools/BinWrappers/PosixLike/build -p "ArmVirtPkg/ArmVirtQemu.dsc" \
+ -a "${_arch}" \
+ -b "${_build_type}" \
+ -n "$(nproc)" \
+ -t "${_build_plugin}" \
+ -D NETWORK_IP6_ENABLE \
+ -D NETWORK_HTTP_BOOT_ENABLE \
+ -D NETWORK_TLS_ENABLE \
+ -D SECURE_BOOT_ENABLE \
+ -D TPM_ENABLE \
+ -D TPM_CONFIG_ENABLE
+ dd if="/dev/zero" \
+ of="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_CODE.fd" \
+ bs=1M count=64
+ dd if="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_EFI.fd" \
+ of="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_CODE.fd" \
+ conv=notrunc
+ dd if="/dev/zero" \
+ of="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_VARS.fd" \
+ bs=1M count=64
+ fi
+ done
+}
+
+package_edk2-armvirt() {
+ pkgdesc="Firmware for Virtual Machines (aarch64)"
+ local _arch=AARCH64
+
+ cd "$pkgbase-$pkgver"
+ install -vDm 644 "Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/"*.fd \
+ -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}/"
+ # add libvirt compatibility (which hardcodes the following paths)
+ install -vdm 755 "${pkgdir}/usr/share/AAVMF"
+ ln -svf "/usr/share/${pkgname}/${_arch,,}/QEMU_CODE.fd" \
+ "${pkgdir}/usr/share/AAVMF/AAVMF_CODE.fd"
+ ln -svf "/usr/share/${pkgname}/${_arch,,}/QEMU_VARS.fd" \
+ "${pkgdir}/usr/share/AAVMF/AAVMF_VARS.fd"
+ # install qemu descriptors in accordance with qemu:
+ # https://git.qemu.org/?p=qemu.git;a=tree;f=pc-bios/descriptors
+ install -vDm 644 ../*"${pkgname}"*.json -t "${pkgdir}/usr/share/qemu/firmware"
+ # license
+ install -vDm 644 License.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_edk2-shell() {
+ pkgdesc="EDK2 UEFI Shell"
+ provides=('uefi-shell')
+
+ cd "$pkgbase-$pkgver"
+ local _arch
+ # minimal UEFI shell, as defined in ShellPkg/Application/Shell/ShellPkg.inf
+ local _min='7C04A583-9E3E-4f1c-AD65-E05268D0B4D1'
+ # full UEFI shell, as defined in ShellPkg/ShellPkg.dsc
+ local _full='EA4BB293-2D7F-4456-A681-1F22F42CD0BC'
+ for _arch in ${_arch_list[@]}; do
+ if [[ "${_arch}" == 'AARCH64' ]]; then
+ install -vDm 644 "Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/${_arch}/Shell.efi" \
+ -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}/"
+ else
+ install -vDm 644 "Build/Shell/${_build_type}_${_build_plugin}/${_arch}/Shell_${_min}.efi" \
+ "${pkgdir}/usr/share/${pkgname}/${_arch,,}/Shell.efi"
+ install -vDm 644 "Build/Shell/${_build_type}_${_build_plugin}/${_arch}/Shell_${_full}.efi" \
+ "${pkgdir}/usr/share/${pkgname}/${_arch,,}/Shell_Full.efi"
+ fi
+ done
+ # license
+ install -vDm 644 License.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ # docs
+ install -vDm 644 {ReadMe.rst,Maintainers.txt} \
+ -t "${pkgdir}/usr/share/doc/${pkgname}"
+}
+
+package_edk2-ovmf() {
+ pkgdesc="Firmware for Virtual Machines (x86_64, i686)"
+ provides=('ovmf')
+ conflicts=('ovmf')
+ replaces=('ovmf')
+ license+=('MIT')
+ install="${pkgname}.install"
+
+ cd "$pkgbase-$pkgver"
+ local _arch
+ # installing the various firmwares
+ for _arch in ${_arch_list[@]}; do
+ if [[ "${_arch}" == 'AARCH64' ]]; then
+ continue
+ else
+ # installing OVMF.fd for xen: https://bugs.archlinux.org/task/58635
+ install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF.fd" \
+ -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
+ install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
+ -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
+ install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF_VARS.fd" \
+ -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
+ install -vDm 644 "Build/Ovmf${_arch}-secure/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
+ "${pkgdir}/usr/share/${pkgname}/${_arch,,}/OVMF_CODE.secboot.fd"
+ fi
+ done
+ # installing qemu descriptors in accordance with qemu:
+ # https://git.qemu.org/?p=qemu.git;a=tree;f=pc-bios/descriptors
+ # https://bugs.archlinux.org/task/64206
+ install -vDm 644 ../*"${pkgname}"*.json -t "${pkgdir}/usr/share/qemu/firmware"
+ # adding symlink for previous ovmf location
+ # https://bugs.archlinux.org/task/66528
+ ln -svf "/usr/share/${pkgname}" "${pkgdir}/usr/share/ovmf"
+ # adding a symlink for applications with questionable heuristics (such as lxd)
+ ln -svf "/usr/share/${pkgname}" "${pkgdir}/usr/share/OVMF"
+ # licenses
+ install -vDm 644 License.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -vDm 644 OvmfPkg/License.txt \
+ "${pkgdir}/usr/share/licenses/${pkgname}/OvmfPkg.License.txt"
+ # docs
+ install -vDm 644 {OvmfPkg/README,ReadMe.rst,Maintainers.txt} \
+ -t "${pkgdir}/usr/share/doc/${pkgname}"
+}
Deleted: edk2-202102-brotli-1.0.9.patch
===================================================================
--- edk2-202102-brotli-1.0.9.patch 2021-05-31 17:15:03 UTC (rev 416880)
+++ edk2-202102-brotli-1.0.9.patch 2021-05-31 17:15:23 UTC (rev 416881)
@@ -1,29 +0,0 @@
-diff -ruN a/BaseTools/Source/C/BrotliCompress/GNUmakefile b/BaseTools/Source/C/BrotliCompress/GNUmakefile
---- a/BaseTools/Source/C/BrotliCompress/GNUmakefile 2021-03-02 06:11:55.000000000 +0100
-+++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile 2021-03-11 20:20:04.856571461 +0100
-@@ -10,7 +10,10 @@
-
- OBJECTS = \
- BrotliCompress.o \
-+ brotli/c/common/constants.o \
-+ brotli/c/common/context.o \
- brotli/c/common/dictionary.o \
-+ brotli/c/common/platform.o \
- brotli/c/common/transform.o \
- brotli/c/dec/bit_reader.o \
- brotli/c/dec/decode.o \
-@@ -22,12 +25,14 @@
- brotli/c/enc/block_splitter.o \
- brotli/c/enc/brotli_bit_stream.o \
- brotli/c/enc/cluster.o \
-+ brotli/c/enc/command.o \
- brotli/c/enc/compress_fragment.o \
- brotli/c/enc/compress_fragment_two_pass.o \
- brotli/c/enc/dictionary_hash.o \
- brotli/c/enc/encode.o \
- brotli/c/enc/encoder_dict.o \
- brotli/c/enc/entropy_encode.o \
-+ brotli/c/enc/fast_log.o \
- brotli/c/enc/histogram.o \
- brotli/c/enc/literal_cost.o \
- brotli/c/enc/memory.o \
Copied: edk2/repos/extra-any/edk2-202102-brotli-1.0.9.patch (from rev 416880, edk2/trunk/edk2-202102-brotli-1.0.9.patch)
===================================================================
--- edk2-202102-brotli-1.0.9.patch (rev 0)
+++ edk2-202102-brotli-1.0.9.patch 2021-05-31 17:15:23 UTC (rev 416881)
@@ -0,0 +1,29 @@
+diff -ruN a/BaseTools/Source/C/BrotliCompress/GNUmakefile b/BaseTools/Source/C/BrotliCompress/GNUmakefile
+--- a/BaseTools/Source/C/BrotliCompress/GNUmakefile 2021-03-02 06:11:55.000000000 +0100
++++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile 2021-03-11 20:20:04.856571461 +0100
+@@ -10,7 +10,10 @@
+
+ OBJECTS = \
+ BrotliCompress.o \
++ brotli/c/common/constants.o \
++ brotli/c/common/context.o \
+ brotli/c/common/dictionary.o \
++ brotli/c/common/platform.o \
+ brotli/c/common/transform.o \
+ brotli/c/dec/bit_reader.o \
+ brotli/c/dec/decode.o \
+@@ -22,12 +25,14 @@
+ brotli/c/enc/block_splitter.o \
+ brotli/c/enc/brotli_bit_stream.o \
+ brotli/c/enc/cluster.o \
++ brotli/c/enc/command.o \
+ brotli/c/enc/compress_fragment.o \
+ brotli/c/enc/compress_fragment_two_pass.o \
+ brotli/c/enc/dictionary_hash.o \
+ brotli/c/enc/encode.o \
+ brotli/c/enc/encoder_dict.o \
+ brotli/c/enc/entropy_encode.o \
++ brotli/c/enc/fast_log.o \
+ brotli/c/enc/histogram.o \
+ brotli/c/enc/literal_cost.o \
+ brotli/c/enc/memory.o \
Deleted: edk2-ovmf.install
===================================================================
--- edk2-ovmf.install 2021-05-31 17:15:03 UTC (rev 416880)
+++ edk2-ovmf.install 2021-05-31 17:15:23 UTC (rev 416881)
@@ -1,6 +0,0 @@
-post_install() {
- # note for users of ovmf
- if [ "$(vercmp "$1" '202002-9')" -le 0 ]; then
- echo -e "The firmware location has changed to /usr/share/edk2-ovmf/. Symlinks are provided for backwards compatibility.\nNOTE: To update the paths run 'virsh edit' on virtual machines that use OVMF."
- fi
-}
Copied: edk2/repos/extra-any/edk2-ovmf.install (from rev 416880, edk2/trunk/edk2-ovmf.install)
===================================================================
--- edk2-ovmf.install (rev 0)
+++ edk2-ovmf.install 2021-05-31 17:15:23 UTC (rev 416881)
@@ -0,0 +1,6 @@
+post_install() {
+ # note for users of ovmf
+ if [ "$(vercmp "$1" '202002-9')" -le 0 ]; then
+ echo -e "The firmware location has changed to /usr/share/edk2-ovmf/. Symlinks are provided for backwards compatibility.\nNOTE: To update the paths run 'virsh edit' on virtual machines that use OVMF."
+ fi
+}
Deleted: edk2-shell.install
===================================================================
--- edk2-shell.install 2021-05-31 17:15:03 UTC (rev 416880)
+++ edk2-shell.install 2021-05-31 17:15:23 UTC (rev 416881)
@@ -1 +0,0 @@
-# empty install file to satisfy makepkg
Copied: edk2/repos/extra-any/edk2-shell.install (from rev 416880, edk2/trunk/edk2-shell.install)
===================================================================
--- edk2-shell.install (rev 0)
+++ edk2-shell.install 2021-05-31 17:15:23 UTC (rev 416881)
@@ -0,0 +1 @@
+# empty install file to satisfy makepkg
More information about the arch-commits
mailing list