[OE-core] [PATCH 5/5] grub-efi-native: fix errors with automake 1.11.2

[Kamble, Nitin A]

> -----Original Message-----
> From: Saul Wold [mailto:sgw at linux.intel.com]
> Sent: Tuesday, January 17, 2012 1:45 PM
> To: Patches and discussions about the oe-core layer
> Cc: Kamble, Nitin A
> Subject: Re: [OE-core] [PATCH 5/5] grub-efi-native: fix errors with
> automake 1.11.2
> 
> On 01/17/2012 12:30 PM, nitin.a.kamble at intel.com wrote:
> > From: Nitin A Kamble<nitin.a.kamble at intel.com>
> >
> > This commit replaces earlier patch
> > (grub-1.99_fix_for_automake_1.11.2.patch) which did not work on all
> distros.
> >
> > Fixes these errors observed with automake 1.11.2
> > The useof pkglibhas become more strict compared to the earlier
> release
> > of
> > automake resulting in these failures.
> > Fixed the files related to automake to avoid the issue.
> >
> > | conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
> > for `DATA'
> > | grub-core/Makefile.am:5:   `conf/Makefile.common' included from
> here
> > | conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
> > for `DATA'
> > | Makefile.am:6:   `conf/Makefile.common' included from here
> > | autoreconf: automake failed with exit status: 1
> > | ERROR: autoreconf execution failed.
> >
> > | conf/Makefile.common:150: `pkglibdir' is not a legitimate directory
> > for `SCRIPTS'
> > | grub-core/Makefile.am:5:   `conf/Makefile.common' included from
> here
> > | conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
> > for `DATA'
> > | grub-core/Makefile.am:5:   `conf/Makefile.common' included from
> here
> > | conf/Makefile.common:150: `pkglibdir' is not a legitimate directory
> > for `SCRIPTS'
> > | Makefile.am:6:   `conf/Makefile.common' included from here
> > | conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
> > for `DATA'
> > | Makefile.am:6:   `conf/Makefile.common' included from here
> > | autoreconf: automake failed with exit status: 1
> >
> > Signed-off-by: Nitin A Kamble<nitin.a.kamble at intel.com>
> > ---
> >   .../files/grub-1.99_fix_for_automake_1.11.2.patch  | 5808 ---------
> -----------
> >   meta/recipes-bsp/grub/grub-efi-native_1.99.bb      |    4 +-
> >   2 files changed, 2 insertions(+), 5810 deletions(-)
> >
> > diff --git a/meta/recipes-bsp/grub/files/grub-
> 1.99_fix_for_automake_1.11.2.patch b/meta/recipes-bsp/grub/files/grub-
> 1.99_fix_for_automake_1.11.2.patch
> > index 1c70e4a..4d729e5 100644
> > --- a/meta/recipes-bsp/grub/files/grub-
> 1.99_fix_for_automake_1.11.2.patch
> > +++ b/meta/recipes-bsp/grub/files/grub-
> 1.99_fix_for_automake_1.11.2.patch
> > @@ -65,5612 +65,6 @@ Index: grub-1.99/Makefile.am
> >
> >
> Missing Patch header with Upstream-Status: and Signed-off-by:
> 
> Sau!
Saul,
  It is not missing: http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/tree/meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch?h=nitin/misc&id=c81dac1964de6f926fce11c00f2a90a7ed76d577

Nitin

> 
> >    if COND_i386_coreboot
> > -Index: grub-1.99/Makefile.tpl
> > -===================================================================
> > ---- grub-1.99.orig/Makefile.tpl
> > -+++ grub-1.99/Makefile.tpl
> 
> <SNIP>
> 
> > - CLEANFILES += genmod.sh
> > diff --git a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
> b/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
> > index b976d1e..dfa4725 100644
> > --- a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
> > +++ b/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
> > @@ -14,9 +14,9 @@ LICENSE = "GPLv3"
> >   LIC_FILES_CHKSUM =
> "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> >
> >   # FIXME: We should be able to optionally drop freetype as a
> dependency
> > -DEPENDS = "help2man-native"
> > +DEPENDS = "help2man-native autogen-native"
> >   RDEPENDS_${PN} = "diffutils freetype"
> > -PR = "r3"
> > +PR = "r4"
> >
> >   # Native packages do not normally rebuild when the target changes.
> >   # Ensure this is built once per HOST-TARGET pair.