reopen 522179 notfixed 522179 85+dfsg-4.1+rm reassign 522179 qemu-kvm 0.11.0+dfsg-1 tags 522179 + patch thanks
On Mon, Dec 28, 2009 at 08:47:06PM +0000, Marco Rodrigues wrote: > You filled the bug http://bugs.debian.org/522179 in Debian BTS > against the package kvm. I'm closing it at *unstable*, but it will > remain open for older distributions. qemu-kvm 0.11.0+dfsg-1 has build support for the virtio bootrom, thank you. etherboot 5.4.4 moved bootroms from /usr/share -> /usr/lib and ships the virtio bootrom with a different filename than the qemu-kvm packaging expects (virtio -> virtio-net). The attached patch should fix this. I didn't know what your policy was on backwards compatibility, so I left support for bootroms in /usr/share to make things easier for backports. john -- John Morrissey _o /\ ---- __o j...@horde.net _-< \_ / \ ---- < \, www.horde.net/ __(_)/_(_)________/ \_______(_) /_(_)__
diff --git a/debian/rules b/debian/rules index a3af31a..310d006 100755 --- a/debian/rules +++ b/debian/rules @@ -173,14 +173,19 @@ ifeq (x86,$(BASE_ARCH)) install -m0644 pc-bios/optionrom/multiboot.bin pc-bios/optionrom/extboot.bin \ $(tbdir)/ # pxe roms are x86-specific - cp -p /usr/share/etherboot/e1000-82540em.zrom.gz $(tbdir)/pxe-e1000.bin.gz - cp -p /usr/share/etherboot/rtl8029.zrom.gz $(tbdir)/pxe-ne2k_pci.bin.gz - cp -p /usr/share/etherboot/pcnet32.zrom.gz $(tbdir)/pxe-pcnet.bin.gz - cp -p /usr/share/etherboot/rtl8139.zrom.gz $(tbdir)/pxe-rtl8139.bin.gz -# virtio bootrom is in git version of etherboot, not packaged in debian yet - if [ -f /usr/share/etherboot/virtio.zrom.gz ]; then \ - cp -p /usr/share/etherboot/virtio.zrom.gz $(tbdir)/pxe-virtio.bin.gz; \ - fi + for bootrom_hier in /usr/lib/etherboot /usr/share/etherboot; do \ + if [ ! -e "$$bootrom_hier" ]; then \ + continue; \ + fi; \ + cp -p $$bootrom_hier/e1000-82540em.zrom.gz $(tbdir)/pxe-e1000.bin.gz; \ + cp -p $$bootrom_hier/rtl8029.zrom.gz $(tbdir)/pxe-ne2k_pci.bin.gz; \ + cp -p $$bootrom_hier/pcnet32.zrom.gz $(tbdir)/pxe-pcnet.bin.gz; \ + cp -p $$bootrom_hier/rtl8139.zrom.gz $(tbdir)/pxe-rtl8139.bin.gz; \ + # virtio bootrom is in etherboot 5.4.4 and newer. \ + if [ -f $$bootrom_hier/virtio-net.zrom.gz ]; then \ + cp -p $$bootrom_hier/virtio-net.zrom.gz $(tbdir)/pxe-virtio.bin.gz; \ + fi; \ + done gzip -d $(tbdir)/pxe-*.bin.gz endif
