[arch-commits] Commit in edk2/repos/extra-any (30 files)
David Runge
dvzrv at gemini.archlinux.org
Sat Apr 16 21:45:02 UTC 2022
Date: Saturday, April 16, 2022 @ 21:45:01
Author: dvzrv
Revision: 442787
archrelease: copy trunk to extra-any
Added:
edk2/repos/extra-any/50-edk2-ovmf-i386-secure.json
(from rev 442786, edk2/trunk/50-edk2-ovmf-i386-secure.json)
edk2/repos/extra-any/50-edk2-ovmf-x86_64-secure.json
(from rev 442786, edk2/trunk/50-edk2-ovmf-x86_64-secure.json)
edk2/repos/extra-any/60-edk2-armvirt-aarch64.json
(from rev 442786, edk2/trunk/60-edk2-armvirt-aarch64.json)
edk2/repos/extra-any/60-edk2-ovmf-i386.json
(from rev 442786, edk2/trunk/60-edk2-ovmf-i386.json)
edk2/repos/extra-any/60-edk2-ovmf-x86_64.json
(from rev 442786, edk2/trunk/60-edk2-ovmf-x86_64.json)
edk2/repos/extra-any/70-edk2-ovmf-i386-csm.json
(from rev 442786, edk2/trunk/70-edk2-ovmf-i386-csm.json)
edk2/repos/extra-any/70-edk2-ovmf-x86_64-csm.json
(from rev 442786, edk2/trunk/70-edk2-ovmf-x86_64-csm.json)
edk2/repos/extra-any/80-edk2-ovmf-ia32-on-x86_64-secure.json
(from rev 442786, edk2/trunk/80-edk2-ovmf-ia32-on-x86_64-secure.json)
edk2/repos/extra-any/81-edk2-ovmf-ia32-on-x86_64.json
(from rev 442786, edk2/trunk/81-edk2-ovmf-ia32-on-x86_64.json)
edk2/repos/extra-any/82-edk2-ovmf-ia32-on-x86_64-csm.json
(from rev 442786, edk2/trunk/82-edk2-ovmf-ia32-on-x86_64-csm.json)
edk2/repos/extra-any/PKGBUILD
(from rev 442786, edk2/trunk/PKGBUILD)
edk2/repos/extra-any/edk2-202202-brotli.patch
(from rev 442786, edk2/trunk/edk2-202202-brotli.patch)
edk2/repos/extra-any/edk2-202202-ovmfpkgia32.patch
(from rev 442786, edk2/trunk/edk2-202202-ovmfpkgia32.patch)
edk2/repos/extra-any/edk2-ovmf.install
(from rev 442786, edk2/trunk/edk2-ovmf.install)
edk2/repos/extra-any/edk2-shell.install
(from rev 442786, 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-armvirt-aarch64.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-ovmf-i386-csm.json
edk2/repos/extra-any/70-edk2-ovmf-x86_64-csm.json
edk2/repos/extra-any/80-edk2-ovmf-ia32-on-x86_64-secure.json
edk2/repos/extra-any/81-edk2-ovmf-ia32-on-x86_64.json
edk2/repos/extra-any/82-edk2-ovmf-ia32-on-x86_64-csm.json
edk2/repos/extra-any/PKGBUILD
edk2/repos/extra-any/edk2-202202-brotli.patch
edk2/repos/extra-any/edk2-202202-ovmfpkgia32.patch
edk2/repos/extra-any/edk2-ovmf.install
edk2/repos/extra-any/edk2-shell.install
-----------------------------------------+
50-edk2-ovmf-i386-secure.json | 70 +--
50-edk2-ovmf-x86_64-secure.json | 72 +--
60-edk2-armvirt-aarch64.json | 62 +--
60-edk2-ovmf-i386.json | 68 +--
60-edk2-ovmf-x86_64.json | 70 +--
70-edk2-ovmf-i386-csm.json | 68 +--
70-edk2-ovmf-x86_64-csm.json | 70 +--
80-edk2-ovmf-ia32-on-x86_64-secure.json | 70 +--
81-edk2-ovmf-ia32-on-x86_64.json | 68 +--
82-edk2-ovmf-ia32-on-x86_64-csm.json | 68 +--
PKGBUILD | 581 +++++++++++++++---------------
edk2-202202-brotli.patch | 30 -
edk2-202202-ovmfpkgia32.patch | 20 -
edk2-ovmf.install | 12
edk2-shell.install | 2
15 files changed, 666 insertions(+), 665 deletions(-)
Deleted: 50-edk2-ovmf-i386-secure.json
===================================================================
--- 50-edk2-ovmf-i386-secure.json 2022-04-16 21:44:38 UTC (rev 442786)
+++ 50-edk2-ovmf-i386-secure.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,35 +0,0 @@
-{
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/50-edk2-ovmf-i386-secure.json (from rev 442786, edk2/trunk/50-edk2-ovmf-i386-secure.json)
===================================================================
--- 50-edk2-ovmf-i386-secure.json (rev 0)
+++ 50-edk2-ovmf-i386-secure.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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": [
+
+ ]
+}
Deleted: 50-edk2-ovmf-x86_64-secure.json
===================================================================
--- 50-edk2-ovmf-x86_64-secure.json 2022-04-16 21:44:38 UTC (rev 442786)
+++ 50-edk2-ovmf-x86_64-secure.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,36 +0,0 @@
-{
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/50-edk2-ovmf-x86_64-secure.json (from rev 442786, 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 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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": [
+
+ ]
+}
Deleted: 60-edk2-armvirt-aarch64.json
===================================================================
--- 60-edk2-armvirt-aarch64.json 2022-04-16 21:44:38 UTC (rev 442786)
+++ 60-edk2-armvirt-aarch64.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,31 +0,0 @@
-{
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/60-edk2-armvirt-aarch64.json (from rev 442786, edk2/trunk/60-edk2-armvirt-aarch64.json)
===================================================================
--- 60-edk2-armvirt-aarch64.json (rev 0)
+++ 60-edk2-armvirt-aarch64.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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": [
+
+ ]
+}
Deleted: 60-edk2-ovmf-i386.json
===================================================================
--- 60-edk2-ovmf-i386.json 2022-04-16 21:44:38 UTC (rev 442786)
+++ 60-edk2-ovmf-i386.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,34 +0,0 @@
-{
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/60-edk2-ovmf-i386.json (from rev 442786, edk2/trunk/60-edk2-ovmf-i386.json)
===================================================================
--- 60-edk2-ovmf-i386.json (rev 0)
+++ 60-edk2-ovmf-i386.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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": [
+
+ ]
+}
Deleted: 60-edk2-ovmf-x86_64.json
===================================================================
--- 60-edk2-ovmf-x86_64.json 2022-04-16 21:44:38 UTC (rev 442786)
+++ 60-edk2-ovmf-x86_64.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,35 +0,0 @@
-{
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/60-edk2-ovmf-x86_64.json (from rev 442786, edk2/trunk/60-edk2-ovmf-x86_64.json)
===================================================================
--- 60-edk2-ovmf-x86_64.json (rev 0)
+++ 60-edk2-ovmf-x86_64.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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": [
+
+ ]
+}
Deleted: 70-edk2-ovmf-i386-csm.json
===================================================================
--- 70-edk2-ovmf-i386-csm.json 2022-04-16 21:44:38 UTC (rev 442786)
+++ 70-edk2-ovmf-i386-csm.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,34 +0,0 @@
-{
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/70-edk2-ovmf-i386-csm.json (from rev 442786, edk2/trunk/70-edk2-ovmf-i386-csm.json)
===================================================================
--- 70-edk2-ovmf-i386-csm.json (rev 0)
+++ 70-edk2-ovmf-i386-csm.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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": [
+
+ ]
+}
Deleted: 70-edk2-ovmf-x86_64-csm.json
===================================================================
--- 70-edk2-ovmf-x86_64-csm.json 2022-04-16 21:44:38 UTC (rev 442786)
+++ 70-edk2-ovmf-x86_64-csm.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,35 +0,0 @@
-{
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/70-edk2-ovmf-x86_64-csm.json (from rev 442786, edk2/trunk/70-edk2-ovmf-x86_64-csm.json)
===================================================================
--- 70-edk2-ovmf-x86_64-csm.json (rev 0)
+++ 70-edk2-ovmf-x86_64-csm.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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": [
+
+ ]
+}
Deleted: 80-edk2-ovmf-ia32-on-x86_64-secure.json
===================================================================
--- 80-edk2-ovmf-ia32-on-x86_64-secure.json 2022-04-16 21:44:38 UTC (rev 442786)
+++ 80-edk2-ovmf-ia32-on-x86_64-secure.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,35 +0,0 @@
-{
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/80-edk2-ovmf-ia32-on-x86_64-secure.json (from rev 442786, edk2/trunk/80-edk2-ovmf-ia32-on-x86_64-secure.json)
===================================================================
--- 80-edk2-ovmf-ia32-on-x86_64-secure.json (rev 0)
+++ 80-edk2-ovmf-ia32-on-x86_64-secure.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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": [
+
+ ]
+}
Deleted: 81-edk2-ovmf-ia32-on-x86_64.json
===================================================================
--- 81-edk2-ovmf-ia32-on-x86_64.json 2022-04-16 21:44:38 UTC (rev 442786)
+++ 81-edk2-ovmf-ia32-on-x86_64.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,34 +0,0 @@
-{
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/81-edk2-ovmf-ia32-on-x86_64.json (from rev 442786, edk2/trunk/81-edk2-ovmf-ia32-on-x86_64.json)
===================================================================
--- 81-edk2-ovmf-ia32-on-x86_64.json (rev 0)
+++ 81-edk2-ovmf-ia32-on-x86_64.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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": [
+
+ ]
+}
Deleted: 82-edk2-ovmf-ia32-on-x86_64-csm.json
===================================================================
--- 82-edk2-ovmf-ia32-on-x86_64-csm.json 2022-04-16 21:44:38 UTC (rev 442786)
+++ 82-edk2-ovmf-ia32-on-x86_64-csm.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,34 +0,0 @@
-{
- "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": [
-
- ]
-}
Copied: edk2/repos/extra-any/82-edk2-ovmf-ia32-on-x86_64-csm.json (from rev 442786, edk2/trunk/82-edk2-ovmf-ia32-on-x86_64-csm.json)
===================================================================
--- 82-edk2-ovmf-ia32-on-x86_64-csm.json (rev 0)
+++ 82-edk2-ovmf-ia32-on-x86_64-csm.json 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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": [
+
+ ]
+}
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-16 21:44:38 UTC (rev 442786)
+++ PKGBUILD 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,290 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Contributor: Alexander Epaneshnikov <alex19ep at archlinux.org>
-
-_brotli_ver=1.0.9
-_openssl_ver=1.1.1n
-pkgbase=edk2
-pkgname=(edk2-armvirt edk2-shell edk2-ovmf)
-pkgver=202202
-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=(
- $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
- 50-edk2-ovmf-i386-secure.json
- 50-edk2-ovmf-x86_64-secure.json
- 60-edk2-ovmf-i386.json
- 60-edk2-ovmf-x86_64.json
- 60-edk2-armvirt-aarch64.json
- 70-edk2-ovmf-i386-csm.json
- 70-edk2-ovmf-x86_64-csm.json
- 80-edk2-ovmf-ia32-on-x86_64-secure.json
- 81-edk2-ovmf-ia32-on-x86_64.json
- 82-edk2-ovmf-ia32-on-x86_64-csm.json
- $pkgbase-202202-brotli.patch
- $pkgbase-202202-ovmfpkgia32.patch
-)
-sha512sums=('200690a4867331de06e0478869b85577bc510213ebe679f2103160efb84d94c82ac8481ef1f15c3e42c1e9f22b7c5ef0d6c8f2c655bce7702ce843551cf9bb83'
- '1937796736613dcf4105a54e42ecb61f95a1cea74677156f9459aea0f2c95159359e766089632bf364ee6b0d28d661eb9957bce8fecc9d2436378d8d79e8d0a4'
- 'SKIP'
- 'b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5'
- '603cae145a87bae371bd069d05128beebddb7048e78b93650b19c44b86b2d27cabbcf3bc4c0b2384b862f32383ce7a914a10fc0ad564632bcadd6e4f9389fede'
- '3e10bdc9ad13aadbd4111230fb8f37d5f16306aeb7bce2af5ec31c1e2b5adea26d5875cd0d7070ea82eca7546ecbacc8c195ed68425428bf6d2533b58e307b2d'
- '56d0bffd6dd7be79709f66bcfba2112e8ef6208de9b5018e90251e3ba68b37f9d911f0bd5a03987b49bb19bd0d62f7fa9ac3ca9f234e80ada3c4dbdd619705b9'
- '04b4c86f5afeab6170ad1b7b9937fa775a920c78719a33b213f7f8924e4e905709335307c38b8d5d9c127dd8c7000ddbe740b77f1ddfb68035819b7b4cf2b1e4'
- '6d2799171058b45ff4205441ad222893ebe2fce5c5c71c9c52c97efc95e4cad65d66d390b6a554ce7a2ce505ceba7431d18f79f2c2c1101addccee55141d4a66'
- '4ee69302de1cec37e4bf4c6a5525d887392f8f733ae8a95a54021f6531741e95baef31da1538b45667a1b198cbbab3069678169069f9ba8db641d603ebb3735b'
- '77e23f0c116ae5a087553edb2754df172b2c4fe5bc346356abe0e1f2acfb41a346d06d87b0569102ca4ac9356e189198c0c74476cb35f1b62773a956cb6a1e04'
- '8e5eb4e24fad4644a66eb52c95a90a82f01df0af6e57208ad61cb0859dd4425e623e75d93846e8fc3235370a88d93a1d27a512dc4e559bedfe3249404797838b'
- '7c9f8e7ce7451e7aa852998ffcd3ca95c08083c313dc8dcf0877969ef23d9da6f69c60bb1e652387a223da6e690524fa094bfbaed14d8bdae2853e68530b2f82'
- '891d3ea36d966114ff1f79c3619675a46b30b68def16ab426f2dee00bd0768f82ca0ee26acd7adedd379f25613e309ec9dfaed4e8a5d3f3e4fa7e8d845f55b18'
- 'd074c794796d17d77eed7c34201d93d7ef3f1322fe1ea4a2ddd7137fae884d49f94f465ee39cfd8346b026142668a41f5a8671e521409505dd6d002f71c0eebc'
- '5886eb35732c3850071ea903388861b40a50c59a11fc0384ed38413538baf8714d481cb21d23969c997701e9165972a73a7fd80cb49add4b611d5bcf953dff56')
-b2sums=('d8411e6808b335ccd551349a10c983b9448a357e73273fa6c30a07785e27feffed0224950ee98b668712c33f6739a9b006e5043b7dfd014f48dba9fd449b3354'
- 'af530258d9f7ca4f1bd1c6c344eb385e766e465c9341dd08797676165f67bbb82d3fd549ed7559dc12fb8c9c4db5e04fa6ec7ab729ec1467f5e8bce469ff5398'
- 'SKIP'
- '8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904'
- 'fa75566a2ac591fc0c296812f907bfe3fd67f2ee90d3762f0fcae6427df0dfd6260238f5af4fc6b74a76eccfc264db2259db70f8c533871e8b58f37b91a90657'
- 'f6aaccf4b5a070b05e8eb58d5df60c8798d9b9de2f9febf1417a1ae178431be9a69890a7107d3ca100a439551b4949b937ba400ac36bb9eebaf7e1fdb61dc9d3'
- '891719a70d14f29f6ec9e9cfe83cbf48abb5aedfaf5a3a02efaf9cf1dcca0c14f42f8e4486425df12c72001d7811b0f6030520bad2d83b4885f13d110ab2ae0f'
- '899ecf699815216984905a7abdd3385890c6309f3ef7813778bedf63c15d42ab12c59532d45033a11838f990744417100eb13048b53cee5cdf46440af61b475d'
- 'e61378139f2da0d4185e67436d87a023600a075b4258234e818fe7f591bdb5d363713d29d250263df6074f5d37deed269c067983ee6bd322f2f7d0ee710bc452'
- '8c211a1bbef20ff361c53735b91cc05660f9d94e7d8a937d903c061a1ec9c96ec2c37f0ef5e954cd4aac7f7962489f5a7a0507e44c781a7671211a9530dccb5b'
- '7f48bb1747c732c597a749c851a6cac46de844c1727f3d5edca35249df845a0f578780e8bcda7d86ad2c4a62a9a2a0bc7e1cfab9b7b93d7b5415bb5817d73346'
- 'ddacbab89d0fd7831149594487559bb6bac1464b2b5620641043306fabfc37800db8c6d87a833c70ec35c699ea2f35cf09d34028ec7982a94686e8cd97b73300'
- '99bf35c4042fd5105a3b3b7f71b0aeb18db7811da4ed4481ffec485258619c30d33b08633f9a1c762d383e3bf0191053be9b88b9a4c142350186c6df1261d1f7'
- 'd45b224c36eda139ca6ad9e4c6c04282724b264dd36a0b3ba904d71476b83e02963c8cadf1f1e1233955071d133dc0defa746740fa08b26398c489fbf6ba89a0'
- '644c071dc4fbbccaa64b0b1babcad60395ffce1a7a317a6f5380eff44cbb886be5f29156a8e967ab02b508a33954fcf5602606b43362cc3bb1936a8cfc3a3c07'
- '937d507a0ffd9a87a9b008b01f26d4941dc8ee9c3f263fff8d782c8f29c933c8bbd10da9c44ad2ca106befa9db666062d55ed5d7fb793d758c4c8777f5e018c7')
-validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') # Matt Caswell <matt at openssl.org>
-_arch_list=(AARCH64 IA32 X64)
-_build_type=RELEASE
-_build_plugin=GCC5
-
-prepare() {
- # patch to be able to use brotli 1.0.9
- patch -Np1 -d $pkgbase-$pkgbase-stable$pkgver -i ../$pkgbase-202202-brotli.patch
- # reintroduce include accidentally removed in https://github.com/tianocore/edk2/commit/b47575801e1903e8b316d01840572ce2681cf2c6
- patch -Np1 -d $pkgbase-$pkgbase-stable$pkgver -i ../$pkgbase-202202-ovmfpkgia32.patch
-
- cd $pkgbase-$pkgbase-stable$pkgver
-
- # 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() {
- local _arch
- # shared targets for all
- local _common_args=(
- -b "$_build_type"
- -n "$(nproc)"
- -t "$_build_plugin"
- )
- # shared targets for all EFI binaries
- local _efi_args=(
- -D NETWORK_IP6_ENABLE
- -D TPM_CONFIG_ENABLE
- -D TPM_ENABLE
- )
- # shared targets x86_64 and i686
- local _x86_args=(
- -D FD_SIZE_2MB
- -D HTTP_BOOT_ENABLE
- -D TLS_ENABLE
- )
-
- cd $pkgbase-$pkgbase-stable$pkgver
- export GCC5_IA32_PREFIX="x86_64-linux-gnu-"
- export GCC5_X64_PREFIX="x86_64-linux-gnu-"
- export GCC5_AARCH64_PREFIX="aarch64-linux-gnu-"
- 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" "${_common_args[@]}"
- # ovmf
- if [[ "$_arch" == IA32 ]]; then
- echo "Building ovmf ($_arch) with secure boot support"
- OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \
- -a "$_arch" \
- "${_common_args[@]}" \
- "${_efi_args[@]}" \
- "${_x86_args[@]}" \
- -D EXCLUDE_SHELL_FROM_FD \
- -D LOAD_X64_ON_IA32_ENABLE \
- -D SECURE_BOOT_ENABLE \
- -D SMM_REQUIRE
- mv -v Build/Ovmf{Ia32,IA32-secure}
- echo "Building ovmf ($_arch) with CSM support"
- OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \
- -a "${_arch}" \
- "${_common_args[@]}" \
- "${_efi_args[@]}" \
- "${_x86_args[@]}" \
- -D CSM_ENABLE \
- -D LOAD_X64_ON_IA32_ENABLE
- mv -v Build/Ovmf{Ia32,IA32-csm}
- echo "Building ovmf ($_arch) default"
- OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \
- -a "$_arch" \
- "${_common_args[@]}" \
- "${_efi_args[@]}" \
- "${_x86_args[@]}" \
- -D LOAD_X64_ON_IA32_ENABLE
- 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" \
- "${_common_args[@]}" \
- "${_efi_args[@]}" \
- "${_x86_args[@]}" \
- -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}" \
- "${_common_args[@]}" \
- "${_efi_args[@]}" \
- "${_x86_args[@]}" \
- -D CSM_ENABLE
- mv -v Build/OvmfX64{,-csm}
- echo "Building ovmf (${_arch}) without secure boot"
- OvmfPkg/build.sh -p OvmfPkg/OvmfPkg$_arch.dsc \
- -a "$_arch" \
- "${_common_args[@]}" \
- "${_efi_args[@]}" \
- "${_x86_args[@]}"
- fi
- if [[ "$_arch" == AARCH64 ]]; then
- echo "Building ArmVirtPkg ($_arch) with secure boot"
- BaseTools/BinWrappers/PosixLike/build -p ArmVirtPkg/ArmVirtQemu.dsc \
- -a "$_arch" \
- "${_common_args[@]}" \
- "${_efi_args[@]}" \
- -D NETWORK_HTTP_BOOT_ENABLE \
- -D NETWORK_TLS_ENABLE \
- -D SECURE_BOOT_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() {
- local _arch=AARCH64
-
- pkgdesc="Firmware for Virtual Machines (aarch64)"
- url="https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg"
-
- cd $pkgbase-$pkgbase-stable$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() {
- 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'
-
- pkgdesc="EDK2 UEFI Shell"
- provides=(uefi-shell)
-
- cd $pkgbase-$pkgbase-stable$pkgver
- 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() {
- local _arch
-
- 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-$pkgbase-stable$pkgver
- # 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/"
-}
Copied: edk2/repos/extra-any/PKGBUILD (from rev 442786, edk2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-16 21:45:01 UTC (rev 442787)
@@ -0,0 +1,291 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Alexander Epaneshnikov <alex19ep at archlinux.org>
+
+_brotli_ver=1.0.9
+_openssl_ver=1.1.1n
+pkgbase=edk2
+pkgname=(edk2-armvirt edk2-shell edk2-ovmf)
+pkgver=202202
+pkgrel=2
+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=(
+ $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
+ 50-edk2-ovmf-i386-secure.json
+ 50-edk2-ovmf-x86_64-secure.json
+ 60-edk2-ovmf-i386.json
+ 60-edk2-ovmf-x86_64.json
+ 60-edk2-armvirt-aarch64.json
+ 70-edk2-ovmf-i386-csm.json
+ 70-edk2-ovmf-x86_64-csm.json
+ 80-edk2-ovmf-ia32-on-x86_64-secure.json
+ 81-edk2-ovmf-ia32-on-x86_64.json
+ 82-edk2-ovmf-ia32-on-x86_64-csm.json
+ $pkgbase-202202-brotli.patch
+ $pkgbase-202202-ovmfpkgia32.patch
+)
+sha512sums=('200690a4867331de06e0478869b85577bc510213ebe679f2103160efb84d94c82ac8481ef1f15c3e42c1e9f22b7c5ef0d6c8f2c655bce7702ce843551cf9bb83'
+ '1937796736613dcf4105a54e42ecb61f95a1cea74677156f9459aea0f2c95159359e766089632bf364ee6b0d28d661eb9957bce8fecc9d2436378d8d79e8d0a4'
+ 'SKIP'
+ 'b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5'
+ '603cae145a87bae371bd069d05128beebddb7048e78b93650b19c44b86b2d27cabbcf3bc4c0b2384b862f32383ce7a914a10fc0ad564632bcadd6e4f9389fede'
+ '3e10bdc9ad13aadbd4111230fb8f37d5f16306aeb7bce2af5ec31c1e2b5adea26d5875cd0d7070ea82eca7546ecbacc8c195ed68425428bf6d2533b58e307b2d'
+ '56d0bffd6dd7be79709f66bcfba2112e8ef6208de9b5018e90251e3ba68b37f9d911f0bd5a03987b49bb19bd0d62f7fa9ac3ca9f234e80ada3c4dbdd619705b9'
+ '04b4c86f5afeab6170ad1b7b9937fa775a920c78719a33b213f7f8924e4e905709335307c38b8d5d9c127dd8c7000ddbe740b77f1ddfb68035819b7b4cf2b1e4'
+ '6d2799171058b45ff4205441ad222893ebe2fce5c5c71c9c52c97efc95e4cad65d66d390b6a554ce7a2ce505ceba7431d18f79f2c2c1101addccee55141d4a66'
+ '4ee69302de1cec37e4bf4c6a5525d887392f8f733ae8a95a54021f6531741e95baef31da1538b45667a1b198cbbab3069678169069f9ba8db641d603ebb3735b'
+ '77e23f0c116ae5a087553edb2754df172b2c4fe5bc346356abe0e1f2acfb41a346d06d87b0569102ca4ac9356e189198c0c74476cb35f1b62773a956cb6a1e04'
+ '8e5eb4e24fad4644a66eb52c95a90a82f01df0af6e57208ad61cb0859dd4425e623e75d93846e8fc3235370a88d93a1d27a512dc4e559bedfe3249404797838b'
+ '7c9f8e7ce7451e7aa852998ffcd3ca95c08083c313dc8dcf0877969ef23d9da6f69c60bb1e652387a223da6e690524fa094bfbaed14d8bdae2853e68530b2f82'
+ '891d3ea36d966114ff1f79c3619675a46b30b68def16ab426f2dee00bd0768f82ca0ee26acd7adedd379f25613e309ec9dfaed4e8a5d3f3e4fa7e8d845f55b18'
+ 'd074c794796d17d77eed7c34201d93d7ef3f1322fe1ea4a2ddd7137fae884d49f94f465ee39cfd8346b026142668a41f5a8671e521409505dd6d002f71c0eebc'
+ '5886eb35732c3850071ea903388861b40a50c59a11fc0384ed38413538baf8714d481cb21d23969c997701e9165972a73a7fd80cb49add4b611d5bcf953dff56')
+b2sums=('d8411e6808b335ccd551349a10c983b9448a357e73273fa6c30a07785e27feffed0224950ee98b668712c33f6739a9b006e5043b7dfd014f48dba9fd449b3354'
+ 'af530258d9f7ca4f1bd1c6c344eb385e766e465c9341dd08797676165f67bbb82d3fd549ed7559dc12fb8c9c4db5e04fa6ec7ab729ec1467f5e8bce469ff5398'
+ 'SKIP'
+ '8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904'
+ 'fa75566a2ac591fc0c296812f907bfe3fd67f2ee90d3762f0fcae6427df0dfd6260238f5af4fc6b74a76eccfc264db2259db70f8c533871e8b58f37b91a90657'
+ 'f6aaccf4b5a070b05e8eb58d5df60c8798d9b9de2f9febf1417a1ae178431be9a69890a7107d3ca100a439551b4949b937ba400ac36bb9eebaf7e1fdb61dc9d3'
+ '891719a70d14f29f6ec9e9cfe83cbf48abb5aedfaf5a3a02efaf9cf1dcca0c14f42f8e4486425df12c72001d7811b0f6030520bad2d83b4885f13d110ab2ae0f'
+ '899ecf699815216984905a7abdd3385890c6309f3ef7813778bedf63c15d42ab12c59532d45033a11838f990744417100eb13048b53cee5cdf46440af61b475d'
+ 'e61378139f2da0d4185e67436d87a023600a075b4258234e818fe7f591bdb5d363713d29d250263df6074f5d37deed269c067983ee6bd322f2f7d0ee710bc452'
+ '8c211a1bbef20ff361c53735b91cc05660f9d94e7d8a937d903c061a1ec9c96ec2c37f0ef5e954cd4aac7f7962489f5a7a0507e44c781a7671211a9530dccb5b'
+ '7f48bb1747c732c597a749c851a6cac46de844c1727f3d5edca35249df845a0f578780e8bcda7d86ad2c4a62a9a2a0bc7e1cfab9b7b93d7b5415bb5817d73346'
+ 'ddacbab89d0fd7831149594487559bb6bac1464b2b5620641043306fabfc37800db8c6d87a833c70ec35c699ea2f35cf09d34028ec7982a94686e8cd97b73300'
+ '99bf35c4042fd5105a3b3b7f71b0aeb18db7811da4ed4481ffec485258619c30d33b08633f9a1c762d383e3bf0191053be9b88b9a4c142350186c6df1261d1f7'
+ 'd45b224c36eda139ca6ad9e4c6c04282724b264dd36a0b3ba904d71476b83e02963c8cadf1f1e1233955071d133dc0defa746740fa08b26398c489fbf6ba89a0'
+ '644c071dc4fbbccaa64b0b1babcad60395ffce1a7a317a6f5380eff44cbb886be5f29156a8e967ab02b508a33954fcf5602606b43362cc3bb1936a8cfc3a3c07'
+ '937d507a0ffd9a87a9b008b01f26d4941dc8ee9c3f263fff8d782c8f29c933c8bbd10da9c44ad2ca106befa9db666062d55ed5d7fb793d758c4c8777f5e018c7')
+validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') # Matt Caswell <matt at openssl.org>
+_arch_list=(AARCH64 IA32 X64)
+_build_type=RELEASE
+_build_plugin=GCC5
+
+prepare() {
+ # patch to be able to use brotli 1.0.9
+ patch -Np1 -d $pkgbase-$pkgbase-stable$pkgver -i ../$pkgbase-202202-brotli.patch
+ # reintroduce include accidentally removed in https://github.com/tianocore/edk2/commit/b47575801e1903e8b316d01840572ce2681cf2c6
+ patch -Np1 -d $pkgbase-$pkgbase-stable$pkgver -i ../$pkgbase-202202-ovmfpkgia32.patch
+
+ cd $pkgbase-$pkgbase-stable$pkgver
+
+ # 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() {
+ local _arch
+ # shared targets for all
+ local _common_args=(
+ -b "$_build_type"
+ -n "$(nproc)"
+ -t "$_build_plugin"
+ )
+ # shared targets for all EFI binaries
+ local _efi_args=(
+ -D NETWORK_IP6_ENABLE
+ -D TPM_CONFIG_ENABLE
+ -D TPM1_ENABLE
+ -D TPM2_ENABLE
+ )
+ # shared targets x86_64 and i686
+ local _x86_args=(
+ -D FD_SIZE_2MB
+ -D HTTP_BOOT_ENABLE
+ -D TLS_ENABLE
+ )
+
+ cd $pkgbase-$pkgbase-stable$pkgver
+ export GCC5_IA32_PREFIX="x86_64-linux-gnu-"
+ export GCC5_X64_PREFIX="x86_64-linux-gnu-"
+ export GCC5_AARCH64_PREFIX="aarch64-linux-gnu-"
+ 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" "${_common_args[@]}"
+ # ovmf
+ if [[ "$_arch" == IA32 ]]; then
+ echo "Building ovmf ($_arch) with secure boot support"
+ OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \
+ -a "$_arch" \
+ "${_common_args[@]}" \
+ "${_efi_args[@]}" \
+ "${_x86_args[@]}" \
+ -D EXCLUDE_SHELL_FROM_FD \
+ -D LOAD_X64_ON_IA32_ENABLE \
+ -D SECURE_BOOT_ENABLE \
+ -D SMM_REQUIRE
+ mv -v Build/Ovmf{Ia32,IA32-secure}
+ echo "Building ovmf ($_arch) with CSM support"
+ OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \
+ -a "${_arch}" \
+ "${_common_args[@]}" \
+ "${_efi_args[@]}" \
+ "${_x86_args[@]}" \
+ -D CSM_ENABLE \
+ -D LOAD_X64_ON_IA32_ENABLE
+ mv -v Build/Ovmf{Ia32,IA32-csm}
+ echo "Building ovmf ($_arch) default"
+ OvmfPkg/build.sh -p OvmfPkg/OvmfPkgIa32.dsc \
+ -a "$_arch" \
+ "${_common_args[@]}" \
+ "${_efi_args[@]}" \
+ "${_x86_args[@]}" \
+ -D LOAD_X64_ON_IA32_ENABLE
+ 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" \
+ "${_common_args[@]}" \
+ "${_efi_args[@]}" \
+ "${_x86_args[@]}" \
+ -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}" \
+ "${_common_args[@]}" \
+ "${_efi_args[@]}" \
+ "${_x86_args[@]}" \
+ -D CSM_ENABLE
+ mv -v Build/OvmfX64{,-csm}
+ echo "Building ovmf (${_arch}) without secure boot"
+ OvmfPkg/build.sh -p OvmfPkg/OvmfPkg$_arch.dsc \
+ -a "$_arch" \
+ "${_common_args[@]}" \
+ "${_efi_args[@]}" \
+ "${_x86_args[@]}"
+ fi
+ if [[ "$_arch" == AARCH64 ]]; then
+ echo "Building ArmVirtPkg ($_arch) with secure boot"
+ BaseTools/BinWrappers/PosixLike/build -p ArmVirtPkg/ArmVirtQemu.dsc \
+ -a "$_arch" \
+ "${_common_args[@]}" \
+ "${_efi_args[@]}" \
+ -D NETWORK_HTTP_BOOT_ENABLE \
+ -D NETWORK_TLS_ENABLE \
+ -D SECURE_BOOT_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() {
+ local _arch=AARCH64
+
+ pkgdesc="Firmware for Virtual Machines (aarch64)"
+ url="https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg"
+
+ cd $pkgbase-$pkgbase-stable$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() {
+ 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'
+
+ pkgdesc="EDK2 UEFI Shell"
+ provides=(uefi-shell)
+
+ cd $pkgbase-$pkgbase-stable$pkgver
+ 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() {
+ local _arch
+
+ 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-$pkgbase-stable$pkgver
+ # 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/"
+}
Deleted: edk2-202202-brotli.patch
===================================================================
--- edk2-202202-brotli.patch 2022-04-16 21:44:38 UTC (rev 442786)
+++ edk2-202202-brotli.patch 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,15 +0,0 @@
-diff -ruN a/BaseTools/Source/C/BrotliCompress/GNUmakefile b/BaseTools/Source/C/BrotliCompress/GNUmakefile
---- a/BaseTools/Source/C/BrotliCompress/GNUmakefile 2022-02-21 16:19:40.000000000 +0100
-+++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile 2022-04-07 13:13:20.119878689 +0200
-@@ -11,11 +11,9 @@
- OBJECTS = \
- BrotliCompress.o \
- brotli/c/common/platform.o \
-- brotli/c/common/shared_dictionary.o \
- brotli/c/common/constants.o \
- brotli/c/common/context.o \
- brotli/c/enc/command.o \
-- brotli/c/enc/compound_dictionary.o \
- brotli/c/enc/fast_log.o \
- brotli/c/common/dictionary.o \
- brotli/c/common/transform.o \
Copied: edk2/repos/extra-any/edk2-202202-brotli.patch (from rev 442786, edk2/trunk/edk2-202202-brotli.patch)
===================================================================
--- edk2-202202-brotli.patch (rev 0)
+++ edk2-202202-brotli.patch 2022-04-16 21:45:01 UTC (rev 442787)
@@ -0,0 +1,15 @@
+diff -ruN a/BaseTools/Source/C/BrotliCompress/GNUmakefile b/BaseTools/Source/C/BrotliCompress/GNUmakefile
+--- a/BaseTools/Source/C/BrotliCompress/GNUmakefile 2022-02-21 16:19:40.000000000 +0100
++++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile 2022-04-07 13:13:20.119878689 +0200
+@@ -11,11 +11,9 @@
+ OBJECTS = \
+ BrotliCompress.o \
+ brotli/c/common/platform.o \
+- brotli/c/common/shared_dictionary.o \
+ brotli/c/common/constants.o \
+ brotli/c/common/context.o \
+ brotli/c/enc/command.o \
+- brotli/c/enc/compound_dictionary.o \
+ brotli/c/enc/fast_log.o \
+ brotli/c/common/dictionary.o \
+ brotli/c/common/transform.o \
Deleted: edk2-202202-ovmfpkgia32.patch
===================================================================
--- edk2-202202-ovmfpkgia32.patch 2022-04-16 21:44:38 UTC (rev 442786)
+++ edk2-202202-ovmfpkgia32.patch 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1,10 +0,0 @@
-diff -ruN a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
---- a/OvmfPkg/OvmfPkgIa32.dsc 2022-02-21 16:19:40.000000000 +0100
-+++ b/OvmfPkg/OvmfPkgIa32.dsc 2022-04-07 14:09:58.762612496 +0200
-@@ -990,3 +990,6 @@
- #
- !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
-
-+!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE
-+ OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf
-+!endif
Copied: edk2/repos/extra-any/edk2-202202-ovmfpkgia32.patch (from rev 442786, edk2/trunk/edk2-202202-ovmfpkgia32.patch)
===================================================================
--- edk2-202202-ovmfpkgia32.patch (rev 0)
+++ edk2-202202-ovmfpkgia32.patch 2022-04-16 21:45:01 UTC (rev 442787)
@@ -0,0 +1,10 @@
+diff -ruN a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
+--- a/OvmfPkg/OvmfPkgIa32.dsc 2022-02-21 16:19:40.000000000 +0100
++++ b/OvmfPkg/OvmfPkgIa32.dsc 2022-04-07 14:09:58.762612496 +0200
+@@ -990,3 +990,6 @@
+ #
+ !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+
++!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE
++ OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf
++!endif
Deleted: edk2-ovmf.install
===================================================================
--- edk2-ovmf.install 2022-04-16 21:44:38 UTC (rev 442786)
+++ edk2-ovmf.install 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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 442786, edk2/trunk/edk2-ovmf.install)
===================================================================
--- edk2-ovmf.install (rev 0)
+++ edk2-ovmf.install 2022-04-16 21:45:01 UTC (rev 442787)
@@ -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 2022-04-16 21:44:38 UTC (rev 442786)
+++ edk2-shell.install 2022-04-16 21:45:01 UTC (rev 442787)
@@ -1 +0,0 @@
-# empty install file to satisfy makepkg
Copied: edk2/repos/extra-any/edk2-shell.install (from rev 442786, edk2/trunk/edk2-shell.install)
===================================================================
--- edk2-shell.install (rev 0)
+++ edk2-shell.install 2022-04-16 21:45:01 UTC (rev 442787)
@@ -0,0 +1 @@
+# empty install file to satisfy makepkg
More information about the arch-commits
mailing list