When adding new source files from upstream the autogen.sh script needs to be run
Signed-off-by: Catalin Enache <catalin.ena...@windriver.com> Signed-off-by: Mingli Yu <mingli...@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 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
