aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-07-12 13:20:47 +0300
committerAvi Kivity <avi@qumranet.com>2007-07-12 13:20:47 +0300
commit2a2c776e062302a5b786ac975a0dd39ef396f812 (patch)
tree9c47f71e8240e4c36cc04f7a8841be734d86eb11
parent281697f926d67ccb3de7a838082031a6dbec0a11 (diff)
kvm: external module: rename original kernel's modules when installingkvm-29
this avoids an ambiguity when using the kvm external module in conjuction with 2.6.20 or later, which may also have kvm built.
-rw-r--r--kvm/kernel/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/kvm/kernel/Makefile b/kvm/kernel/Makefile
index bcf1360a1..7eae95b79 100644
--- a/kvm/kernel/Makefile
+++ b/kvm/kernel/Makefile
@@ -5,6 +5,7 @@ KVERREL = $(patsubst /lib/modules/%/build,%,$(KERNELDIR))
DESTDIR=
INSTALLDIR = $(patsubst %/build,%/extra,$(KERNELDIR))
+ORIGMODDIR = $(patsubst %/build,%/kernel,$(KERNELDIR))
rpmrelease = devel
@@ -40,6 +41,7 @@ sync:
install:
mkdir -p $(DESTDIR)/$(INSTALLDIR)
cp *.ko $(DESTDIR)/$(INSTALLDIR)
+ for i in $(ORIGMODDIR)/drivers/kvm/*.ko; do mv $$i $$i.orig; done
/sbin/depmod -a
tmpspec = .tmp.kvm-kmod.spec