17 files changed, 894 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..06eac136c43f
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,83 @@
+pkgbase = edk2-git
+	pkgdesc = Modern, feature-rich firmware development environment for the UEFI specifications
+	pkgver = r29698.6062002bd5
+	pkgrel = 1
+	url = https://github.com/tianocore/edk2
+	arch = any
+	license = BSD
+	makedepends = aarch64-linux-gnu-gcc
+	makedepends = acpica
+	makedepends = git
+	makedepends = iasl
+	makedepends = util-linux-libs
+	makedepends = nasm
+	makedepends = python
+	makedepends = seabios
+	options = !makeflags
+	source = edk2::git+https://github.com/tianocore/edk2#branch=master
+	source = https://www.openssl.org/source/openssl-1.1.1l.tar.gz
+	source = https://www.openssl.org/source/openssl-1.1.1l.tar.gz.asc
+	source = brotli-1.0.9.tar.gz::https://github.com/google/brotli/archive/v1.0.9.tar.gz
+	source = edk2-git-202102-brotli-1.0.9.patch
+	source = 50-edk2-ovmf-git-i386-secure.json
+	source = 50-edk2-ovmf-git-x86_64-secure.json
+	source = 60-edk2-ovmf-git-i386.json
+	source = 60-edk2-ovmf-git-x86_64.json
+	source = 60-edk2-armvirt-git-aarch64.json
+	source = 70-edk2-ovmf-git-i386-csm.json
+	source = 70-edk2-ovmf-git-x86_64-csm.json
+	source = 80-edk2-ovmf-git-ia32-on-x86_64-secure.json
+	source = 81-edk2-ovmf-git-ia32-on-x86_64.json
+	source = 82-edk2-ovmf-git-ia32-on-x86_64-csm.json
+	source = missing-inf.patch
+	validpgpkeys = 8657ABB260F056B1E5190839D9C4D26D0E604491
+	sha512sums = SKIP
+	sha512sums = d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0
+	sha512sums = SKIP
+	sha512sums = b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
+	sha512sums = fe0fd592d4b436a35a49a74ad5dd989311b297b9abacb13ed8d4da0986169c91ffbc34cef0f2d52bf40c833d252f6e65311ab0e4e4ca6798390febfb9a787a4a
+	sha512sums = 603cae145a87bae371bd069d05128beebddb7048e78b93650b19c44b86b2d27cabbcf3bc4c0b2384b862f32383ce7a914a10fc0ad564632bcadd6e4f9389fede
+	sha512sums = 3e10bdc9ad13aadbd4111230fb8f37d5f16306aeb7bce2af5ec31c1e2b5adea26d5875cd0d7070ea82eca7546ecbacc8c195ed68425428bf6d2533b58e307b2d
+	sha512sums = 56d0bffd6dd7be79709f66bcfba2112e8ef6208de9b5018e90251e3ba68b37f9d911f0bd5a03987b49bb19bd0d62f7fa9ac3ca9f234e80ada3c4dbdd619705b9
+	sha512sums = 04b4c86f5afeab6170ad1b7b9937fa775a920c78719a33b213f7f8924e4e905709335307c38b8d5d9c127dd8c7000ddbe740b77f1ddfb68035819b7b4cf2b1e4
+	sha512sums = 6d2799171058b45ff4205441ad222893ebe2fce5c5c71c9c52c97efc95e4cad65d66d390b6a554ce7a2ce505ceba7431d18f79f2c2c1101addccee55141d4a66
+	sha512sums = 4ee69302de1cec37e4bf4c6a5525d887392f8f733ae8a95a54021f6531741e95baef31da1538b45667a1b198cbbab3069678169069f9ba8db641d603ebb3735b
+	sha512sums = 77e23f0c116ae5a087553edb2754df172b2c4fe5bc346356abe0e1f2acfb41a346d06d87b0569102ca4ac9356e189198c0c74476cb35f1b62773a956cb6a1e04
+	sha512sums = 8e5eb4e24fad4644a66eb52c95a90a82f01df0af6e57208ad61cb0859dd4425e623e75d93846e8fc3235370a88d93a1d27a512dc4e559bedfe3249404797838b
+	sha512sums = 7c9f8e7ce7451e7aa852998ffcd3ca95c08083c313dc8dcf0877969ef23d9da6f69c60bb1e652387a223da6e690524fa094bfbaed14d8bdae2853e68530b2f82
+	sha512sums = 891d3ea36d966114ff1f79c3619675a46b30b68def16ab426f2dee00bd0768f82ca0ee26acd7adedd379f25613e309ec9dfaed4e8a5d3f3e4fa7e8d845f55b18
+	sha512sums = 47b0e60f2af4ced0f5a693f245ce23d3240e87058f6ae7ff2407486c0b6e80754b55d21a35a0ab1b698a65b9060b7c1f1d4dce2f134d0a741235f23e2e64f5d2
+	b2sums = SKIP
+	b2sums = 9e8739015db63a013c05587e3d164d67c3f65f1f6c5fc75e4592bcd038c036cde88a7bc95fbc1f1b4ed876f6124ca4dabcd4f5dbb45d1b84299f2efe1a59431a
+	b2sums = SKIP
+	b2sums = 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904
+	b2sums = eb549f711aa31b0a46f3e9b74076e52e0e1734045c227f410016c6de46a3b7b2959287d49b5ef853236c57fa3b3143b1da31fd9ef6fd592ba22ba9af15941a76
+	b2sums = fa75566a2ac591fc0c296812f907bfe3fd67f2ee90d3762f0fcae6427df0dfd6260238f5af4fc6b74a76eccfc264db2259db70f8c533871e8b58f37b91a90657
+	b2sums = f6aaccf4b5a070b05e8eb58d5df60c8798d9b9de2f9febf1417a1ae178431be9a69890a7107d3ca100a439551b4949b937ba400ac36bb9eebaf7e1fdb61dc9d3
+	b2sums = 891719a70d14f29f6ec9e9cfe83cbf48abb5aedfaf5a3a02efaf9cf1dcca0c14f42f8e4486425df12c72001d7811b0f6030520bad2d83b4885f13d110ab2ae0f
+	b2sums = 899ecf699815216984905a7abdd3385890c6309f3ef7813778bedf63c15d42ab12c59532d45033a11838f990744417100eb13048b53cee5cdf46440af61b475d
+	b2sums = e61378139f2da0d4185e67436d87a023600a075b4258234e818fe7f591bdb5d363713d29d250263df6074f5d37deed269c067983ee6bd322f2f7d0ee710bc452
+	b2sums = 8c211a1bbef20ff361c53735b91cc05660f9d94e7d8a937d903c061a1ec9c96ec2c37f0ef5e954cd4aac7f7962489f5a7a0507e44c781a7671211a9530dccb5b
+	b2sums = 7f48bb1747c732c597a749c851a6cac46de844c1727f3d5edca35249df845a0f578780e8bcda7d86ad2c4a62a9a2a0bc7e1cfab9b7b93d7b5415bb5817d73346
+	b2sums = ddacbab89d0fd7831149594487559bb6bac1464b2b5620641043306fabfc37800db8c6d87a833c70ec35c699ea2f35cf09d34028ec7982a94686e8cd97b73300
+	b2sums = 99bf35c4042fd5105a3b3b7f71b0aeb18db7811da4ed4481ffec485258619c30d33b08633f9a1c762d383e3bf0191053be9b88b9a4c142350186c6df1261d1f7
+	b2sums = d45b224c36eda139ca6ad9e4c6c04282724b264dd36a0b3ba904d71476b83e02963c8cadf1f1e1233955071d133dc0defa746740fa08b26398c489fbf6ba89a0
+	b2sums = f842ea1d3959027f36c52d5e26e06915f43bfe3869719eacf2810e87bdfd57baaa30da6e31db703d0e2d9936cad02ba153371c1b16dffeef2e09e5595a337bcc
+
+pkgname = edk2-armvirt-git
+	pkgdesc = Firmware for Virtual Machines (aarch64)
+	url = https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
+
+pkgname = edk2-shell-git
+	pkgdesc = EDK2 UEFI Shell
+	provides = uefi-shell
+
+pkgname = edk2-ovmf-git
+	pkgdesc = Firmware for Virtual Machines (x86_64, i686)
+	url = https://github.com/tianocore/tianocore.github.io/wiki/OVMF
+	install = edk2-ovmf-git.install
+	license = BSD
+	license = MIT
+	provides = ovmf
+	conflicts = ovmf
+	replaces = ovmf
diff --git a/50-edk2-ovmf-git-i386-secure.json b/50-edk2-ovmf-git-i386-secure.json
new file mode 100644
index 000000000000..4d7d1ff0ea27
--- /dev/null
+++ b/50-edk2-ovmf-git-i386-secure.json
@@ -0,0 +1,35 @@
+{
+    "description": "IA32 UEFI 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",
+        "acpi-s4",
+        "requires-smm",
+        "secure-boot",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/50-edk2-ovmf-git-x86_64-secure.json b/50-edk2-ovmf-git-x86_64-secure.json
new file mode 100644
index 000000000000..3f0f62c7eb31
--- /dev/null
+++ b/50-edk2-ovmf-git-x86_64-secure.json
@@ -0,0 +1,36 @@
+{
+    "description": "x64 UEFI 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",
+        "acpi-s4",
+        "amd-sev",
+        "requires-smm",
+        "secure-boot",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/60-edk2-armvirt-git-aarch64.json b/60-edk2-armvirt-git-aarch64.json
new file mode 100644
index 000000000000..9c504a846e9d
--- /dev/null
+++ b/60-edk2-armvirt-git-aarch64.json
@@ -0,0 +1,31 @@
+{
+    "description": "AA64 UEFI 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": [
+
+    ]
+}
diff --git a/60-edk2-ovmf-git-i386.json b/60-edk2-ovmf-git-i386.json
new file mode 100644
index 000000000000..f6c3c9f9faed
--- /dev/null
+++ b/60-edk2-ovmf-git-i386.json
@@ -0,0 +1,34 @@
+{
+    "description": "IA32 UEFI 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",
+        "acpi-s4",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/60-edk2-ovmf-git-x86_64.json b/60-edk2-ovmf-git-x86_64.json
new file mode 100644
index 000000000000..6b159e05ada2
--- /dev/null
+++ b/60-edk2-ovmf-git-x86_64.json
@@ -0,0 +1,35 @@
+{
+    "description": "x64 UEFI 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",
+        "acpi-s4",
+        "amd-sev",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/70-edk2-ovmf-git-i386-csm.json b/70-edk2-ovmf-git-i386-csm.json
new file mode 100644
index 000000000000..7b21ca75b8a3
--- /dev/null
+++ b/70-edk2-ovmf-git-i386-csm.json
@@ -0,0 +1,34 @@
+{
+    "description": "IA32 UEFI for i386, with CSM",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "executable": {
+            "filename": "/usr/share/edk2-ovmf/ia32/OVMF_CODE.csm.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",
+        "acpi-s4",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/70-edk2-ovmf-git-x86_64-csm.json b/70-edk2-ovmf-git-x86_64-csm.json
new file mode 100644
index 000000000000..8ed91364a825
--- /dev/null
+++ b/70-edk2-ovmf-git-x86_64-csm.json
@@ -0,0 +1,35 @@
+{
+    "description": "x64 UEFI for x86_64, with CSM support",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "executable": {
+            "filename": "/usr/share/edk2-ovmf/x64/OVMF_CODE.csm.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",
+        "acpi-s4",
+        "amd-sev",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/80-edk2-ovmf-git-ia32-on-x86_64-secure.json b/80-edk2-ovmf-git-ia32-on-x86_64-secure.json
new file mode 100644
index 000000000000..149901d4ef3b
--- /dev/null
+++ b/80-edk2-ovmf-git-ia32-on-x86_64-secure.json
@@ -0,0 +1,35 @@
+{
+    "description": "IA32 UEFI for x86_64, 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": "x86_64",
+            "machines": [
+                "pc-q35-*"
+            ]
+        }
+    ],
+    "features": [
+        "acpi-s3",
+        "acpi-s4",
+        "requires-smm",
+        "secure-boot",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/81-edk2-ovmf-git-ia32-on-x86_64.json b/81-edk2-ovmf-git-ia32-on-x86_64.json
new file mode 100644
index 000000000000..96a1f03bc331
--- /dev/null
+++ b/81-edk2-ovmf-git-ia32-on-x86_64.json
@@ -0,0 +1,34 @@
+{
+    "description": "IA32 UEFI for x86_64",
+    "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": "x86_64",
+            "machines": [
+                "pc-i440fx-*",
+                "pc-q35-*"
+            ]
+        }
+    ],
+    "features": [
+        "acpi-s3",
+        "acpi-s4",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/82-edk2-ovmf-git-ia32-on-x86_64-csm.json b/82-edk2-ovmf-git-ia32-on-x86_64-csm.json
new file mode 100644
index 000000000000..a89f1f19d3b6
--- /dev/null
+++ b/82-edk2-ovmf-git-ia32-on-x86_64-csm.json
@@ -0,0 +1,34 @@
+{
+    "description": "IA32 UEFI for x86_64, with CSM",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "executable": {
+            "filename": "/usr/share/edk2-ovmf/ia32/OVMF_CODE.csm.fd",
+            "format": "raw"
+        },
+        "nvram-template": {
+            "filename": "/usr/share/edk2-ovmf/ia32/OVMF_VARS.fd",
+            "format": "raw"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "x86_64",
+            "machines": [
+                "pc-i440fx-*",
+                "pc-q35-*"
+            ]
+        }
+    ],
+    "features": [
+        "acpi-s3",
+        "acpi-s4",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..8cc546d1e8dc
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,337 @@
+# Maintainer: Mark King <mark.king@markzz.com>
+
+_brotli_ver=1.0.9
+_openssl_ver=1.1.1l
+pkgbase=edk2-git
+pkgname=(edk2-armvirt-git edk2-shell-git edk2-ovmf-git)
+pkgver=r29698.6062002bd5
+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 seabios)
+options=(!makeflags)
+source=(
+  "edk2::git+https://github.com/tianocore/edk2#branch=master"
+  "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-git-i386-secure.json"
+  "50-edk2-ovmf-git-x86_64-secure.json"
+  "60-edk2-ovmf-git-i386.json"
+  "60-edk2-ovmf-git-x86_64.json"
+  "60-edk2-armvirt-git-aarch64.json"
+  "70-edk2-ovmf-git-i386-csm.json"
+  "70-edk2-ovmf-git-x86_64-csm.json"
+  "80-edk2-ovmf-git-ia32-on-x86_64-secure.json"
+  "81-edk2-ovmf-git-ia32-on-x86_64.json"
+  "82-edk2-ovmf-git-ia32-on-x86_64-csm.json"
+  "missing-inf.patch"
+)
+sha512sums=('SKIP'
+            'd9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0'
+            'SKIP'
+            'b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5'
+            'fe0fd592d4b436a35a49a74ad5dd989311b297b9abacb13ed8d4da0986169c91ffbc34cef0f2d52bf40c833d252f6e65311ab0e4e4ca6798390febfb9a787a4a'
+            '603cae145a87bae371bd069d05128beebddb7048e78b93650b19c44b86b2d27cabbcf3bc4c0b2384b862f32383ce7a914a10fc0ad564632bcadd6e4f9389fede'
+            '3e10bdc9ad13aadbd4111230fb8f37d5f16306aeb7bce2af5ec31c1e2b5adea26d5875cd0d7070ea82eca7546ecbacc8c195ed68425428bf6d2533b58e307b2d'
+            '56d0bffd6dd7be79709f66bcfba2112e8ef6208de9b5018e90251e3ba68b37f9d911f0bd5a03987b49bb19bd0d62f7fa9ac3ca9f234e80ada3c4dbdd619705b9'
+            '04b4c86f5afeab6170ad1b7b9937fa775a920c78719a33b213f7f8924e4e905709335307c38b8d5d9c127dd8c7000ddbe740b77f1ddfb68035819b7b4cf2b1e4'
+            '6d2799171058b45ff4205441ad222893ebe2fce5c5c71c9c52c97efc95e4cad65d66d390b6a554ce7a2ce505ceba7431d18f79f2c2c1101addccee55141d4a66'
+            '4ee69302de1cec37e4bf4c6a5525d887392f8f733ae8a95a54021f6531741e95baef31da1538b45667a1b198cbbab3069678169069f9ba8db641d603ebb3735b'
+            '77e23f0c116ae5a087553edb2754df172b2c4fe5bc346356abe0e1f2acfb41a346d06d87b0569102ca4ac9356e189198c0c74476cb35f1b62773a956cb6a1e04'
+            '8e5eb4e24fad4644a66eb52c95a90a82f01df0af6e57208ad61cb0859dd4425e623e75d93846e8fc3235370a88d93a1d27a512dc4e559bedfe3249404797838b'
+            '7c9f8e7ce7451e7aa852998ffcd3ca95c08083c313dc8dcf0877969ef23d9da6f69c60bb1e652387a223da6e690524fa094bfbaed14d8bdae2853e68530b2f82'
+            '891d3ea36d966114ff1f79c3619675a46b30b68def16ab426f2dee00bd0768f82ca0ee26acd7adedd379f25613e309ec9dfaed4e8a5d3f3e4fa7e8d845f55b18'
+            '47b0e60f2af4ced0f5a693f245ce23d3240e87058f6ae7ff2407486c0b6e80754b55d21a35a0ab1b698a65b9060b7c1f1d4dce2f134d0a741235f23e2e64f5d2')
+b2sums=('SKIP'
+        '9e8739015db63a013c05587e3d164d67c3f65f1f6c5fc75e4592bcd038c036cde88a7bc95fbc1f1b4ed876f6124ca4dabcd4f5dbb45d1b84299f2efe1a59431a'
+        'SKIP'
+        '8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904'
+        'eb549f711aa31b0a46f3e9b74076e52e0e1734045c227f410016c6de46a3b7b2959287d49b5ef853236c57fa3b3143b1da31fd9ef6fd592ba22ba9af15941a76'
+        'fa75566a2ac591fc0c296812f907bfe3fd67f2ee90d3762f0fcae6427df0dfd6260238f5af4fc6b74a76eccfc264db2259db70f8c533871e8b58f37b91a90657'
+        'f6aaccf4b5a070b05e8eb58d5df60c8798d9b9de2f9febf1417a1ae178431be9a69890a7107d3ca100a439551b4949b937ba400ac36bb9eebaf7e1fdb61dc9d3'
+        '891719a70d14f29f6ec9e9cfe83cbf48abb5aedfaf5a3a02efaf9cf1dcca0c14f42f8e4486425df12c72001d7811b0f6030520bad2d83b4885f13d110ab2ae0f'
+        '899ecf699815216984905a7abdd3385890c6309f3ef7813778bedf63c15d42ab12c59532d45033a11838f990744417100eb13048b53cee5cdf46440af61b475d'
+        'e61378139f2da0d4185e67436d87a023600a075b4258234e818fe7f591bdb5d363713d29d250263df6074f5d37deed269c067983ee6bd322f2f7d0ee710bc452'
+        '8c211a1bbef20ff361c53735b91cc05660f9d94e7d8a937d903c061a1ec9c96ec2c37f0ef5e954cd4aac7f7962489f5a7a0507e44c781a7671211a9530dccb5b'
+        '7f48bb1747c732c597a749c851a6cac46de844c1727f3d5edca35249df845a0f578780e8bcda7d86ad2c4a62a9a2a0bc7e1cfab9b7b93d7b5415bb5817d73346'
+        'ddacbab89d0fd7831149594487559bb6bac1464b2b5620641043306fabfc37800db8c6d87a833c70ec35c699ea2f35cf09d34028ec7982a94686e8cd97b73300'
+        '99bf35c4042fd5105a3b3b7f71b0aeb18db7811da4ed4481ffec485258619c30d33b08633f9a1c762d383e3bf0191053be9b88b9a4c142350186c6df1261d1f7'
+        'd45b224c36eda139ca6ad9e4c6c04282724b264dd36a0b3ba904d71476b83e02963c8cadf1f1e1233955071d133dc0defa746740fa08b26398c489fbf6ba89a0'
+        'f842ea1d3959027f36c52d5e26e06915f43bfe3869719eacf2810e87bdfd57baaa30da6e31db703d0e2d9936cad02ba153371c1b16dffeef2e09e5595a337bcc')
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') # Matt Caswell <matt@openssl.org>
+_arch_list=(AARCH64 IA32 X64)
+_build_type=RELEASE
+_build_plugin=GCC5
+
+pkgver() {
+  cd "${srcdir}"/edk2
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd "$pkgbase"
+  patch -Np1 -i ../missing-inf.patch
+  # 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
+
+  # copy seabios's CSM binary into place, so that it can be included in the binaries:
+  cp -v /usr/share/qemu/bios-csm.bin OvmfPkg/Csm/Csm16/Csm16.bin
+}
+
+# TODO: check TPM_ENABLE/TPM2_ENABLE
+build() {
+  cd "$pkgbase"
+  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 support"
+      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 TPM_CONFIG_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}) with CSM support"
+      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 TPM_CONFIG_ENABLE \
+                       -D HTTP_BOOT_ENABLE \
+                       -D TLS_ENABLE \
+                       -D CSM_ENABLE \
+                       -D FD_SIZE_2MB
+      mv -v Build/Ovmf{Ia32,IA32-csm}
+      echo "Building ovmf (${_arch}) default"
+      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 TPM_CONFIG_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 support"
+      OvmfPkg/build.sh -p "OvmfPkg/OvmfPkgIa32X64.dsc" \
+                       -a IA32 -a "${_arch}" \
+                       -b "${_build_type}" \
+                       -n "$(nproc)" \
+                       -t "${_build_plugin}" \
+                       -D NETWORK_IP6_ENABLE \
+                       -D TPM_ENABLE \
+                       -D TPM_CONFIG_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/Ovmf3264{,-secure}
+      echo "Building ovmf (${_arch}) with CSM support"
+      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 TPM_CONFIG_ENABLE \
+                       -D FD_SIZE_2MB \
+                       -D TLS_ENABLE \
+                       -D CSM_ENABLE \
+                       -D HTTP_BOOT_ENABLE
+      mv -v Build/OvmfX64{,-csm}
+      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 TPM_CONFIG_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-git() {
+  pkgdesc="Firmware for Virtual Machines (aarch64)"
+  url="https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg"
+  local _arch=AARCH64
+
+  cd "$pkgbase"
+  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-git() {
+  pkgdesc="EDK2 UEFI Shell"
+  provides=(uefi-shell)
+
+  cd "$pkgbase"
+  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-git() {
+  pkgdesc="Firmware for Virtual Machines (x86_64, i686)"
+  url="https://github.com/tianocore/tianocore.github.io/wiki/OVMF"
+  license+=(MIT)
+  provides=(ovmf)
+  conflicts=(ovmf)
+  replaces=(ovmf)
+  install="${pkgname}.install"
+
+  cd "$pkgbase"
+  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}-csm/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
+        "${pkgdir}/usr/share/${pkgname}/${_arch,,}/OVMF_CODE.csm.fd"
+      if [[ "${_arch}" == 'X64' ]]; then
+        install -vDm 644 "Build/Ovmf3264-secure/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
+          "${pkgdir}/usr/share/${pkgname}/${_arch,,}/OVMF_CODE.secboot.fd"
+      else
+        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
+    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}"
+}
+
diff --git a/edk2-armvirt-git-202111-gpu_passthrough.patch b/edk2-armvirt-git-202111-gpu_passthrough.patch
new file mode 100644
index 000000000000..49f23c975341
--- /dev/null
+++ b/edk2-armvirt-git-202111-gpu_passthrough.patch
@@ -0,0 +1,72 @@
+From ee1f8262b83dd88b30091e6e81221ff299796099 Mon Sep 17 00:00:00 2001
+From: Stefan Berger <stefanb@linux.ibm.com>
+Date: Thu, 16 Dec 2021 21:37:22 -0500
+Subject: [PATCH] OvmfPkg: Call PlatformInitializeConsole for GPU passthrough
+ case
+
+For GPU passthrough support we have to initialize the console after
+EfiBootManagerDispatchDeferredImages() has loaded ROMs, so call it after
+this. This was the calling order before the TCG physical presence support
+had to be moved and the console initialized earlier so user interaction
+could be supported before processing TCG physical presence opcodes.
+
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+Tested-by: Shivanshu Goyal <shivanshu3@gmail.com>
+Acked-by: Jiewen Yao <jiewen.yao@intel.com>
+Acked-by: Gerd Hoffmann <kraxel@redhat.com>
+---
+ OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c      | 7 +++++++
+ OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c | 5 +++++
+ OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c  | 5 +++++
+ 3 files changed, 17 insertions(+)
+
+diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+index 5feadc51d746..0918c35f1fb7 100644
+--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
++++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+@@ -448,6 +448,13 @@ PlatformBootManagerBeforeConsole (
+   //
+   EfiBootManagerDispatchDeferredImages ();
+ 
++  //
++  // GPU passthrough only allows Console enablement after ROM image load
++  //
++  PlatformInitializeConsole (
++    XenDetected () ? gXenPlatformConsole : gPlatformConsole
++    );
++
+   FrontPageTimeout = GetFrontPageTimeoutFromQemu ();
+   PcdStatus        = PcdSet16S (PcdPlatformBootTimeOut, FrontPageTimeout);
+   ASSERT_RETURN_ERROR (PcdStatus);
+diff --git a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
+index 119f24b33016..bf2701965ff2 100644
+--- a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
++++ b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
+@@ -434,6 +434,11 @@ PlatformBootManagerBeforeConsole (
+   //
+   EfiBootManagerDispatchDeferredImages ();
+ 
++  //
++  // GPU passthrough only allows Console enablement after ROM image load
++  //
++  PlatformInitializeConsole (gPlatformConsole);
++
+   PlatformRegisterOptionsAndKeys ();
+ 
+   //
+diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
+index 9c6848bbffb4..a402589206bb 100644
+--- a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
++++ b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
+@@ -392,6 +392,11 @@ PlatformBootManagerBeforeConsole (
+   //
+   EfiBootManagerDispatchDeferredImages ();
+ 
++  //
++  // GPU passthrough only allows Console enablement after ROM image load
++  //
++  PlatformInitializeConsole (gPlatformConsole);
++
+   Status = gRT->SetVariable (
+                   EFI_TIME_OUT_VARIABLE_NAME,
+                   &gEfiGlobalVariableGuid,
diff --git a/edk2-git-202102-brotli-1.0.9.patch b/edk2-git-202102-brotli-1.0.9.patch
new file mode 100644
index 000000000000..e5241bf73cdc
--- /dev/null
+++ b/edk2-git-202102-brotli-1.0.9.patch
@@ -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 \
diff --git a/edk2-ovmf-git.install b/edk2-ovmf-git.install
new file mode 100644
index 000000000000..37c8001430f7
--- /dev/null
+++ b/edk2-ovmf-git.install
@@ -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
+}
diff --git a/edk2-shell-git.install b/edk2-shell-git.install
new file mode 100644
index 000000000000..82552f17bfdc
--- /dev/null
+++ b/edk2-shell-git.install
@@ -0,0 +1 @@
+# empty install file to satisfy makepkg
diff --git a/missing-inf.patch b/missing-inf.patch
new file mode 100644
index 000000000000..f45d99e1daca
--- /dev/null
+++ b/missing-inf.patch
@@ -0,0 +1,23 @@
+From 3a58e5e39f69afe084f5ffed3dd0badd3eb89efb Mon Sep 17 00:00:00 2001
+From: Mark Weiman <mark.weiman@markzz.com>
+Date: Wed, 12 Jan 2022 12:52:53 -0500
+Subject: [PATCH] Fix error in b47575801e1903e8b316d01840572ce2681cf2c6
+
+---
+ OvmfPkg/OvmfPkgIa32.dsc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
+index 085cc7ece1..f8a2015011 100644
+--- a/OvmfPkg/OvmfPkgIa32.dsc
++++ b/OvmfPkg/OvmfPkgIa32.dsc
+@@ -986,3 +986,6 @@
+   #
+ !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+ 
++!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE
++  OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf
++!endif
+-- 
+2.34.1
+