>From ce37b613776ea71ed2c75c8302985aecb5e6799f Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
Date: Fri, 11 Jul 2008 13:13:52 +0800
Subject: [PATCH] KVM: userspace: Enable rpm build for kvm/ia64
Enable "make rpm" for kvm/ia64.
Signed-off-by: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
---
Makefile | 4 ++--
kernel/kvm-kmod.spec | 8 +++++---
kvm.spec | 6 ++++--
qemu/Makefile | 1 +
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 48a8dff..c7e7370 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ qemu: libkvm
ifneq '$(filter $(ARCH), i386 x86_64)' ''
qemu: extboot
endif
-ifneq '$(filter $(ARCH), powerpc)' ''
+ifneq '$(filter $(ARCH), powerpc, ia64)' ''
qemu: libfdt
endif
user: libkvm
@@ -73,7 +73,7 @@ install-rpm:
install -m 755 kvm_stat $(DESTDIR)/$(bindir)/kvm_stat
cp scripts/kvm $(DESTDIR)/$(initdir)/kvm
cp scripts/qemu-ifup $(DESTDIR)/$(confdir)/qemu-ifup
- install -t $(DESTDIR)/etc/udev/rules.d scripts/*kvm*.rules
+ install -C scripts/*kvm*.rules $(DESTDIR)/etc/udev/rules.d
install:
$(kcmd)make -C kernel DESTDIR="$(DESTDIR)" install
diff --git a/kernel/kvm-kmod.spec b/kernel/kvm-kmod.spec
index b56fdf1..89b3d88 100644
--- a/kernel/kvm-kmod.spec
+++ b/kernel/kvm-kmod.spec
@@ -10,11 +10,11 @@ License: GPL
URL: http://www.qumranet.com
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64 ia64
%description
This kernel module provides support for virtual machines using hardware
support
-(Intel VT or AMD SVM).
+(Intel VT-x&VT-i or AMD SVM).
%prep
@@ -27,7 +27,7 @@ rm -rf %{buildroot}
%define kverrel unknown
%define moddir /lib/modules/%{kverrel}/extra
mkdir -p %{buildroot}/%{moddir}
-cp %{objdir}/%{kmod_name}.ko %{objdir}/%{kmod_name}-intel.ko
%{objdir}/%{kmod_name}-amd.ko %{buildroot}/%{moddir}
+cp %{objdir}/%{kmod_name}.ko %{objdir}/%{kmod_name}-*.ko
%{buildroot}/%{moddir}
chmod u+x %{buildroot}/%{moddir}/%{kmod_name}*.ko
%post
@@ -43,7 +43,9 @@ depmod %{kverrel}
%files
%{moddir}/%{kmod_name}.ko
+%ifarch i386 x86_64
%{moddir}/%{kmod_name}-amd.ko
+%endif
%{moddir}/%{kmod_name}-intel.ko
diff --git a/kvm.spec b/kvm.spec
index af8271e..92acb0e 100644
--- a/kvm.spec
+++ b/kvm.spec
@@ -8,7 +8,7 @@ License: GPL
URL: http://www.qumranet.com
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64 ia64
Requires: kvm-kmod bridge-utils
@@ -58,7 +58,7 @@ Source8: extboot.tar.gz
%description
The Kernel Virtual Machine provides a virtualization enviroment for
processors
-with hardware support for virtualization: Intel's VT and AMD's AMD-V.
+with hardware support for virtualization: Intel's VT-x&VT-i and AMD's
AMD-V.
%prep
@@ -82,7 +82,9 @@ cd ..
./configure --prefix=/usr/kvm %{qemuldflags}
make -C libkvm
make -C user
+%ifarch i386 x86_64
make extboot
+%endif
#(cd qemu;
# ./co
# kpath="$(readlink -f ../kernel/include)"
diff --git a/qemu/Makefile b/qemu/Makefile
index 8ca17f7..627e255 100644
--- a/qemu/Makefile
+++ b/qemu/Makefile
@@ -231,6 +231,7 @@ endif
pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin extboot.bin
\
bamboo.dtb; \
do \
+ [ -f $(SRC_PATH)/pc-bios/$$x ] && \
$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x
"$(DESTDIR)$(datadir)"; \
done
ifndef CONFIG_WIN32
--
1.5.2
Attachment:
0004-KVM-userspace-Enable-rpm-build-for-kvm-ia64.patch
Description: 0004-KVM-userspace-Enable-rpm-build-for-kvm-ia64.patch
