diff options
author | mingli.yu@windriver.com <mingli.yu@windriver.com> | 2016-08-02 14:38:10 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-04 15:22:23 +0100 |
commit | 1f1ac9fbdac3d74f32e268fda547eb1d0e3c6266 (patch) | |
tree | 3426c49993d6be83375ff2337f79ccfa688d4736 /meta/recipes-bsp/grub/grub2.inc | |
parent | 37f1e0c154cf542dee2af143760730b53b749d61 (diff) | |
download | poky-1f1ac9fbdac3d74f32e268fda547eb1d0e3c6266.tar.gz |
grub2.inc: run autogen.sh before configure
* When adding new source files from upstream the autogen.sh
script needs to be run
* Rework grub2-remove-sparc64-setup-from-x86-builds.patch
to remove the grub-setup helper program grub-sparc64-setup
in Makefile.util.def instead of the previous Makefile.util.am
to avoid the update for Makefile.util.am in do_patch phase is
overwritten by the autogen.sh in do_configure phase
(From OE-Core rev: 949df030cf39e7f551302e1e6f86b0a270cd2181)
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub/grub2.inc')
-rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 0b169bfbea..d77a0d4fd9 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 \ | |||
33 | file://0001-grub-core-gettext-gettext.c-main_context-secondary_c.patch \ | 33 | file://0001-grub-core-gettext-gettext.c-main_context-secondary_c.patch \ |
34 | " | 34 | " |
35 | 35 | ||
36 | DEPENDS = "flex-native bison-native" | 36 | DEPENDS = "flex-native bison-native autogen-native" |
37 | 37 | ||
38 | SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" | 38 | SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" |
39 | SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" | 39 | SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" |
@@ -60,6 +60,8 @@ do_configure_prepend() { | |||
60 | # for its own purposes. Remove the OE versions from the environment to | 60 | # for its own purposes. Remove the OE versions from the environment to |
61 | # avoid conflicts. | 61 | # avoid conflicts. |
62 | unset TARGET_CPPFLAGS TARGET_CFLAGS TARGET_CXXFLAGS TARGET_LDFLAGS | 62 | unset TARGET_CPPFLAGS TARGET_CFLAGS TARGET_CXXFLAGS TARGET_LDFLAGS |
63 | ( cd ${S} | ||
64 | ${S}/autogen.sh ) | ||
63 | } | 65 | } |
64 | 66 | ||
65 | # grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are | 67 | # grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are |