Commit Graph

202 Commits

Author SHA1 Message Date
Gerd Hoffmann 0d524109ab refresh and remove patches for edk2-stable202211
dropped, patch merged upstream:
 - 0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch

dropped, simliar functionality merged upstream:
 - 0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch
 - 0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch
 - 0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch
 - 0011-ArmVirtPkg-set-early-hello-message-RH-only.patch

dropped, patch was backported:
 - 0022-OvmfPkg-QemuVideoDxe-fix-bochs-mode-init.patch

all other patches are refreshed.
2022-11-25 11:27:20 +01:00
Gerd Hoffmann e5b4520ec6 update to edk2-stable202211 2022-11-25 11:27:20 +01:00
Gerd Hoffmann c270beaf29 simplify shell iso build 2022-11-25 11:25:09 +01:00
Gerd Hoffmann 8e960a72f3 json: the big renumbering
renumber files:
  30-* secure boot supported and enabled
  40-* secure boot supported but disabled
  50-* secure boot not supported
  60-* stateless cc builds

see also:
  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=2132951
2022-11-25 11:23:53 +01:00
Gerd Hoffmann aac8fd18e1 json: drop edk2-ovmf-cc.json 2022-11-25 11:23:47 +01:00
Gerd Hoffmann e1a8a9caa1 rewrite build
Use edk2 build helper script from
https://gitlab.com/kraxel/edk2-build-config
2022-11-25 11:23:09 +01:00
Gerd Hoffmann 1a65006a44 update changelog 2022-09-20 09:55:00 +02:00
Gerd Hoffmann dbfecdcc11 add stdvga fix 2022-09-20 09:27:50 +02:00
Gerd Hoffmann ea0f0cbf62 add 4m builds 2022-09-20 09:22:56 +02:00
Gerd Hoffmann 215837fa58 update edk2 + openssl 2022-09-19 19:30:47 +02:00
Gerd Hoffmann a72f330bec disable two patches
- comment out patch #4 (bug 2116534 workaround)
- comment out patch #12 (bug 2114858 workaround)

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2022-08-18 07:12:54 +02:00
Fedora Release Engineering c8e2292f41 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 01:39:25 +00:00
Gerd Hoffmann 3a213ee2a1 swap stack fix patch 2022-06-10 15:28:30 +02:00
Gerd Hoffmann 729059caf6 - fix PcdResizeXterm patch.
- minor specfile cleanup.
- add 0021-OvmfPkg-Sec-fix-stack-switch.patch
- Resolves rhbz#2093745
2022-06-08 17:17:58 +02:00
Cole Robinson e702618f40 Fix %check section on EPEL/centos stream
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2022-06-02 11:29:35 -04:00
Gerd Hoffmann f37232bc0f update changelog 2022-05-31 09:14:01 +02:00
Gerd Hoffmann 19b27c9c59 add amdsev and inteltdx builds 2022-05-31 09:14:00 +02:00
Gerd Hoffmann 35498843ac drop qosb
not needed any more now that we use virt-firmware instead
2022-05-31 09:14:00 +02:00
Gerd Hoffmann 2e3c3cc632 drop gcc12 fixes
merged upstream
2022-05-31 09:14:00 +02:00
Gerd Hoffmann e7d0727301 update to new edk2 stable tag 2022-05-31 09:14:00 +02:00
Gerd Hoffmann 08f2354cd2 Stop builds on armv7 2022-05-09 10:42:07 +02:00
Gerd Hoffmann bd850390c7 switch to virt-firmware for secure boot key enrollment 2022-04-19 17:21:15 +02:00
Gerd Hoffmann 01cb3b8d22 iasl is gone on i686, so stop building there 2022-04-07 07:43:08 +02:00
Gerd Hoffmann 8d8a395ac1 Fix TPM build options 2022-04-07 07:31:34 +02:00
Thierry Vignaud 6e680c0edf Make "%define build_ovmf 0" works on Fedora when testing 2022-04-04 15:28:44 -04:00
Thierry Vignaud 4f0dc9a19d Fix installing AAVMF32 if aarch64 is disabled (v2) 2022-04-04 15:28:44 -04:00
Gerd Hoffmann e3d786aa1d add gcc12 fixes
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2022-03-24 13:01:23 +01:00
Gerd Hoffmann ced5d89940 Update to edk2-stable202202 2022-03-23 09:16:49 +01:00
Richard W.M. Jones 78c770f92f Add undefine _auto_set_build_flags 2022-01-21 12:45:59 +00:00
Fedora Release Engineering 6d1cf6c642 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 01:39:04 +00:00
Gerd Hoffmann ee5593d9cc add microvm build
Update spec file to build microvm image for fedora.
Add patch which adds rh-only PcdResizeXterm variable.
Add firmware description json file.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-12-06 14:07:39 +01:00
Gerd Hoffmann 93714fc441 add sev fix
https://www.mail-archive.com/devel@edk2.groups.io/msg40029.html

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-12-06 14:05:56 +01:00
Gerd Hoffmann 5eb552e5ee rebase to edk2-stable202111
Two patches need a refresh (context changes).

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-12-06 14:05:00 +01:00
Daniel P. Berrangé 11416716fe Drop glibc strcmp workaround
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-12-06 10:26:36 +00:00
Daniel P. Berrangé e46e2faf57 Add temp workaround for glibc bug in strmp in koji
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-12-03 15:44:42 +00:00
Daniel P. Berrangé e6c2deea6f Drop customized splash screen boot logo
Contrary to the description in the patch, the openSSL license terms do
not require us to modify the splash screen boot logo. This boot logo
is not considered advertizing material, and the other attribution
requirement in the license is satisfied by shipping the complete
corresponding source.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-11-30 11:20:25 +00:00
Daniel P. Berrangé b20b83c1a2 Fix qemu packaging conditionals for ELN builds
In ELN builds %{rhel} is defined and %{fedora} is unset

This causes EDK to assume the RHEL qemu-kvm packaging scheme.

This is invalid for ELN, however, because it still follows the
Fedora packaging scheme for QEMU.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-09-01 18:40:04 +01:00
Fedora Release Engineering d18839888a - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 21:41:20 +00:00
Cole Robinson ea915e13bc edk2-20210527gite1999b264f1f-1.fc35
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-20 18:29:15 -04:00
Cole Robinson 0898162826 Revive patch that fixes cross builds
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-20 18:28:05 -04:00
Cole Robinson 39f1a6ce78 f
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-20 13:50:42 -04:00
Cole Robinson 00a2012ad1 spec: Add disable_werror knob
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-20 12:37:29 -04:00
Cole Robinson e12f5e0a08 Re-add descriptor file for non secureboot x86_64 ovmf
We lost this in the RHEL sync, but we should still ship it

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-20 12:37:29 -04:00
Cole Robinson 2fb8072ecc spec: Merge %build and %install with RHEL behavior
The fedora specific stuff stays the same, but the x86_64 and
aarch64 builds look different but should be identical, except for
some additional builds and filenames

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-15 19:37:36 -04:00
Cole Robinson 0c0d315499 spec: Big syntax merge with RHEL
* Simplify build conditionals
* Use less globbing in %files list
* Merge package descriptions and metadata from RHEL
* Separate out fedora specific bits from common bits shared with RHEL
* Lots of small syntax changes to move closer to RHEL package

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-15 16:59:41 -04:00
Cole Robinson 6afa0e02ef spec: use RHEL style inline build_iso
RHEL build-iso is not an external script, it's inline in the spec,
and uses mtools instead of qemu-img

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-15 16:41:31 -04:00
Cole Robinson 7bc8400912 spec: Use RHEL style ovmf-vars-generator bundle
RHEL does not bundle the source archive, but just a copy of the
script. Use that model and the ovmf-vars-generator syntax RHEL uses.

