| Message ID | 7a7dc96cc921c1ae75545d4161b38f1801243f4d.1533771909.git.crobinso@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | spec: Add firmware/nvram paths for edk2 arm and ia32 | expand |
On Wed, 2018-08-08 at 19:45 -0400, Cole Robinson wrote: > And clarify the comments to instead mention the package names > that provide these files Please split this into two patches - one that tweaks the existing comments and one that adds new entries. [...] > - # 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" I'm pretty sure this won't work ;) > + # Nightly edk2.git-aarch64 > LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw" It's kind of insane that the format for this is, and I quote, [...] list of pairs of <loader>:<nvram> paths. Both pairs and list items are separated by a colon. Of course it's too late to change it now, but I couldn't let such a perfect opportunity to complain about it just pass me by :) -- Andrea Bolognani / Red Hat / Virtualization -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On 08/15/2018 07:17 AM, Andrea Bolognani wrote: > On Wed, 2018-08-08 at 19:45 -0400, Cole Robinson wrote: >> And clarify the comments to instead mention the package names >> that provide these files > > Please split this into two patches - one that tweaks the > existing comments and one that adds new entries. > > [...] >> - # 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" > > I'm pretty sure this won't work ;) > Argh, sorry, nice catch though. I'll fix and split it like you suggest Thanks, Cole -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
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
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(-) -- 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list