rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 285733 from home:a_faerber:branches:Virtualization

Browse Source 
Clean up firmware packaging and fix it for e500 U-Boot. This has revealed more issues with ppc and arm builds that need to be resolved with more time at hands.

OBS-URL: https://build.opensuse.org/request/show/285733
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=234
This commit is contained in:
Andreas Färber 2015-02-12 01:06:33 +00:00 committed by Git OBS Bridge
parent 6562e78b5d
commit 5ef179b541
3 changed files with 32 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qemu.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 11 17:56:26 UTC 2015 - afaerber@suse.de
- Fix packaging of e500 U-Boot
- Don't rely on wildcard with explicit excludes
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 14 00:38:38 UTC 2015 - agraf@suse.com Wed Jan 14 00:38:38 UTC 2015 - agraf@suse.com

57
qemu.spec
View File

@ -590,6 +590,12 @@ rm -fr $RPM_BUILD_ROOT/%_datadir/doc
rm $RPM_BUILD_ROOT/%_libdir/libcacard* rm $RPM_BUILD_ROOT/%_libdir/libcacard*
rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc
rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard
%if ! %{build_x86_fw_from_source}
for f in acpi-dsdt.aml q35-acpi-dsdt.aml bios-256k.bin bios.bin efi-*.rom pxe-*.rom sgabios.bin \
vgabios-cirrus.bin vgabios-qxl.bin vgabios-stdvga.bin vgabios-vmware.bin vgabios.bin; do
rm $RPM_BUILD_ROOT/%_datadir/%name/$f
done
%endif
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%find_lang %name %find_lang %name
%if %{legacy_qemu_kvm} %if %{legacy_qemu_kvm}
@ -663,49 +669,11 @@ fi
%dir %_libdir/%name %dir %_libdir/%name
%doc COPYING COPYING.LIB Changelog README VERSION qemu-doc.html qemu-tech.html %doc COPYING COPYING.LIB Changelog README VERSION qemu-doc.html qemu-tech.html
%doc %_mandir/man1/qemu.1.gz %doc %_mandir/man1/qemu.1.gz
%_datadir/%name %dir %_datadir/%name
%exclude %_datadir/%name/bios.bin %_datadir/%name/keymaps
%exclude %_datadir/%name/bios-256k.bin %_datadir/%name/trace-events
%exclude %_datadir/%name/acpi-dsdt.aml %_datadir/%name/qemu-icon.bmp
%exclude %_datadir/%name/q35-acpi-dsdt.aml %_datadir/%name/qemu_logo_no_text.svg
%exclude %_datadir/%name/vgabios.bin
%exclude %_datadir/%name/vgabios-cirrus.bin
%exclude %_datadir/%name/vgabios-qxl.bin
%exclude %_datadir/%name/vgabios-stdvga.bin
%exclude %_datadir/%name/vgabios-vmware.bin
%exclude %_datadir/%name/sgabios.bin
%exclude %_datadir/%name/pxe-e1000.rom
%exclude %_datadir/%name/pxe-eepro100.rom
%exclude %_datadir/%name/pxe-pcnet.rom
%exclude %_datadir/%name/pxe-ne2k_pci.rom
%exclude %_datadir/%name/pxe-rtl8139.rom
%exclude %_datadir/%name/pxe-virtio.rom
%exclude %_datadir/%name/efi-e1000.rom
%exclude %_datadir/%name/efi-eepro100.rom
%exclude %_datadir/%name/efi-pcnet.rom
%exclude %_datadir/%name/efi-ne2k_pci.rom
%exclude %_datadir/%name/efi-rtl8139.rom
%exclude %_datadir/%name/efi-virtio.rom
%exclude %_datadir/%name/kvmvapic.bin
%exclude %_datadir/%name/linuxboot.bin
%exclude %_datadir/%name/multiboot.bin
%exclude %_datadir/%name/ppc_rom.bin
%exclude %_datadir/%name/openbios-ppc
%exclude %_datadir/%name/slof.bin
%exclude %_datadir/%name/spapr-rtas.bin
%exclude %_datadir/%name/bamboo.dtb
%exclude %_datadir/%name/petalogix-ml605.dtb
%exclude %_datadir/%name/s390-zipl.rom
%exclude %_datadir/%name/s390-ccw.img
%exclude %_datadir/%name/palcode-clipper
%exclude %_datadir/%name/openbios-sparc32
%exclude %_datadir/%name/openbios-sparc64
%exclude %_datadir/%name/petalogix-s3adsp1800.dtb
%exclude %_datadir/%name/QEMU,cgthree.bin
%exclude %_datadir/%name/QEMU,tcx.bin
%ifarch %ix86 x86_64 s390x
%exclude %_datadir/%name/qemu-ifup
%endif
%dir %_sysconfdir/%name %dir %_sysconfdir/%name
%if %{kvm_available} %if %{kvm_available}
%if 0%{?suse_version} >= 1230 %if 0%{?suse_version} >= 1230
@ -733,6 +701,7 @@ fi
%_datadir/%name/openbios-ppc %_datadir/%name/openbios-ppc
%_datadir/%name/slof.bin %_datadir/%name/slof.bin
%_datadir/%name/spapr-rtas.bin %_datadir/%name/spapr-rtas.bin
%_datadir/%name/u-boot.e500
%_datadir/%name/bamboo.dtb %_datadir/%name/bamboo.dtb
%_datadir/%name/petalogix-ml605.dtb %_datadir/%name/petalogix-ml605.dtb
@ -793,7 +762,7 @@ fi
%files lang -f %name.lang %files lang -f %name.lang
%defattr(-, root, root) %defattr(-, root, root)
%ifarch %ix86 x86_64 %if %{build_x86_fw_from_source}
%files seabios %files seabios
%defattr(-, root, root) %defattr(-, root, root)
%_datadir/%name/bios.bin %_datadir/%name/bios.bin

