~ubuntu-branches/ubuntu/jaunty/kvm/jaunty

« back to all changes in this revision

Viewing changes to debian/patches/rename_qemu_kvm.patch

  • Committer: Bazaar Package Importer
  • Author(s): Dustin Kirkland, Reviewed Ubuntu patches with KVM/QEMU upstream, Anthony Liguori, Remaining Patches, Other Changes
  • Date: 2009-02-20 16:11:06 UTC
  • Revision ID: james.westby@ubuntu.com-20090220161106-yznfb2ji5lkwdeov
Tags: 1:84+dfsg-0ubuntu3
[ Reviewed Ubuntu patches with KVM/QEMU upstream, Anthony Liguori ]
* debian/patches/03_bios_no_ssp.patch: DROPPED, included upstream
* debian/patches/06_no_system_linux_kvm_h.patch: DROPPED, no longer
  necessary, kvm kernel header file is now generally available
* debian/patches/from-debian-qemu/22_net_tuntap_stall.patch: DROPPED,
  no longer necessary; this patch was to work around a bug in
  2.6.11-rc1; this patch could be causing network packet drop issues;
  definitely WRONG at this point with modern QEMU
* debian/patches/from-debian-qemu/62_linux_boot_nasm.patch: DROPPED,
  dead code in modern QEMU; completely rewritten to not require an
  external assembler; now built dynamically in pc.c
* debian/patches/SECURITY_CVE-2007-1321+1322+1366+2893.patch: DROPPED
  * CVE-2007-1321: Fixed upstream
    - QEMU svn commit: r3019
  * CVE-2007-1322: Fixed upstream
    - QEMU svn commit: r5921
  * CVE-2007-1366: Fixed upstream
    - QEMU svn commit: r3012
  * CVE-2007-2893: Not related to QEMU
  * dma.c: Non-CVE fix, r3917
  * block.c: Incorrect patch (negative offset IS allowed, switches
    between block and byte offset)
  * Remainder of the patch was split into: net-socket.patch
    (should be sent upstream)
* debian/patches/series: updated accordingly
* debian/patches/do-not-install-bios.patch: DROPPED
  added --disable-blobs to configure in debian/rules
* debian/patches/reenable_audio_drivers.patch: DROPPED
  added --audio-drv-list="oss alsa sdl" to debian/rules
* debian/patches/anon_inodes_fix.patch: DROPPED, this is already
  upstream
* debian/patches/ppc-build.patch: DROPPED, not necessary
* debian/rules: remove references to non-existant linux_boot.bin

[ Remaining Patches ]
* debian/patches/01_use_bios_files_in_usr_share_kvm.patch -p0
  debian/patches/04_use_etc_kvm_kvm-ifup.patch -p0
  debian/patches/07_change_qemu_docdir.patch
  |-----> merged to a single patch, rename_qemu_kvm.patch
* debian/patches/CVE-2008-0928.patch: upstream work in progress
* debian/patches/evdev_keycode_map.patch: upstream work in progress
* debian/patches/02_fix_kernel_Makefile.patch: merged into dkmsify.patch
* debian/patches/dkmsify.patch: Ubuntu-specific (should validate if
  still necessary...)
* debian/patches/net-socket.patch: to be sent upstream

[ Other Changes ]
* scripts/qemu-ifup: bridge device determination was broken, required
  br0 to be present for this script to operate properly, LP: #125302

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
This patch handles the renaming of qemu to kvm for Ubuntu packaging
 
2
purposes.
 
3
 
 
4
This patch should 'go away' when qemu replaces kvm's userspace
 
5
package.
 
6
 
 
7
Ask Dustin Kirkland <kirkland@canonical.com> if unsure ;-)
 
8
 
 
9
 
 
10
 
 
11
--- a/qemu/configure.orig
 
12
+++ b/qemu/configure
 
13
@@ -666,7 +666,7 @@
 
14
       prefix="/usr/local"
 
15
   fi
 
16
   mansuffix="/share/man"
 
17
-  datasuffix="/share/qemu"
 
18
+  datasuffix="/share/kvm"
 
19
   docsuffix="/share/doc/qemu"
 
20
   binsuffix="/bin"
 
21
 fi
 
22
 
 
23
Use an independent script to control the network at startup.
 
24
 
 
25
--- a/qemu/net.h.orig   2009-01-08 15:07:37.222078188 -0600
 
26
+++ b/qemu/net.h        2009-01-08 15:07:54.374564957 -0600
 
27
@@ -94,8 +94,8 @@ void net_cleanup(void);
 
28
 int slirp_is_inited(void);
 
29
 void net_client_check(void);
 
30
 
 
31
-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 
32
-#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
 
33
+#define DEFAULT_NETWORK_SCRIPT "/etc/kvm-ifup"
 
34
+#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/kvm-ifdown"
 
35
 #ifdef __sun__
 
36
 #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
 
37
 #else
 
38
 
 
39
--- a/qemu/configure
 
40
+++ b/qemu/configure
 
41
@@ -667,7 +667,7 @@
 
42
   fi
 
43
   mansuffix="/share/man"
 
44
   datasuffix="/share/kvm"
 
45
-  docsuffix="/share/doc/qemu"
 
46
+  docsuffix="/share/doc/kvm"
 
47
   binsuffix="/bin"
 
48
 fi
 
49