From 2a2c776e062302a5b786ac975a0dd39ef396f812 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Thu, 12 Jul 2007 13:20:47 +0300 Subject: kvm: external module: rename original kernel's modules when installing this avoids an ambiguity when using the kvm external module in conjuction with 2.6.20 or later, which may also have kvm built. --- kvm/kernel/Makefile | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.3