[OE-core] [PATCH 1/2] qemu: add option to disable X grabs

[Richard Purdie]

On Wed, 2013-09-18 at 22:28 +0200, Eric Bénard wrote:
> Hi Ross,
> 
> Le Wed, 18 Sep 2013 17:48:45 +0100,
> Ross Burton <ross.burton at intel.com> a écrit :
> > diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
> > index 97e9b7b..1b861d7 100644
> > --- a/meta/recipes-devtools/qemu/qemu.inc
> > +++ b/meta/recipes-devtools/qemu/qemu.inc
> > @@ -17,6 +17,7 @@ SRC_URI = "\
> >      file://powerpc_rom.bin \
> >      file://no-strip.patch \
> >      file://larger_default_ram_size.patch \
> > +    file://disable-grabs.patch \
> >      "
> >  
> >  SRC_URI_append_class-nativesdk = "\
> 
> that seems to break the build here (while building meta-toolchain-qte) :
> ERROR: Command Error: exit status: 1  Output:
> Applying patch disable-grabs.patch
> patching file ui/sdl.c
> Hunk #3 FAILED at 912.
> 1 out of 3 hunks FAILED -- rejects in file ui/sdl.c
> Patch disable-grabs.patch does not apply (enforce with -f)
> ERROR: Function failed: patch_do_patch
> ERROR: Logfile of failure stored
> in: /scratch/eb/eukrea2/master/setup-scripts/build/tmp-defaultsetup-eglibc-eglibc/work/i686-nativesdk-oesdk-linux/nativesdk-qemu/1.5.0-r0/temp/log.do_patch.14821
> ERROR: Task 2313
> (virtual:nativesdk:/scratch/eb/eukrea2/master/setup-scripts/sources/openembedded-core/meta/recipes-devtools/qemu/qemu_1.5.0.bb,
> do_patch) failed with exit code '1'

Thanks for the report. I looked into it and somehow the patch was
corrupted. I've pushed a fix in.

Cheers,

Richard