Merge lp:~serge-hallyn/ubuntu/oneiric/ipxe/link-kvm into lp:ubuntu/oneiric/ipxe

Proposed by Serge Hallyn
Status: Merged
Merge reported by: Dave Walker
Merged at revision: not available
Proposed branch: lp:~serge-hallyn/ubuntu/oneiric/ipxe/link-kvm
Merge into: lp:ubuntu/oneiric/ipxe
Diff against target: 50 lines (+21/-1)
4 files modified
debian/changelog (+13/-0)
debian/control (+2/-1)
debian/ipxe.dirs (+1/-0)
debian/ipxe.links (+5/-0)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/oneiric/ipxe/link-kvm
Reviewer Review Type Date Requested Status
Dave Walker Pending
Review via email: mp+72037@code.launchpad.net

Description of the change

Move links into place for use by qemu-kvm.

To post a comment you must log in.
6. By Serge Hallyn

Qemu-kvm 0.15.0 switches from *.bin to *.rom.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-07-31 20:57:02 +0000
3+++ debian/changelog 2011-08-18 18:37:25 +0000
4@@ -1,3 +1,16 @@
5+ipxe (1.0.0+git-2.149b50-1ubuntu2) oneiric; urgency=low
6+
7+ * Qemu-kvm 0.15.0 switches from *.bin to *.rom.
8+
9+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Thu, 18 Aug 2011 13:34:38 -0500
10+
11+ipxe (1.0.0+git-2.149b50-1ubuntu1) oneiric; urgency=low
12+
13+ * Copy roms into /usr/share/qemu for consumption by
14+ qemu-kvm.
15+
16+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Thu, 18 Aug 2011 08:22:38 -0500
17+
18 ipxe (1.0.0+git-2.149b50-1) unstable; urgency=low
19
20 * New snapshot.
21
22=== modified file 'debian/control'
23--- debian/control 2011-07-31 20:57:02 +0000
24+++ debian/control 2011-08-18 18:37:25 +0000
25@@ -1,7 +1,8 @@
26 Source: ipxe
27 Section: admin
28 Priority: optional
29-Maintainer: Bastian Blank <waldi@debian.org>
30+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
31+XSBC-Original-Maintainer: Bastian Blank <waldi@debian.org>
32 Build-Depends: debhelper (>= 7.0.50~),
33 genisoimage, syslinux
34 Standards-Version: 3.9.1
35
36=== added file 'debian/ipxe.dirs'
37--- debian/ipxe.dirs 1970-01-01 00:00:00 +0000
38+++ debian/ipxe.dirs 2011-08-18 18:37:25 +0000
39@@ -0,0 +1,1 @@
40+usr/share/qemu
41
42=== added file 'debian/ipxe.links'
43--- debian/ipxe.links 1970-01-01 00:00:00 +0000
44+++ debian/ipxe.links 2011-08-18 18:37:25 +0000
45@@ -0,0 +1,5 @@
46+usr/lib/ipxe/virtio-net.rom usr/share/qemu/pxe-virtio.rom
47+usr/lib/ipxe/rtl8139.rom usr/share/qemu/pxe-rtl8139.rom
48+usr/lib/ipxe/pcnet32.rom usr/share/qemu/pxe-pcnet32.rom
49+usr/lib/ipxe/ne2k_isa.rom usr/share/qemu/pxe-ne2k_isa.rom
50+usr/lib/ipxe/e1000_82540.rom usr/share/qemu/pxe-e1000.rom

Subscribers

People subscribed via source and target branches

to all changes: