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 |
Related bugs: |
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.
Unmerged revisions
- 13. By Serge Hallyn
-
debian/rules: symlink the kvm-pxe roms to /usr/share/qemu, LP: #570870
> 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' rtl8139. zrom /debian/ kvm-pxe/ usr/share/ kvm/pxe- rtl8139. bin virtio- net.zrom /debian/ kvm-pxe/ usr/share/ kvm/pxe- virtio. bin /debian/ kvm-pxe/ usr/share/ kvm/* /debian/ kvm-pxe/ usr/share/ qemu /debian/ kvm-pxe/ usr/share/ qemu; ln -s ../kvm/*.bin .; cd - etherboot/ usr/share/ doc/etherboot
--- 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/
+$(CURDIR)
cp src/bin/
+$(CURDIR)
chmod -x $(CURDIR)
+ mkdir -p $(CURDIR)
+ cd $(CURDIR)
mkdir -p debian/
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.