Skip to content
This repository has been archived by the owner on May 20, 2023. It is now read-only.

Commit

Permalink
upgpkg: edk2 202111-4: Rebuild to add S4 support.
Browse files Browse the repository at this point in the history
Add S4 support where possible.
Rename QEMU descriptor files to be able to distinguish them more clearly.
Standardize architecture description in QEMU descriptor files.
Add QEMU descriptor files for IA32 UEFI on x86_64 architecture.

git-svn-id: file:///srv/repos/svn-packages/svn@430410 eb2447ed-0c53-47e4-bac8-5bc4a241df78
  • Loading branch information
dvzrv authored and svntogit committed Dec 2, 2021
1 parent fb91ba8 commit a123cfd
Show file tree
Hide file tree
Showing 11 changed files with 153 additions and 33 deletions.
3 changes: 2 additions & 1 deletion trunk/50-edk2-ovmf-i386-secure.json
@@ -1,5 +1,5 @@
{
"description": "UEFI firmware for i386, with Secure Boot and SMM",
"description": "IA32 UEFI for i386, with Secure Boot and SMM",
"interface-types": [
"uefi"
],
Expand All @@ -24,6 +24,7 @@
],
"features": [
"acpi-s3",
"acpi-s4",
"requires-smm",
"secure-boot",
"verbose-dynamic"
Expand Down
3 changes: 2 additions & 1 deletion trunk/50-edk2-ovmf-x86_64-secure.json
@@ -1,5 +1,5 @@
{
"description": "UEFI firmware for x86_64, with Secure Boot and SMM",
"description": "x64 UEFI for x86_64, with Secure Boot and SMM",
"interface-types": [
"uefi"
],
Expand All @@ -24,6 +24,7 @@
],
"features": [
"acpi-s3",
"acpi-s4",
"amd-sev",
"requires-smm",
"secure-boot",
Expand Down
@@ -1,5 +1,5 @@
{
"description": "UEFI firmware for aarch64",
"description": "AA64 UEFI for aarch64",
"interface-types": [
"uefi"
],
Expand Down
3 changes: 2 additions & 1 deletion trunk/60-edk2-ovmf-i386.json
@@ -1,5 +1,5 @@
{
"description": "UEFI firmware for i386",
"description": "IA32 UEFI for i386",
"interface-types": [
"uefi"
],
Expand All @@ -25,6 +25,7 @@
],
"features": [
"acpi-s3",
"acpi-s4",
"verbose-dynamic"
],
"tags": [
Expand Down
3 changes: 2 additions & 1 deletion trunk/60-edk2-ovmf-x86_64.json
@@ -1,5 +1,5 @@
{
"description": "UEFI firmware for x86_64",
"description": "x64 UEFI for x86_64",
"interface-types": [
"uefi"
],
Expand All @@ -25,6 +25,7 @@
],
"features": [
"acpi-s3",
"acpi-s4",
"amd-sev",
"verbose-dynamic"
],
Expand Down
@@ -1,5 +1,5 @@
{
"description": "UEFI firmware for i386, with CSM",
"description": "IA32 UEFI for i386, with CSM",
"interface-types": [
"uefi"
],
Expand All @@ -25,6 +25,7 @@
],
"features": [
"acpi-s3",
"acpi-s4",
"verbose-dynamic"
],
"tags": [
Expand Down
@@ -1,5 +1,5 @@
{
"description": "UEFI firmware for x86_64, with CSM support",
"description": "x64 UEFI for x86_64, with CSM support",
"interface-types": [
"uefi"
],
Expand All @@ -25,6 +25,7 @@
],
"features": [
"acpi-s3",
"acpi-s4",
"amd-sev",
"verbose-dynamic"
],
Expand Down
35 changes: 35 additions & 0 deletions trunk/80-edk2-ovmf-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": [

]
}
34 changes: 34 additions & 0 deletions trunk/81-edk2-ovmf-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": [

]
}
34 changes: 34 additions & 0 deletions trunk/82-edk2-ovmf-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": [

]
}
63 changes: 37 additions & 26 deletions trunk/PKGBUILD
Expand Up @@ -6,48 +6,59 @@ _openssl_ver=1.1.1l
pkgbase=edk2
pkgname=(edk2-armvirt edk2-shell edk2-ovmf)
pkgver=202111
pkgrel=3
pkgrel=4
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"
"${pkgbase}-202102-brotli-1.0.9.patch"
"50-edk2-ovmf-i386-csm.json"
"50-edk2-ovmf-i386-secure.json"
"50-edk2-ovmf-x86_64-csm.json"
"50-edk2-ovmf-x86_64-secure.json"
"60-edk2-ovmf-i386.json"
"60-edk2-ovmf-x86_64.json"
"70-edk2-armvirt-aarch64.json")
source=(
"$pkgbase-$pkgver.tar.gz::https://github.com/tianocore/${pkgbase}/archive/${pkgbase}-stable${pkgver}.tar.gz"
"https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz"{,.asc}
"brotli-${_brotli_ver}.tar.gz::https://github.com/google/brotli/archive/v${_brotli_ver}.tar.gz"
"${pkgbase}-202102-brotli-1.0.9.patch"
"50-edk2-ovmf-i386-secure.json"
"50-edk2-ovmf-x86_64-secure.json"
"60-edk2-ovmf-i386.json"
"60-edk2-ovmf-x86_64.json"
"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"
)
sha512sums=('212a178b2e79ab42bcf0d2d12e8769da28bc3ed3f2d4c905a85c0d23d2675500c1c05b5b645eac9c4de97df974dcfc809efd06385016331ca02944e58558954a'
'd9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0'
'SKIP'
'b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5'
'fe0fd592d4b436a35a49a74ad5dd989311b297b9abacb13ed8d4da0986169c91ffbc34cef0f2d52bf40c833d252f6e65311ab0e4e4ca6798390febfb9a787a4a'
'919121116542511d0c283473e160ba09afd6807cb0203be69109dc00ed052e90b4b4d1a0603e30c52d35bfb715d8cb3e2087f3a5b22083009a984d4076d4e73d'
'55e4187b11b27737f61e528c02ff43b9381c0cb09140e803531616766f9cb9401115d88d946b56171784cc028f9571279640eb39b6a9fa8e02ec0c8d1b036a3e'
'4b6ad05e38fb661cb71693d640ed5b5e12701e6ae7a9074259493f6126992af4319bb99bb854cf7effd470010ddf532a8add07010f2becaae4f950651943598d'
'a1236585b30d720540de2e9527d8c90ff2d428e800b3da545b23461dc698dc91fe441b62bb8cbca76e08f4ec1eb485619e9ab26157deb06e7fb33e7f5f9dd8b6'
'c81e072aabfb01d29cf5194111524e2c4c8684979de6b6793db10299c95bb94f7b1d0a98b057df0664d7a894a2b40e9b4c3576112fae400a95eaf5fe5fc9369b'
'2030dc1d49d56fce8af56c5777fd40f04041e39ff806dd8c021e161227bdd646982024db6758230b8332dc68f16bc6918e1d54ad3c022e21e148d6b65ea778b3'
'fa6d36a3c0225e4a5df532e77b18a035d65b0856d6a48875def5007de3f83d8d1d202d5b91e887d424112a3fa377dc9a09bdf44e5fcdccc36854675f95a211a4')
'603cae145a87bae371bd069d05128beebddb7048e78b93650b19c44b86b2d27cabbcf3bc4c0b2384b862f32383ce7a914a10fc0ad564632bcadd6e4f9389fede'
'3e10bdc9ad13aadbd4111230fb8f37d5f16306aeb7bce2af5ec31c1e2b5adea26d5875cd0d7070ea82eca7546ecbacc8c195ed68425428bf6d2533b58e307b2d'
'56d0bffd6dd7be79709f66bcfba2112e8ef6208de9b5018e90251e3ba68b37f9d911f0bd5a03987b49bb19bd0d62f7fa9ac3ca9f234e80ada3c4dbdd619705b9'
'04b4c86f5afeab6170ad1b7b9937fa775a920c78719a33b213f7f8924e4e905709335307c38b8d5d9c127dd8c7000ddbe740b77f1ddfb68035819b7b4cf2b1e4'
'6d2799171058b45ff4205441ad222893ebe2fce5c5c71c9c52c97efc95e4cad65d66d390b6a554ce7a2ce505ceba7431d18f79f2c2c1101addccee55141d4a66'
'4ee69302de1cec37e4bf4c6a5525d887392f8f733ae8a95a54021f6531741e95baef31da1538b45667a1b198cbbab3069678169069f9ba8db641d603ebb3735b'
'77e23f0c116ae5a087553edb2754df172b2c4fe5bc346356abe0e1f2acfb41a346d06d87b0569102ca4ac9356e189198c0c74476cb35f1b62773a956cb6a1e04'
'8e5eb4e24fad4644a66eb52c95a90a82f01df0af6e57208ad61cb0859dd4425e623e75d93846e8fc3235370a88d93a1d27a512dc4e559bedfe3249404797838b'
'7c9f8e7ce7451e7aa852998ffcd3ca95c08083c313dc8dcf0877969ef23d9da6f69c60bb1e652387a223da6e690524fa094bfbaed14d8bdae2853e68530b2f82'
'891d3ea36d966114ff1f79c3619675a46b30b68def16ab426f2dee00bd0768f82ca0ee26acd7adedd379f25613e309ec9dfaed4e8a5d3f3e4fa7e8d845f55b18')
b2sums=('9eed28ae063982b7c44311caf414ab967355d0a1ab09201678bed96e45a71215a0f8dde3d29710d2634f05c8c359cc07ac82045c5f4bd6824300b6e6d24ca005'
'9e8739015db63a013c05587e3d164d67c3f65f1f6c5fc75e4592bcd038c036cde88a7bc95fbc1f1b4ed876f6124ca4dabcd4f5dbb45d1b84299f2efe1a59431a'
'SKIP'
'8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904'
'eb549f711aa31b0a46f3e9b74076e52e0e1734045c227f410016c6de46a3b7b2959287d49b5ef853236c57fa3b3143b1da31fd9ef6fd592ba22ba9af15941a76'
'66d21917c6fc2f9d1f35c986296ad40bdac52707f44becf2c8b11b21f873110d81700ff933fcb48812be0ebb11259faf38b1d7293ebd6ccd5f34f1dff187675c'
'96502e0c8b748d6db0fcd4e767264f778319b4517fe4bf2e6e4f92e35bf09f388fb7f39c349e66444368820c31a6ff76e952053ac9f9696a59f7f0a929a650d1'
'c539f053bfc1623b1b195a1ec25cb6be30745149ad4bbf4e3438f3f7793fbfe814583f3410c4ff5d8a33f087a9fc425065f22355c4453cb0cc126ab60a52ffb2'
'4a438a2f7726c6a9ff1a40506ddb5f724d5c220b57997784fefe4a180e249b4f1e9adc8e353e7dbc492a1bde0165442d873409656ce2fbbc9fd35c690b7692e4'
'5da17cfe08368542f04b47121b296c56a6702233207b1cdb822eea42c8fb43d8856e86d19122621caf97e4332814c839204d7ce191041128ee3921b23f137bb6'
'1b935f3ad0bd3f10a90430a2873bf592950e9c49c828b50bb1ae48634cee01cc571aeff1c5b4695e0b4faa6274afc0a92fdcc88e283029298bba5e11b2bd2904'
'2fd510c533913bbd13fa31b3fdc8c4435bb3dee4ae8d34a516344da7a31ee036b23ac21e09b59b11f507520abeea89271601228f485ee80866bade0140c81742')
'fa75566a2ac591fc0c296812f907bfe3fd67f2ee90d3762f0fcae6427df0dfd6260238f5af4fc6b74a76eccfc264db2259db70f8c533871e8b58f37b91a90657'
'f6aaccf4b5a070b05e8eb58d5df60c8798d9b9de2f9febf1417a1ae178431be9a69890a7107d3ca100a439551b4949b937ba400ac36bb9eebaf7e1fdb61dc9d3'
'891719a70d14f29f6ec9e9cfe83cbf48abb5aedfaf5a3a02efaf9cf1dcca0c14f42f8e4486425df12c72001d7811b0f6030520bad2d83b4885f13d110ab2ae0f'
'899ecf699815216984905a7abdd3385890c6309f3ef7813778bedf63c15d42ab12c59532d45033a11838f990744417100eb13048b53cee5cdf46440af61b475d'
'e61378139f2da0d4185e67436d87a023600a075b4258234e818fe7f591bdb5d363713d29d250263df6074f5d37deed269c067983ee6bd322f2f7d0ee710bc452'
'8c211a1bbef20ff361c53735b91cc05660f9d94e7d8a937d903c061a1ec9c96ec2c37f0ef5e954cd4aac7f7962489f5a7a0507e44c781a7671211a9530dccb5b'
'7f48bb1747c732c597a749c851a6cac46de844c1727f3d5edca35249df845a0f578780e8bcda7d86ad2c4a62a9a2a0bc7e1cfab9b7b93d7b5415bb5817d73346'
'ddacbab89d0fd7831149594487559bb6bac1464b2b5620641043306fabfc37800db8c6d87a833c70ec35c699ea2f35cf09d34028ec7982a94686e8cd97b73300'
'99bf35c4042fd5105a3b3b7f71b0aeb18db7811da4ed4481ffec485258619c30d33b08633f9a1c762d383e3bf0191053be9b88b9a4c142350186c6df1261d1f7'
'd45b224c36eda139ca6ad9e4c6c04282724b264dd36a0b3ba904d71476b83e02963c8cadf1f1e1233955071d133dc0defa746740fa08b26398c489fbf6ba89a0')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') # Matt Caswell <matt@openssl.org>
_arch_list=(AARCH64 IA32 X64)
_build_type=RELEASE
Expand Down

0 comments on commit a123cfd

Please sign in to comment.