← Back to branch summary

~ubuntu-branches/ubuntu/hardy/kvm/hardy-backports

« back to all changes in this revision

Viewing changes to debian/patches/06_no_system_linux_kvm_h.patch

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2007-12-10 13:43:03 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20071210134303-rw38y458ilx76vmv
Tags: 1:55+dfsg-1ubuntu1
* Merge with Debian. Remaining changes:
  - debian/control:
    - Demote kvm-source to Suggests
    - Mention kvm-source is unnecessary
    - Modify Maintainer value to match the DebianMaintainerField
      specification.
    - Depend on recent bochsbios-qemu.
    - Moved Vcs-* to XS-Original-Vcs-*.
    - Don't recommend linux-image-2.6 since Ubuntu is Linux 2.6 only anyway.
    - Rename suggestions of linux-{headers,source} to Ubuntu's naming scheme.
    - Add pkg-config to Build-Depends (fixes warning during build)
  - Add 08_default_tdf.patch to make -tdf the default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_no_system_linux_kvm_h.patch
4
4
compile, for example a Linux 2.6.20 host with 2.6.20 Linux headers
5
5
installed would fail.
6
6
 
7
 
Index: user/kvmctl.h
 
7
Index: libkvm/libkvm.h
8
8
===================================================================
9
 
--- user/kvmctl.h.orig
10
 
+++ user/kvmctl.h
11
 
@@ -11,12 +11,12 @@
 
9
--- libkvm/libkvm.h.orig
 
10
+++ libkvm/libkvm.h
 
11
@@ -11,7 +11,7 @@
12
12
 #define __user /* temporary, until installed via make headers_install */
13
13
 #endif
14
14
 
15
15
-#include <linux/kvm.h>
16
16
+#include "linux/kvm.h"
17
17
 
18
 
 #define u32 uint32_t  /* older kvm_para.h had a u32 exposed */
19
 
 #define u64 uint32_t  /* older kvm_para.h had a u32 exposed */
20
 
 #define PAGE_SIZE 4096
21
 
-#include <linux/kvm_para.h>
22
 
+#include "linux/kvm_para.h"
23
 
 #undef u32
24
 
 #undef u64
25
 
 #undef PAGE_SIZE
 
18
 #include <signal.h>
 
19