[PATCH] grub2.inc: run autogen.sh before configure

[PATCH] grub2.inc: run autogen.sh before configure

[mingli.yu]

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

Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 meta/recipes-bsp/grub/grub2.inc   | 4 +++-
 meta/recipes-bsp/grub/grub_git.bb | 7 -------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index 0b169bf..d77a0d4 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -33,7 +33,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
            file://0001-grub-core-gettext-gettext.c-main_context-secondary_c.patch \
             "
 
-DEPENDS = "flex-native bison-native"
+DEPENDS = "flex-native bison-native autogen-native"
 
 SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
 SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"
@@ -60,6 +60,8 @@ do_configure_prepend() {
 	# for its own purposes. Remove the OE versions from the environment to
 	# avoid conflicts.
 	unset TARGET_CPPFLAGS TARGET_CFLAGS TARGET_CXXFLAGS TARGET_LDFLAGS
+	( cd ${S}
+	${S}/autogen.sh )
 }
 
 # grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are
diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb
index 7a900d0..493b695 100644
--- a/meta/recipes-bsp/grub/grub_git.bb
+++ b/meta/recipes-bsp/grub/grub_git.bb
@@ -1,7 +1,5 @@
 require grub2.inc
 
-DEPENDS += "autogen-native"
-
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_arm = "1"
 
@@ -34,11 +32,6 @@ EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont --program-
 
 EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}"
 
-do_configure_prepend() {
-    ( cd ${S}
-      ${S}/autogen.sh )
-}
-
 do_install_append () {
     install -d ${D}${sysconfdir}/grub.d
     rm -rf ${D}${libdir}/charset.alias
-- 
2.8.1

Re: [PATCH] grub2.inc: run autogen.sh before configure

[Burton, Ross]

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

On 1 August 2016 at 02:54, <mingli.yu@windriver.com> wrote:

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

This results in this change:

packages/corei7-64-poky-linux/grub-efi/grub-efi: PKGSIZE changed from
6787555 to 7524227 (+10%)
  * FILELIST: added "/usr/sbin/grub-sparc64-setup"
packages/corei7-64-poky-linux/grub-efi/grub-efi: FILELIST: added
"/usr/sbin/grub-sparc64-setup"
packages/corei7-64-poky-linux/grub/grub-dbg: PKGSIZE changed from 26159624
to 28829025 (+10%)
packages/corei7-64-poky-linux/grub/grub: PKGSIZE changed from 5942339 to
6679011 (+12%)
  * FILELIST: added "/usr/sbin/grub-sparc64-setup"
packages/corei7-64-poky-linux/grub/grub: FILELIST: added
"/usr/sbin/grub-sparc64-setup"

Is this intentional?

Ross

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

Re: [PATCH] grub2.inc: run autogen.sh before configure

[Yu, Mingli]

On 2016年08月02日 03:22, Burton, Ross wrote:
>
> On 1 August 2016 at 02:54, <mingli.yu@windriver.com
> <mailto:mingli.yu@windriver.com>> wrote:
>
>     When adding new source files from upstream the autogen.sh
>     script needs to be run
>
>
> This results in this change:
>
> packages/corei7-64-poky-linux/grub-efi/grub-efi: PKGSIZE changed from
> 6787555 to 7524227 (+10%)
>    * FILELIST: added "/usr/sbin/grub-sparc64-setup"
> packages/corei7-64-poky-linux/grub-efi/grub-efi: FILELIST: added
> "/usr/sbin/grub-sparc64-setup"
> packages/corei7-64-poky-linux/grub/grub-dbg: PKGSIZE changed from
> 26159624 to 28829025 (+10%)
> packages/corei7-64-poky-linux/grub/grub: PKGSIZE changed from 5942339 to
> 6679011 (+12%)
>    * FILELIST: added "/usr/sbin/grub-sparc64-setup"
> packages/corei7-64-poky-linux/grub/grub: FILELIST: added
> "/usr/sbin/grub-sparc64-setup"
>
> Is this intentional?

Thanks Ross! This is unintentional, adding autogen.sh in 
do_configure_prepend in grub2.inc results this issue, it is because:

* before add autogen.sh in grub2.inc, there is a patch
./meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch
   used to remove grub-sparc64-setup in Makefile.util.am for x86 builds.

* After add autogen.sh in grub2.inc, the previous patch logic to remove
   grub-sparc64-setup in Makefile.util.am for x86 builds is overwritten 
  by autogen.sh (Which will regenerate Makefile.util.am) in do_configure 
phase.

Anyway, resend the V2 patch to remove the side effect.

Thanks,
Grace
> Ross