rpms
/
libvirt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Advertise fedora edk2 firmware builds to apps (bz #1335395)

remotes/origin/f23
Cole Robinson 2016-06-23 16:37:18 -04:00
parent e88899c8f0
commit f93a8bf81e
3 changed files with 110 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
0001-spec-Advertise-nvram-paths-of-official-fedora-edk2-b.patch Normal file
View File

@ -0,0 +1,62 @@
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 20 May 2016 15:50:16 -0400
Subject: [PATCH] spec: Advertise nvram paths of official fedora edk2 builds
Fedora now ships edk2 firmware in its official repos, so adapt
the nvram path list to match. Eventually we can remove the nightly
links as well once some integration kinks have been worked out,
and documentation updated.
Move the macro building into the %build target, which lets us
build up a shell variable and make things a bit more readable
https://bugzilla.redhat.com/show_bug.cgi?id=1335395
(cherry picked from commit e9ef4dfac88806d02bd2f31eeb3f3bbafe505888)
---
libvirt.spec.in | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index a2110bd..c1453a9 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -344,20 +344,6 @@
%endif
-# Advertise OVMF and AAVMF from nightly firmware repo
-%if 0%{?fedora}
- %define with_loader_nvram --with-loader-nvram="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw"
-%endif
-
-
-# The RHEL-5 Xen package has some feature backports. This
-# flag is set to enable use of those special bits on RHEL-5
-%if 0%{?rhel} == 5
- %define with_rhel5 1
-%else
- %define with_rhel5 0
-%endif
-
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
%define with_systemd_macros 1
%else
@@ -1470,6 +1456,18 @@ rm -rf .git
%endif
%endif
+%if 0%{?fedora}
+ # Nightly firmware repo x86/OVMF
+ LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd"
+ # Nightly firmware repo aarch64/AAVMF
+ LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw"
+ # Fedora official x86/OVMF
+ LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd"
+ # Fedora official aarch64/AAVMF
+ LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw"
+ %define with_loader_nvram --with-loader-nvram="$LOADERS"
+%endif
+
# place macros above and build commands below this comment
%if 0%{?enable_autotools}

27
0002-spec-Fix-error-in-last-backport.patch Normal file
View File

@ -0,0 +1,27 @@
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 23 Jun 2016 16:23:11 -0400
Subject: [PATCH] spec: Fix error in last backport
---
libvirt.spec.in | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index c1453a9..3fa5fc4 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -344,6 +344,14 @@
%endif
+# The RHEL-5 Xen package has some feature backports. This
+# flag is set to enable use of those special bits on RHEL-5
+%if 0%{?rhel} == 5
+ %define with_rhel5 1
+%else
+ %define with_rhel5 0
+%endif
+
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
%define with_systemd_macros 1
%else

28
libvirt.spec
View File

@ -344,12 +344,6 @@
%endif
# Advertise OVMF and AAVMF from nightly firmware repo
%if 0%{?fedora}
%define with_loader_nvram --with-loader-nvram="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw"
%endif
# The RHEL-5 Xen package has some feature backports. This
# flag is set to enable use of those special bits on RHEL-5
%if 0%{?rhel} == 5
@ -378,7 +372,7 @@
Summary: Library providing a simple virtualization API
Name: libvirt
Version: 1.2.18.3
Release: 1%{?dist}%{?extra_release}
Release: 2%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -389,6 +383,10 @@ URL: http://libvirt.org/
%endif
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
# Advertise fedora edk2 firmware builds to apps (bz #1335395)
Patch0001: 0001-spec-Advertise-nvram-paths-of-official-fedora-edk2-b.patch
Patch0002: 0002-spec-Fix-error-in-last-backport.patch
%if %{with_libvirtd}
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_network}
@ -1470,6 +1468,18 @@ rm -rf .git
%endif
%endif
%if 0%{?fedora}
# Nightly firmware repo x86/OVMF
LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd"
# Nightly firmware repo aarch64/AAVMF
LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw"
# Fedora official x86/OVMF
LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd"
# Fedora official aarch64/AAVMF
LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw"
%define with_loader_nvram --with-loader-nvram="$LOADERS"
%endif
# place macros above and build commands below this comment
%if 0%{?enable_autotools}
@ -2337,7 +2347,11 @@ exit 0
# Needed building python bindings
%doc docs/libvirt-api.xml
%changelog
* Thu Jun 23 2016 Cole Robinson <crobinso@redhat.com> - 1.2.18.3-2
- Advertise fedora edk2 firmware builds to apps (bz #1335395)
* Wed May 04 2016 Cole Robinson <crobinso@redhat.com> - 1.2.18.3-1
- Rebased to version 1.2.18.3
- Start network after config-network RPM install (bz #867546)