This part of an effort to make it easier to share edk2 packaging
across Fedora and RHEL

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-15 16:11:41 -04:00
Cole Robinson 55d0676cf5 spec: Drop old python2 compat
python3 is the default for a while, so it doesn't need this anymore
AFAIK

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-15 16:08:05 -04:00
Cole Robinson 59c3cdcc1b Sync release with centos 9 stream edk2 content
* The openssl archive is preprocessed, so drop all the helper scripts.
* Split binary is removed
* Change %setup to handle centos 9 formatted patches

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-15 16:08:02 -04:00
Jiri Kucera 50204b404d Replace genisoimage with xorriso
genisoimage from cdrkit has no upstream activity for years.
Its alternative, xorriso from libisoburn, has vivid upstream.
2021-06-14 21:51:32 +02:00
Fedora Release Engineering e8ccc21099 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 04:20:12 +00:00
Tom Stellard 9249e25682 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2020-12-19 06:29:03 +00:00
Cole Robinson 8f1507e2df Update to git snapshot of qosb
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2020-12-07 11:32:19 -05:00
Cole Robinson 0ea4217ca6 Increase verbosity of secureboot output
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2020-12-07 11:32:18 -05:00
Cole Robinson 6a1f1a89ff spec: Use 'find' to locate a host kernel
Using 'rpm' doesn't work in mock roots if rpm db defaults are different

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2020-12-07 11:31:58 -05:00
Cole Robinson 032154634a Really fix TPM breakage (bz 1897367)
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2020-12-03 11:38:26 -05:00
Cole Robinson ce201154d6 Fix openssl usage, unbreak TPM (bz 1897367)
https://bugzilla.redhat.com/show_bug.cgi?id=1897367

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2020-11-24 11:21:46 -05:00
Cole Robinson fdb3e75601 Update to edk2 202008 stable 2020-09-16 11:43:13 -04:00
Peter Robinson 5237d70441 Tweaks for aarch64/ARMv7 builds, Minor cleanups 2020-09-12 12:26:56 +01:00
Cole Robinson a6540d4907 Fix build failures on rawhide
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2020-08-04 19:48:51 -04:00
Fedora Release Engineering cf3e37dba1 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 00:43:57 +00:00
Fedora Release Engineering 78cb77ff0d - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 16:19:15 +00:00
Tom Stellard 67c92c04f8 Use make macros
https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
2020-07-13 19:20:26 +00:00
Thierry Vignaud 37e7dafebe typo fix 2020-04-16 07:59:17 -04:00
Cole Robinson 0a0d6623b4 Update to stable-202002
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2020-04-13 19:43:35 -04:00
Fedora Release Engineering bccf75fc79 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 17:00:29 +00:00
Patrick Uiterwijk 1c6083caae Add fix for TLS_ENABLE rename as well
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2019-09-07 10:01:58 +01:00
Patrick Uiterwijk 966ede656a Update HTTP_BOOT to new name of the option
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2019-09-06 18:10:17 +01:00
Fedora Release Engineering 14344b0b10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-24 23:12:49 +00:00
Cole Robinson b9bff0b089 Re-enable secureboot enrollment
Follow Laszlo's suggestions from:
https://bugzilla.redhat.com/show_bug.cgi?id=1701710#c12
2019-07-15 13:15:28 -04:00
Cole Robinson eb71155bd5 spec: License is now BSD-2-Clause-Patent
https://bugzilla.redhat.com/show_bug.cgi?id=1701710#c12
2019-07-15 11:37:24 -04:00
Cole Robinson 167eadb8ba Give all json file categories a unique matchable prefix
So we can easily use wildcards to catch them for subpackage file lists

...and a bunch of other small cleanups to get things fully working
2019-07-12 15:20:23 -04:00
Cole Robinson 429a2758cc Copy VARS from plain ovmf/ to ovmf-ia32/
Apparently that works fine, but let's use explicit dirs
2019-07-12 14:08:23 -04:00
Kashyap Chamarthy 674b3c8a27 Ship the JSON firmware "descriptor files"
From version 4.1 (due in August 2019) onwards, QEMU ships the so-called
firmware "descriptor files".  These are small JSON files that describe
details about UEFI firmware binaries — such as the fimware binary path,
its architecture, supported machine type, NVRAM template and so forth.

You can see examples of these files from the QEMU upstream Git:
https://git.qemu.org/?p=qemu.git;a=tree;f=pc-bios/descriptors

    $> tree descriptors/
    descriptors/
    ├── 50-edk2-i386-secure.json
    ├── 50-edk2-x86_64-secure.json
    ├── 60-edk2-aarch64.json
    ├── 60-edk2-arm.json
    ├── 60-edk2-i386.json
    └── 60-edk2-x86_64.json

QEMU 4.1 itself will ship the above files.  However, Fedora needs to
ship these file as part of its EDK2 package.

Why?
----

(1) Quoting (with minor formatting edits) Laszlo Ersek:

      Distributions providing their own EDK2 packages would not include
      the descriptors from upstream QEMU, even if they otherwise package
      QEMU.  That's beause the descriptor files in QEMU match the
      firmware bundled with QEMU -- but the firmware images in the
      distros' own EDK2 packages are different.  So, if a distro
      provides an EDK2 package, then the same EDK2 package should offer
      matching descriptors.  QEMU offers descriptors (soon) because QEMU
      technically distributes edk2 firmware binaries (soon).  [Where
      "soon" == QEMU 4.1]

(2) And as Dan Berrangé reminded on IRC:

      In Fedora, we need to ship them [the "descriptor files"] as part
      of the EDK2 package, because Fedora throws away all the firmware
      files that QEMU bundles, because we're [Fedora] required to
      rebuild everything from pristine source.

                    - - -