57
qemu.spec.in
View File

@ -518,6 +518,12 @@ rm -fr $RPM_BUILD_ROOT/%_datadir/doc
rm $RPM_BUILD_ROOT/%_libdir/libcacard* rm $RPM_BUILD_ROOT/%_libdir/libcacard*
rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc
rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard
%if ! %{build_x86_fw_from_source}
for f in acpi-dsdt.aml q35-acpi-dsdt.aml bios-256k.bin bios.bin efi-*.rom pxe-*.rom sgabios.bin \
vgabios-cirrus.bin vgabios-qxl.bin vgabios-stdvga.bin vgabios-vmware.bin vgabios.bin; do
rm $RPM_BUILD_ROOT/%_datadir/%name/$f
done
%endif
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%find_lang %name %find_lang %name
%if %{legacy_qemu_kvm} %if %{legacy_qemu_kvm}
@ -591,49 +597,11 @@ fi
%dir %_libdir/%name %dir %_libdir/%name
%doc COPYING COPYING.LIB Changelog README VERSION qemu-doc.html qemu-tech.html %doc COPYING COPYING.LIB Changelog README VERSION qemu-doc.html qemu-tech.html
%doc %_mandir/man1/qemu.1.gz %doc %_mandir/man1/qemu.1.gz
%_datadir/%name %dir %_datadir/%name
%exclude %_datadir/%name/bios.bin %_datadir/%name/keymaps
%exclude %_datadir/%name/bios-256k.bin %_datadir/%name/trace-events
%exclude %_datadir/%name/acpi-dsdt.aml %_datadir/%name/qemu-icon.bmp
%exclude %_datadir/%name/q35-acpi-dsdt.aml %_datadir/%name/qemu_logo_no_text.svg
%exclude %_datadir/%name/vgabios.bin
%exclude %_datadir/%name/vgabios-cirrus.bin
%exclude %_datadir/%name/vgabios-qxl.bin
%exclude %_datadir/%name/vgabios-stdvga.bin
%exclude %_datadir/%name/vgabios-vmware.bin
%exclude %_datadir/%name/sgabios.bin
%exclude %_datadir/%name/pxe-e1000.rom
%exclude %_datadir/%name/pxe-eepro100.rom
%exclude %_datadir/%name/pxe-pcnet.rom
%exclude %_datadir/%name/pxe-ne2k_pci.rom
%exclude %_datadir/%name/pxe-rtl8139.rom
%exclude %_datadir/%name/pxe-virtio.rom
%exclude %_datadir/%name/efi-e1000.rom
%exclude %_datadir/%name/efi-eepro100.rom
%exclude %_datadir/%name/efi-pcnet.rom
%exclude %_datadir/%name/efi-ne2k_pci.rom
%exclude %_datadir/%name/efi-rtl8139.rom
%exclude %_datadir/%name/efi-virtio.rom
%exclude %_datadir/%name/kvmvapic.bin
%exclude %_datadir/%name/linuxboot.bin
%exclude %_datadir/%name/multiboot.bin
%exclude %_datadir/%name/ppc_rom.bin
%exclude %_datadir/%name/openbios-ppc
%exclude %_datadir/%name/slof.bin
%exclude %_datadir/%name/spapr-rtas.bin
%exclude %_datadir/%name/bamboo.dtb
%exclude %_datadir/%name/petalogix-ml605.dtb
%exclude %_datadir/%name/s390-zipl.rom
%exclude %_datadir/%name/s390-ccw.img
%exclude %_datadir/%name/palcode-clipper
%exclude %_datadir/%name/openbios-sparc32
%exclude %_datadir/%name/openbios-sparc64
%exclude %_datadir/%name/petalogix-s3adsp1800.dtb
%exclude %_datadir/%name/QEMU,cgthree.bin
%exclude %_datadir/%name/QEMU,tcx.bin
%ifarch %ix86 x86_64 s390x
%exclude %_datadir/%name/qemu-ifup
%endif
%dir %_sysconfdir/%name %dir %_sysconfdir/%name
%if %{kvm_available} %if %{kvm_available}
%if 0%{?suse_version} >= 1230 %if 0%{?suse_version} >= 1230
@ -661,6 +629,7 @@ fi
%_datadir/%name/openbios-ppc %_datadir/%name/openbios-ppc
%_datadir/%name/slof.bin %_datadir/%name/slof.bin
%_datadir/%name/spapr-rtas.bin %_datadir/%name/spapr-rtas.bin
%_datadir/%name/u-boot.e500
%_datadir/%name/bamboo.dtb %_datadir/%name/bamboo.dtb
%_datadir/%name/petalogix-ml605.dtb %_datadir/%name/petalogix-ml605.dtb
@ -721,7 +690,7 @@ fi
%files lang -f %name.lang %files lang -f %name.lang
%defattr(-, root, root) %defattr(-, root, root)
%ifarch %ix86 x86_64 %if %{build_x86_fw_from_source}
%files seabios %files seabios
%defattr(-, root, root) %defattr(-, root, root)
%_datadir/%name/bios.bin %_datadir/%name/bios.bin