Re: [PATCH] lguest: move the lguest tool to the tools directory

[Davidlohr Bueso <dave@gnu.org>]

On Sat, 2011-12-03 at 15:38 +1030, Rusty Russell wrote:
> On Fri, 02 Dec 2011 22:52:39 +0100, Davidlohr Bueso <dave@gnu.org> wrote:
> > From: Davidlohr Bueso <dave@gnu.org>
> > 
> > This is a better location instead of having it in Documentation.
> > 
> > Signed-off-by: Davidlohr Bueso <dave@gnu.org>
> 
> Applied, thanks!  This has been on my TODO list for ages.  Almost since
> tools/ was created.
> 
> Weird that your patch didn't come through as a simple move and slight
> mod though: this way it's a pain to read :(  I checked, you didn't
> change anything.
> 
> But unfortunately that's a problem:
> $ make
> cc -m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -U_FORTIFY_SOURCE    lguest.c   -o lguest
> lguest.c:52:52: fatal error: ../../../include/linux/lguest_launcher.h: No such file or directory
> compilation terminated.
> make: *** [lguest] Error 1
> 
> You need this as well:
> 
> From: Rusty Russell <rusty@rustcorp.com.au>
> Subject: lguest: move the lguest tool to the tools directory (fixes)
> 
> Fixup complilation breakage from move.
> 
> Signed-off-by: Davidlohr Bueso <dave@gnu.org>
> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
> ---
>  drivers/lguest/Makefile |    2 +-
>  tools/lguest/lguest.c   |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/lguest/Makefile b/drivers/lguest/Makefile
> --- a/drivers/lguest/Makefile
> +++ b/drivers/lguest/Makefile
> @@ -18,7 +18,7 @@ Mastery: PREFIX=M
>  Beer:
>  	@for f in Preparation Guest Drivers Launcher Host Switcher Mastery; do echo "{==- $$f -==}"; make -s $$f; done; echo "{==-==}"
>  Preparation Preparation! Guest Drivers Launcher Host Switcher Mastery:
> -	@sh ../../Documentation/virtual/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'`
> +	@sh ../../tools/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'`
>  Puppy:
>  	@clear
>  	@printf "      __  \n (___()'\`;\n /,    /\`\n \\\\\\\"--\\\\\\   \n"
> diff --git a/tools/lguest/lguest.c b/tools/lguest/lguest.c
> --- a/tools/lguest/lguest.c
> +++ b/tools/lguest/lguest.c
> @@ -49,7 +49,7 @@
>  #include <linux/virtio_rng.h>
>  #include <linux/virtio_ring.h>
>  #include <asm/bootparam.h>
> -#include "../../../include/linux/lguest_launcher.h"
> +#include "../../include/linux/lguest_launcher.h"

Maybe because my git foo sucks but I had made that change and certainly
thought it was included in the patch, sorry about that.

Thanks,
Davidlohr

>  /*L:110
>   * We can ignore the 43 include files we need for this program, but I do want
>   * to draw attention to the use of kernel-style types.
>