In this patch:

(*) Use the firmware descriptor files provided by Laszlo (thanks!) in
    this comment here:
    https://bugzilla.redhat.com/show_bug.cgi?id=1728652#c2 ("RFE: Ship
    the JSON firmware "descriptor files" as part of EDK2").

    On the double-digit priority prefixes, refer to the rationale here:
    https://src.fedoraproject.org/rpms/edk2/pull-request/3#comment-27523

(*) Install the JSON files for the relevant architectures in
    `/usr/share/qemu/firmware`, as required by specification[+].  And
    make each EDK2 own this directory; multiple RPMs owning the same
    directory is no problem.

[+] https://git.qemu.org/?p=qemu.git;a=blob;f=docs/interop/firmware.json

Resolves: rhbz#1728652

Signed-off-by: Kashyap Chamarthy <kchamart@redhat.com>
2019-07-12 13:40:09 -04:00
Cole Robinson 1b8f6277e4 spec: Ship VARS file for ovmf-ia32 (bug 1688596) 2019-07-12 13:39:28 -04:00
Cole Robinson 43c2e03bab spec: Add comment about skip_enroll 2019-07-12 12:52:11 -04:00
Cole Robinson 7407978c03 Update to edkstable201905
* Temporarily disable secureboot enrollment, it's hanging
* Update to openssl 1.1.1b
* Add bundled softfloat
2019-07-12 12:39:20 -04:00
Cole Robinson e9ffba62f9 Fix changelog 2019-03-18 11:03:41 -04:00
Cole Robinson cb95e514ad Use version 20190308stable, to fix package upgrade path 2019-03-18 11:01:35 -04:00
Cole Robinson b846ca0e27 Update to stable-201903
Update to openssl-1.1.0j
Move to python3 deps
2019-03-15 15:50:22 -04:00
Fedora Release Engineering bffed9bfae - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 18:22:54 +00:00
Igor Gnatenko 2f11edb7c8 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:00 +01:00
Cole Robinson 625a40b277 Merge #2 `Add -qosb dependency on python3` 2018-11-15 18:26:39 +00:00
Cole Robinson 7e5715af86 Only use py_byte_compile on f29+
Fixes virt-preview copr builds
2018-11-15 08:39:59 -05:00
Patrick Uiterwijk a2a5397767 Add -qosb dependency on python3
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2018-11-14 17:10:37 +01:00
Paolo Bonzini 84f43e5ff6 fix buildrequires for py-byte-compile 2018-11-09 22:05:41 +01:00
Paolo Bonzini ec71addf69 Fix network boot via grub (bz 1648476) 2018-11-09 21:13:58 +01:00
Paolo Bonzini 3aa0957f99 Explicitly compile the scripts using py_byte_compile 2018-09-12 15:50:36 +02:00
Cole Robinson f2ed1ffdc0 Bump release 2018-08-31 13:22:10 -04:00
Cole Robinson 285b943a5f Fix passing through RPM build flags (bz 1540244) 2018-08-31 13:10:10 -04:00
Cole Robinson 3c653134d5 Fix 0099 patch
And enable TPM2
2018-08-22 19:04:30 -04:00
Cole Robinson 9fc821a3d0 Update to edk2 git cb5f4f45ce
- Remove upstreamed patches
- Update to qemu qemu-ovmf-secureboot-1.1.3
2018-08-22 16:37:23 -04:00
Paolo Bonzini 83f3ca8d0b Fixes for AMD SEV on OVMF_CODE.fd; add Provides for bundled OpenSSL 2018-07-23 12:55:18 +02:00
Paolo Bonzini 720bc3e5a3 Enable IPv6 2018-07-18 17:35:24 +02:00
Fedora Release Engineering 20639a2a72 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-12 23:41:16 +00:00
Paolo Bonzini 9fbea3b0dd Backport two bug fixes from RHEL
Connect again virtio-rng devices, and connect consoles unconditionally
in OVMF (ARM firmware already did it).
2018-06-20 10:35:44 +02:00
Paolo Bonzini 7ae6f1596c update to upstream commit ee3198e672e2 2018-05-30 00:31:55 +02:00
Cole Robinson b7103cb49a Bump release for new build 2018-05-01 13:58:41 -04:00
Cole Robinson 48f745a9ce Add qemu-ovmf-secureboot sources, tweak qemu dep 2018-04-30 11:45:47 -04:00
Patrick Uiterwijk 0792202285 Add qosb to generate pre-enrolled Secure Boot VARS files
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
2018-04-30 11:03:39 -04:00