commit b9e70b542229387e55ecce6a1a4f1e445e71d16a
Author: Jan Rękorajski <[email protected]>
Date: Mon Mar 13 19:21:45 2017 +0100
- fix build
- rel 9
fix-types.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
linux-kvm.spec | 5 ++++-
2 files changed, 53 insertions(+), 1 deletion(-)
---
diff --git a/linux-kvm.spec b/linux-kvm.spec
index 54f86ef..e4aff8b 100644
--- a/linux-kvm.spec
+++ b/linux-kvm.spec
@@ -1,5 +1,5 @@
# TODO: use linux tarball when kernel 3.1 is released
-%define rel 8
+%define rel 9
%define snap 20110726
Summary: Native Linux KVM tool
Name: linux-kvm
@@ -10,6 +10,7 @@ Group: Applications/System
# git://github.com/penberg/linux-kvm.git
Source0: %{name}-%{version}-%{snap}.tar.bz2
# Source0-md5: b0b94a75d915f70ae14a089ddc7d7abb
+Patch0: fix-types.patch
BuildRequires: binutils-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -22,10 +23,12 @@ emulation.
%prep
%setup -q -n %{name}
+%patch0 -p1
%build
%{__make} -C tools/kvm \
CC="%{__cc} %{rpmcppflags} %{rpmcflags} %{rpmldflags}" \
+ WERROR=0 \
V=1
%install
diff --git a/fix-types.patch b/fix-types.patch
new file mode 100644
index 0000000..9065e3c
--- /dev/null
+++ b/fix-types.patch
@@ -0,0 +1,49 @@
+diff -ur linux-kvm/tools/kvm/builtin-run.c
linux-kvm-bioscall/tools/kvm/builtin-run.c
+--- linux-kvm/tools/kvm/builtin-run.c 2011-07-26 08:46:14.000000000 +0200
++++ linux-kvm-bioscall/tools/kvm/builtin-run.c 2017-03-13 19:08:42.249902232
+0100
+@@ -4,6 +4,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <termios.h>
++#include <sys/sysmacros.h>
+ #include <sys/utsname.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -ur linux-kvm/tools/kvm/include/kvm/e820.h
linux-kvm-bioscall/tools/kvm/include/kvm/e820.h
+--- linux-kvm/tools/kvm/include/kvm/e820.h 2011-07-26 08:46:14.000000000
+0200
++++ linux-kvm-bioscall/tools/kvm/include/kvm/e820.h 2017-03-13
19:13:40.660703177 +0100
+@@ -2,6 +2,7 @@
+ #define KVM_E820_H
+
+ #include <linux/types.h>
++#include "kvm/bios.h"
+
+ #define SMAP 0x534d4150 /* ASCII "SMAP" */
+
+@@ -13,6 +14,6 @@
+ u32 edx;
+ };
+
+-void e820_query_map(struct e820_query *query);
++bioscall void e820_query_map(struct e820_query *query);
+
+ #endif /* KVM_E820_H */
+diff -ur linux-kvm/tools/kvm/include/kvm/vesa.h
linux-kvm-bioscall/tools/kvm/include/kvm/vesa.h
+--- linux-kvm/tools/kvm/include/kvm/vesa.h 2011-07-26 08:46:14.000000000
+0200
++++ linux-kvm-bioscall/tools/kvm/include/kvm/vesa.h 2017-03-13
19:14:29.819084291 +0100
+@@ -2,6 +2,7 @@
+ #define KVM__VESA_H
+
+ #include <linux/types.h>
++#include "kvm/bios.h"
+
+ #define VESA_WIDTH 640
+ #define VESA_HEIGHT 480
+@@ -14,6 +15,6 @@
+ struct int10_args;
+
+ struct framebuffer *vesa__init(struct kvm *self);
+-void int10_handler(struct int10_args *args);
++bioscall void int10_handler(struct int10_args *args);
+
+ #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linux-kvm.git/commitdiff/b9e70b542229387e55ecce6a1a4f1e445e71d16a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
