Package: qemu-kvm
Version: 0.12.4+dfsg-1~bpo50+1
Severity: important
Tags: patch
please consider using the newly introduced etherboot-qemu package to provide
PXE capable boot roms, rather than shipping copies of etherboot roms included
into the qemu-kvm package at build time. this makes it hard to track down the
sources that the etherboot roms were generated with, amoung other issues.
should also make the packaging a little simpler, too.
the following patch that should address the issue, although you might consider
making etherboot-qemu a recommends rather than a depends.
commit b76cbe96dd25ec5d225848652e2430db1cfb5c38
Author: Vagrant Cascadian <vagr...@freegeek.org>
Date: Mon May 31 19:51:39 2010 -0700
Depend on etherboot-qemu package instead of copying etherboot roms at build
time.
diff --git a/debian/control b/debian/control
index 14ae422..9107543 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.2.3~), pkg-config, quilt (>=
0.40), autotools-dev
bzip2, uuid-dev, zlib1g-dev, libsdl1.2-dev, libasound2-dev,
libcurl4-gnutls-dev,
libgnutls-dev, libncurses5-dev, libvdeplug2-dev, libpulse-dev,
libbluetooth-dev,
nasm, texi2html, bcc, iasl, device-tree-compiler [powerpc], python,
- etherboot [i386 amd64], libbrlapi-dev, libpci-dev, libsasl2-dev,
+ libbrlapi-dev, libpci-dev, libsasl2-dev,
libaio-dev, linux-libc-dev (>= 2.6.32)
Standards-Version: 3.8.4
Homepage: http://www.linux-kvm.org/
@@ -17,7 +17,7 @@ Vcs-Git: git://git.debian.org/git/collab-maint/qemu-kvm.git
Package: qemu-kvm
Architecture: i386 amd64
Pre-Depends: adduser
-Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, bridge-utils, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, bridge-utils, python,
etherboot-qemu
Recommends: linux-image
Suggests: debootstrap, vde2, samba
Provides: kvm
diff --git a/debian/qemu-kvm.links b/debian/qemu-kvm.links
new file mode 100644
index 0000000..d95c174
--- /dev/null
+++ b/debian/qemu-kvm.links
@@ -0,0 +1,6 @@
+usr/lib/etherboot/rtl8139.rom usr/share/kvm/pxe-rtl8139.bin
+usr/lib/etherboot/e1000-82540em.rom usr/share/kvm/pxe-e1000.bin
+usr/lib/etherboot/ne.rom usr/share/kvm/pxe-ne2k_isa.bin
+usr/lib/etherboot/virtio-net.rom usr/share/kvm/pxe-virtio.bin
+usr/lib/etherboot/rtl8029.rom usr/share/kvm/pxe-ne2k_pci.bin
+usr/lib/etherboot/pcnet32.rom usr/share/kvm/pxe-pcnet.bin
diff --git a/debian/rules b/debian/rules
index 66bbda0..4016c75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -174,21 +174,6 @@ ifeq (x86,$(BASE_ARCH))
$(tbdir)/vgabios.bin
install -m0644 kvm/vgabios/VGABIOS-lgpl-latest.cirrus.bin \
$(tbdir)/vgabios-cirrus.bin
-
-# pxe roms are x86-specific
-# etherboot_5.4.4-1 moved roms from /usr/share/etherboot to /usr/lib/etherboot
-# We can have versioned build-depends once 5.4.4-1 enters testing.
- set -e; brl=; \
- for d in /usr/lib/etherboot /usr/share/etherboot; do \
- if [ -d $$d ]; then brl=$$d; break; fi; done; \
- cp -p $$brl/e1000-82540em.zrom.gz $(tbdir)/pxe-e1000.bin.gz; \
- cp -p $$brl/rtl8029.zrom.gz $(tbdir)/pxe-ne2k_pci.bin.gz; \
- cp -p $$brl/pcnet32.zrom.gz $(tbdir)/pxe-pcnet.bin.gz; \
- cp -p $$brl/rtl8139.zrom.gz $(tbdir)/pxe-rtl8139.bin.gz; \
- if [ -f $$brl/virtio-net.zrom.gz ]; then \
- cp -p $$brl/virtio-net.zrom.gz $(tbdir)/pxe-virtio.bin.gz; \
- fi
- gzip -d $(tbdir)/pxe-*.bin.gz
endif
ifeq (powerpc,$(BASE_ARCH))
live well,
vagrant
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
