[libvirt] [PATCH] spec: Add firmware/nvram paths for edk2 arm and ia32
And clarify the comments to instead mention the package names that provide these files Signed-off-by: Cole Robinson <crobinso@redhat.com> --- libvirt.spec.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 3edb60d2d2..f3d5c032af 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1132,14 +1132,22 @@ exit 1 %define arg_selinux_mount --with-selinux-mount="/sys/fs/selinux" %if 0%{?fedora} - # Nightly firmware repo x86/OVMF + # Nightly edk2.git-ovmf-x64 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 + # Nightly edk2.git-ovmf-ia32 + LOADERS="/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd" + # Nightly edk2.git-aarch64 LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw" - # Fedora official x86/OVMF + # Nightly edk2.git-arm + LOADERS="$LOADERS:/usr/share/edk2.git/arm/QEMU_EFI-pflash.raw:/usr/share/edk2.git/arm/vars-template-pflash.raw" + # Fedora edk2-ovmf LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd" - # Fedora official aarch64/AAVMF + # Fedora edk2-ovmf-ia32 + LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd" + # Fedora edk2-aarch64 LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw" + # Fedora edk2-arm + LOADERS="$LOADERS:/usr/share/edk2/arm/QEMU_EFI-pflash.raw:/usr/share/edk2/arm/vars-template-pflash.raw" %define arg_loader_nvram --with-loader-nvram="$LOADERS" %endif -- 2.17.1
Add nvram firmware paths for ovmf ia32 and ovmf arm32. The latter is at least useful for upcoming Fedora which will support arm32 installs, rather than just pre-created disk image imports First patch is just a comment cleanup/improvement v2: Separate patches per Andrea's review Fix LOADER overwriting per Andrea's review Cole Robinson (2): spec: Change nvram comments to reference edk2 package names spec: Add firmware/nvram paths for edk2 arm and ia32 libvirt.spec.in | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) -- 2.17.1
On Wed, 2018-08-15 at 18:29 -0400, Cole Robinson wrote:
Add nvram firmware paths for ovmf ia32 and ovmf arm32. The latter is at least useful for upcoming Fedora which will support arm32 installs, rather than just pre-created disk image imports
First patch is just a comment cleanup/improvement
v2: Separate patches per Andrea's review Fix LOADER overwriting per Andrea's review
Cole Robinson (2): spec: Change nvram comments to reference edk2 package names spec: Add firmware/nvram paths for edk2 arm and ia32
libvirt.spec.in | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
Based on the assumption that paths and package names are correct, Reviewed-by: Andrea Bolognani <abologna@redhat.com> for the series. -- Andrea Bolognani / Red Hat / Virtualization
Signed-off-by: Cole Robinson <crobinso@redhat.com> --- libvirt.spec.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 883c8a49e7..f2099c3096 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1163,13 +1163,13 @@ exit 1 %define arg_selinux_mount --with-selinux-mount="/sys/fs/selinux" %if 0%{?fedora} - # Nightly firmware repo x86/OVMF + # Nightly edk2.git-ovmf-x64 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 + # Nightly edk2.git-aarch64 LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw" - # Fedora official x86/OVMF + # Fedora edk2-ovmf LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd" - # Fedora official aarch64/AAVMF + # Fedora edk2-aarch64 LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw" %define arg_loader_nvram --with-loader-nvram="$LOADERS" %endif -- 2.17.1
Signed-off-by: Cole Robinson <crobinso@redhat.com> --- libvirt.spec.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index f2099c3096..e7196b7d3b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1165,12 +1165,21 @@ exit 1 %if 0%{?fedora} # Nightly edk2.git-ovmf-x64 LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd" + # Nightly edk2.git-ovmf-ia32 + LOADERS="$LOADERS:/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd" # Nightly edk2.git-aarch64 LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw" + # Nightly edk2.git-arm + LOADERS="$LOADERS:/usr/share/edk2.git/arm/QEMU_EFI-pflash.raw:/usr/share/edk2.git/arm/vars-template-pflash.raw" + # Fedora edk2-ovmf LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd" + # Fedora edk2-ovmf-ia32 + LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd" # Fedora edk2-aarch64 LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw" + # Fedora edk2-arm + LOADERS="$LOADERS:/usr/share/edk2/arm/QEMU_EFI-pflash.raw:/usr/share/edk2/arm/vars-template-pflash.raw" %define arg_loader_nvram --with-loader-nvram="$LOADERS" %endif -- 2.17.1
participants (2)
-
Andrea Bolognani -
Cole Robinson