[PATCH] Fix kvm-79 userland for separate kernel objdir

[PATCH] Fix kvm-79 userland for separate kernel objdir

[Andi Kleen]

I needed this patch to make kvm-79 build (with --with-patched-kernel)
with separate kernel objdir and 2.6.28-rc5

-Andi

--- kvm-79/Makefile~	2008-11-12 12:48:01.000000000 +0100
+++ kvm-79/Makefile	2008-11-20 14:06:57.000000000 +0100
@@ -33,7 +33,7 @@
 header-sync-n:
 
 header-sync-y:
-	make -C kernel LINUX=$(KERNELDIR) header-sync
+	make -C kernel LINUX=$(KERNELSOURCEDIR) header-sync
 	rm -f kernel/include/asm
 	ln -sf asm-$(sane-arch) kernel/include/asm
 
-- 
ak@linux.intel.com

Re: [PATCH] Fix kvm-79 userland for separate kernel objdir

[Christian Borntraeger]

Am Donnerstag, 20. November 2008 schrieb Andi Kleen:
> --- kvm-79/Makefile~	2008-11-12 12:48:01.000000000 +0100
> +++ kvm-79/Makefile	2008-11-20 14:06:57.000000000 +0100
> @@ -33,7 +33,7 @@
>  header-sync-n:
> 
>  header-sync-y:
> -	make -C kernel LINUX=$(KERNELDIR) header-sync
> +	make -C kernel LINUX=$(KERNELSOURCEDIR) header-sync
>  	rm -f kernel/include/asm
>  	ln -sf asm-$(sane-arch) kernel/include/asm

Hmm. In my config.mak KERNELSOURCEDIR is empty. Looks like
this patch would break headers_sync on kernels without a separate
objdirs or builds with configure --kerneldir=blah.

Christian

Re: [PATCH] Fix kvm-79 userland for separate kernel objdir

[Andi Kleen]

On Thu, Nov 20, 2008 at 02:22:04PM +0100, Christian Borntraeger wrote:
> Am Donnerstag, 20. November 2008 schrieb Andi Kleen:
> > --- kvm-79/Makefile~	2008-11-12 12:48:01.000000000 +0100
> > +++ kvm-79/Makefile	2008-11-20 14:06:57.000000000 +0100
> > @@ -33,7 +33,7 @@
> >  header-sync-n:
> > 
> >  header-sync-y:
> > -	make -C kernel LINUX=$(KERNELDIR) header-sync
> > +	make -C kernel LINUX=$(KERNELSOURCEDIR) header-sync
> >  	rm -f kernel/include/asm
> >  	ln -sf asm-$(sane-arch) kernel/include/asm
> 
> Hmm. In my config.mak KERNELSOURCEDIR is empty. Looks like
> this patch would break headers_sync on kernels without a separate
> objdirs or builds with configure --kerneldir=blah.

How about this variant? Does it work for you?

-Andi

--- kvm-79/Makefile~	2008-11-12 12:48:01.000000000 +0100
+++ kvm-79/Makefile	2008-11-20 14:36:54.000000000 +0100
@@ -33,7 +33,9 @@
 header-sync-n:
 
 header-sync-y:
-	make -C kernel LINUX=$(KERNELDIR) header-sync
+	make -C kernel \
+	LINUX=$(if "$(KERNELSOURCEDIR)",$(KERNELSOURCEDIR),$(KERNELDIR)) \
+	header-sync
 	rm -f kernel/include/asm
 	ln -sf asm-$(sane-arch) kernel/include/asm
 

Re: [PATCH] Fix kvm-79 userland for separate kernel objdir

[Christian Borntraeger]

Am Donnerstag, 20. November 2008 schrieb Andi Kleen:
> How about this variant? Does it work for you?
> 
> -Andi
> 
> --- kvm-79/Makefile~	2008-11-12 12:48:01.000000000 +0100
> +++ kvm-79/Makefile	2008-11-20 14:36:54.000000000 +0100
> @@ -33,7 +33,9 @@
>  header-sync-n:
> 
>  header-sync-y:
> -	make -C kernel LINUX=$(KERNELDIR) header-sync
> +	make -C kernel \
> +	LINUX=$(if "$(KERNELSOURCEDIR)",$(KERNELSOURCEDIR),$(KERNELDIR)) \
> +	header-sync

Nope.
cborntra@cborntra:/space/kvm-userspace$ make
make -C kernel \
        LINUX= \
        header-sync
fatal: Not a git repository
make[1]: Entering directory `/space/kvm-userspace/kernel'
rm -rf header-tmp
rsync -R \
             ""/./include/linux/kvm*.h \
              \
             header-tmp/
rsync: link_stat "/include/linux/kvm*.h" failed: No such file or directory (2)
rsync error: some files could not be transferred (code 23) at main.c(1058) 
[sender=3.0.3]
make[1]: *** [header-sync] Fehler 23
make[1]: Leaving directory `/space/kvm-userspace/kernel'
make: *** [header-sync-y] Fehler 2



But

	LINUX=$(if $(KERNELSOURCEDIR),$(KERNELSOURCEDIR),$(KERNELDIR)) \
(without the " ) 

seems to work.

Re: [PATCH] Fix kvm-79 userland for separate kernel objdir

[Andi Kleen]

> But
> 
> 	LINUX=$(if $(KERNELSOURCEDIR),$(KERNELSOURCEDIR),$(KERNELDIR)) \
> (without the " ) 
> 
> seems to work.

Ok. I've never been very good at writing Makefiles.
Looks good with that too.

-Andi

-- 
ak@linux.intel.com