Merge lp:~serge-hallyn/ubuntu/maverick/etherboot/usrshareqemu into lp:ubuntu/maverick/etherboot

Proposed by Serge Hallyn
Status: Needs review
Proposed branch: lp:~serge-hallyn/ubuntu/maverick/etherboot/usrshareqemu
Merge into: lp:ubuntu/maverick/etherboot
Diff against target: 26 lines (+8/-0)
2 files modified
debian/changelog (+6/-0)
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/maverick/etherboot/usrshareqemu
Reviewer Review Type Date Requested Status
Steve Langasek Needs Fixing
Review via email: mp+32539@code.launchpad.net

Description of the change

Symlink roms from /usr/share/kvm into /usr/share/qemu to fix LP: 570870

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

> etherboot (5.4.4-1ubuntu1.1) maverick; urgency=low

Wrong version number for an upload to the current devel release; this version number is only appropriate for an SRU, which this is not.

Also, this version number has already been used before, in Dustin's SRU attempt which was later rejected from lucid-proposed; you would need to use a distinct version number in any case.

=== modified file 'debian/rules'
--- debian/rules 2010-01-02 07:25:53 +0000
+++ debian/rules 2010-08-13 01:04:41 +0000
@@ -31,6 +31,8 @@
        cp src/bin/rtl8139.zrom
+$(CURDIR)/debian/kvm-pxe/usr/share/kvm/pxe-rtl8139.bin
        cp src/bin/virtio-net.zrom
+$(CURDIR)/debian/kvm-pxe/usr/share/kvm/pxe-virtio.bin
        chmod -x $(CURDIR)/debian/kvm-pxe/usr/share/kvm/*
+ mkdir -p $(CURDIR)/debian/kvm-pxe/usr/share/qemu
+ cd $(CURDIR)/debian/kvm-pxe/usr/share/qemu; ln -s ../kvm/*.bin .; cd -
        mkdir -p debian/etherboot/usr/share/doc/etherboot

        cp -a contrib debian/etherboot/usr/share/doc/etherboot

This is identical to the change previously uploaded to lucid-proposed, which Martin Pitt rejected saying that there was "a reported regression". Since Martin didn't provide a reference for this regression, we'll need to get him to comment on this.

review: Needs Fixing
Revision history for this message
StefanPotyra (sistpoty) wrote :

In lucid's qemu-kvm package, /usr/share/kvm and /usr/share/qemu-kvm are both symlinks to /usr/share/qemu, which explains the regression of this approach.

Unmerged revisions

13. By Serge Hallyn

debian/rules: symlink the kvm-pxe roms to /usr/share/qemu, LP: #570870

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 2010-01-02 07:25:53 +0000
3+++ debian/changelog 2010-08-13 01:04:41 +0000
4@@ -1,3 +1,9 @@
5+etherboot (5.4.4-1ubuntu1.1) maverick; urgency=low
6+
7+ * debian/rules: symlink the kvm-pxe roms to /usr/share/qemu, LP: #570870
8+
9+ -- Dustin Kirkland <kirkland@ubuntu.com> Mon, 03 May 2010 11:40:08 +0000
10+
11 etherboot (5.4.4-1ubuntu1) lucid; urgency=low
12
13 * Merge from debian unstable, remaining changes:
14
15=== modified file 'debian/rules'
16--- debian/rules 2010-01-02 07:25:53 +0000
17+++ debian/rules 2010-08-13 01:04:41 +0000
18@@ -31,6 +31,8 @@
19 cp src/bin/rtl8139.zrom $(CURDIR)/debian/kvm-pxe/usr/share/kvm/pxe-rtl8139.bin
20 cp src/bin/virtio-net.zrom $(CURDIR)/debian/kvm-pxe/usr/share/kvm/pxe-virtio.bin
21 chmod -x $(CURDIR)/debian/kvm-pxe/usr/share/kvm/*
22+ mkdir -p $(CURDIR)/debian/kvm-pxe/usr/share/qemu
23+ cd $(CURDIR)/debian/kvm-pxe/usr/share/qemu; ln -s ../kvm/*.bin .; cd -
24 mkdir -p debian/etherboot/usr/share/doc/etherboot
25
26 cp -a contrib debian/etherboot/usr/share/doc/etherboot

Subscribers

People subscribed via source and target branches

to all changes: