[PATCH 0/4] fix header-sync using --with-patched-kernel

[PATCH 0/4] fix header-sync using --with-patched-kernel

[Mark McLoughlin]

Hi Avi,
        Here are a few fairly trivial build patches - they fix
building kvm.git using --with-patched-kernel alongside an unconfigured
kvm.git tree.

Cheers,
Mark.

[PATCH 1/4] kvm: configure: remove unused depmod_version

[Mark McLoughlin]

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 configure |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index b9419c0..a2aad59 100755
--- a/configure
+++ b/configure
@@ -16,7 +16,6 @@ arch=`uname -m`
 target_exec=
 # don't use uname if kerneldir is set
 no_uname=
-depmod_version=
 if [ -z "TMPDIR" ] ; then
     TMPDIR=.
 fi
-- 
1.6.0.6

[PATCH 2/4] kvm: configure: run kernel configure even with --with-patched-kernel

[Mark McLoughlin]

We still run header-sync in this case, which requires configure
to have been run.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index a2aad59..49c4419 100755
--- a/configure
+++ b/configure
@@ -117,7 +117,7 @@ processor=${arch#*-}
 arch=${arch%%-*}
 
 #configure kernel module
-[[ -n "$want_module" ]] && (cd kernel;
+[ -e kernel/Makefile ] && (cd kernel;
     ./configure \
 	--kerneldir="$kerneldir" \
 	--arch="$arch" \
-- 
1.6.0.6

[PATCH 3/4] kvm: configure: pass --with-patched-kernel to kernel/configure

[Mark McLoughlin]

We need to know this so that we can avoid doing things that
are specific to building kvm.ko - e.g. when we are only
doing header-sync.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 configure        |    1 +
 kernel/configure |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 49c4419..249c743 100755
--- a/configure
+++ b/configure
@@ -121,6 +121,7 @@ arch=${arch%%-*}
     ./configure \
 	--kerneldir="$kerneldir" \
 	--arch="$arch" \
+	$([ -z ${want_module} ] && echo "--with-patched-kernel") \
 	${cross_prefix:+"--cross-prefix=$cross_prefix"} \
 	${kvm_trace:+"--with-kvm-trace"}
 )
diff --git a/kernel/configure b/kernel/configure
index 79fb093..3fd0c94 100755
--- a/kernel/configure
+++ b/kernel/configure
@@ -6,6 +6,7 @@ cc=gcc
 ld=ld
 objcopy=objcopy
 ar=ar
+want_module=1
 kvm_trace=
 cross_prefix=
 arch=`uname -m`
@@ -44,6 +45,9 @@ while [[ "$1" = -* ]]; do
 	    kerneldir="$arg"
             no_uname=1
 	    ;;
+	--with-patched-kernel)
+	    want_module=
+	    ;;
 	--with-kvm-trace)
 	    kvm_trace=y
 	    ;;
-- 
1.6.0.6

[PATCH 4/4] kvm: configure: --with-patched-kernel doesn't need kernelversion

[Mark McLoughlin]

DEPMOD_VERSION is only used for kvm.ko, not for e.g. header-sync.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 kernel/configure |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kernel/configure b/kernel/configure
index 3fd0c94..7a222e4 100755
--- a/kernel/configure
+++ b/kernel/configure
@@ -12,6 +12,7 @@ cross_prefix=
 arch=`uname -m`
 # don't use uname if kerneldir is set
 no_uname=
+# we only need depmod_version for kvm.ko install
 depmod_version=
 if [ -z "TMPDIR" ] ; then
     TMPDIR=.
@@ -80,7 +81,7 @@ if [ -d "$kerneldir/include2" ]; then
     kernelsourcedir=${kerneldir%/*}/source
 fi
 
-if [ -n "$no_uname" ]; then
+if [ -n "$no_uname" -a "$want_module" ]; then
     if [ -e "$kerneldir/.kernelrelease" ]; then
         depmod_version=`cat "$kerneldir/.kernelrelease"`
 
-- 
1.6.0.6

Re: [PATCH 0/4] fix header-sync using --with-patched-kernel

[Avi Kivity]

Mark McLoughlin wrote:
> Hi Avi,
>         Here are a few fairly trivial build patches - they fix
> building kvm.git using --with-patched-kernel alongside an unconfigured
> kvm.git tree.
>   

Applied all, thanks.

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.