[PATCH] grub-efi: run autogen.sh before configure

[PATCH] grub-efi: run autogen.sh before configure

[Catalin Enache]

When adding new source files from upstream the autogen.sh
script needs to be run.

Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
---
 meta/recipes-bsp/grub/grub-efi_2.00.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb
index 5a0dc95..62ded6e 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.00.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb
@@ -2,6 +2,7 @@ require grub2.inc
 
 DEPENDS_class-target = "grub-efi-native"
 RDEPENDS_${PN}_class-target = "diffutils freetype"
+DEPENDS += "autogen-native"
 PR = "r3"
 
 SRC_URI += " \
@@ -39,6 +40,11 @@ EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-
 # and many other places in the grub code when compiled with some native gcc compilers (specifically, gentoo)
 CFLAGS_append_class-native = " -Wno-error=trampolines"
 
+do_configure_prepend() {
+    ( cd ${S}
+    ${S}/autogen.sh )
+}
+
 do_install_class-native() {
 	install -d ${D}${bindir}
 	install -m 755 grub-mkimage ${D}${bindir}
-- 
2.7.4

Re: [PATCH] grub-efi: run autogen.sh before configure

[Yu, Mingli]

ping

Thanks,
Grace

On 2016年05月06日 20:13, Catalin Enache wrote:
> When adding new source files from upstream the autogen.sh
> script needs to be run.
>
> Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
> ---
>   meta/recipes-bsp/grub/grub-efi_2.00.bb | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb
> index 5a0dc95..62ded6e 100644
> --- a/meta/recipes-bsp/grub/grub-efi_2.00.bb
> +++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb
> @@ -2,6 +2,7 @@ require grub2.inc
>
>   DEPENDS_class-target = "grub-efi-native"
>   RDEPENDS_${PN}_class-target = "diffutils freetype"
> +DEPENDS += "autogen-native"
>   PR = "r3"
>
>   SRC_URI += " \
> @@ -39,6 +40,11 @@ EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-
>   # and many other places in the grub code when compiled with some native gcc compilers (specifically, gentoo)
>   CFLAGS_append_class-native = " -Wno-error=trampolines"
>
> +do_configure_prepend() {
> +    ( cd ${S}
> +    ${S}/autogen.sh )
> +}
> +
>   do_install_class-native() {
>   	install -d ${D}${bindir}
>   	install -m 755 grub-mkimage ${D}${bindir}
>

Re: [PATCH] grub-efi: run autogen.sh before configure

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]

On 6 May 2016 at 13:13, Catalin Enache <catalin.enache@windriver.com> wrote:

>  DEPENDS_class-target = "grub-efi-native"
>  RDEPENDS_${PN}_class-target = "diffutils freetype"
> +DEPENDS += "autogen-native"
>

Because += happens after overrides this results in autogen-native only a
dependency in native builds, so you can't be sure it will be present for
target builds.

Should the configure_prepend and autogen-native be added to grub2.inc so
that every recipe has that dependency?

Ross

[-- Attachment #2: Type: text/html, Size: 995 bytes --]

Re: [PATCH] grub-efi: run autogen.sh before configure

[Yu, Mingli]

On 2016年07月11日 18:22, Burton, Ross wrote:
>
> On 6 May 2016 at 13:13, Catalin Enache <catalin.enache@windriver.com
> <mailto:catalin.enache@windriver.com>> wrote:
>
>       DEPENDS_class-target = "grub-efi-native"
>       RDEPENDS_${PN}_class-target = "diffutils freetype"
>     +DEPENDS += "autogen-native"
>
>
> Because += happens after overrides this results in autogen-native only a
> dependency in native builds, so you can't be sure it will be present for
> target builds.

Thanks Ross! Will update the line as:
DEPENDS_append = " autogen-native"
>
> Should the configure_prepend and autogen-native be added to grub2.inc so
> that every recipe has that dependency?

Hi Catalin,
Could you help to confirm if the three recipes (grub-efi_2.00.bb, 
grub_2.00.bb, grub_git.bb) all need configure_prepend and 
autogen-native? if yes, I will resent the patch to add configure_prepend 
and autogen-native to grub2.inc, if not, then we still let it stay in 
grub-efi recipe.

Thanks,
Grace
>
> Ross
>
>

Re: [PATCH] grub-efi: run autogen.sh before configure

[Ioan-Adrian Ratiu]

Hello

On Tue, 12 Jul 2016 11:27:15 +0800
"Yu, Mingli" <mingli.yu@windriver.com> wrote:

> On 2016年07月11日 18:22, Burton, Ross wrote:
> >
> > On 6 May 2016 at 13:13, Catalin Enache <catalin.enache@windriver.com
> > <mailto:catalin.enache@windriver.com>> wrote:
> >
> >       DEPENDS_class-target = "grub-efi-native"
> >       RDEPENDS_${PN}_class-target = "diffutils freetype"
> >     +DEPENDS += "autogen-native"
> >
> >
> > Because += happens after overrides this results in autogen-native only a
> > dependency in native builds, so you can't be sure it will be present for
> > target builds.  
> 
> Thanks Ross! Will update the line as:
> DEPENDS_append = " autogen-native"
> >
> > Should the configure_prepend and autogen-native be added to grub2.inc so
> > that every recipe has that dependency?  
> 
> Hi Catalin,
> Could you help to confirm if the three recipes (grub-efi_2.00.bb, 
> grub_2.00.bb, grub_git.bb) all need configure_prepend and 
> autogen-native? if yes, I will resent the patch to add configure_prepend 
> and autogen-native to grub2.inc, if not, then we still let it stay in 
> grub-efi recipe.

I would really appreciate if you could add the autogen call to all grub recipes,
not only to grub-efi, because I'm also carrying OOT patches and have to add
it into a bbappend.

> 
> Thanks,
> Grace
> >
> > Ross
> >
> >