aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub
diff options
context:
space:
mode:
authormingli.yu@windriver.com <mingli.yu@windriver.com>2016-08-02 14:38:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-04 15:05:47 +0100
commit949df030cf39e7f551302e1e6f86b0a270cd2181 (patch)
tree3978acad1a79abd14e8d840e8665c33e8c96d97b /meta/recipes-bsp/grub
parent5705b7a55bc300e14c34b0530f4d49df101edd3c (diff)
downloadopenembedded-core-949df030cf39e7f551302e1e6f86b0a270cd2181.tar.gz
openembedded-core-949df030cf39e7f551302e1e6f86b0a270cd2181.tar.bz2
openembedded-core-949df030cf39e7f551302e1e6f86b0a270cd2181.zip
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 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>
Diffstat (limited to 'meta/recipes-bsp/grub')
-rw-r--r--meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch140
-rw-r--r--meta/recipes-bsp/grub/grub2.inc4
-rw-r--r--meta/recipes-bsp/grub/grub_git.bb7
3 files changed, 43 insertions, 108 deletions
diff --git a/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch b/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch
index e15040d703..5168d3ca56 100644
--- a/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch
+++ b/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch
@@ -1,104 +1,44 @@
-Upstream-Status: Inappropriate [embedded specific]
+Subject: [PATCH] grub2: remove grub-sparc64-setup from x86 builds
+
+* remove the grub-sparc64-setup files from the x86 builds.
-remove the grub-sparc64-setup files from the x86 builds.
+Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ Makefile.util.def | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/Makefile.util.def b/Makefile.util.def
+index b80187c..a670cf2 100644
+--- a/Makefile.util.def
++++ b/Makefile.util.def
+@@ -321,24 +321,6 @@ program = {
+ };
+
+ program = {
+- name = grub-sparc64-setup;
+- installdir = sbin;
+- mansection = 8;
+- common = util/grub-setup.c;
+- common = util/lvm.c;
+- common = grub-core/kern/emu/argp_common.c;
+- common = grub-core/lib/reed_solomon.c;
+- common = util/ieee1275/ofpath.c;
+-
+- ldadd = libgrubmods.a;
+- ldadd = libgrubkern.a;
+- ldadd = libgrubgcry.a;
+- ldadd = grub-core/gnulib/libgnu.a;
+- ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+- cppflags = '-DGRUB_SETUP_SPARC64=1';
+-};
+-
+-program = {
+ name = grub-ofpathname;
+ installdir = sbin;
+ mansection = 8;
+--
+2.8.1
---- a/Makefile.util.am 2014-08-15 11:41:02.441011278 -0700
-+++ b/Makefile.util.am 2014-08-15 11:44:26.245021142 -0700
-@@ -4692,9 +4692,9 @@
- endif
-
- if COND_emu
--sbin_PROGRAMS += grub-sparc64-setup
-+sbin_PROGRAMS +=
- if COND_MAN_PAGES
--man_MANS += grub-sparc64-setup.8
-+man_MANS +=
-
- grub-sparc64-setup.8: grub-sparc64-setup
- chmod a+x grub-sparc64-setup
-@@ -4715,9 +4715,9 @@
- endif
-
- if COND_i386_pc
--sbin_PROGRAMS += grub-sparc64-setup
-+sbin_PROGRAMS +=
- if COND_MAN_PAGES
--man_MANS += grub-sparc64-setup.8
-+man_MANS +=
-
- grub-sparc64-setup.8: grub-sparc64-setup
- chmod a+x grub-sparc64-setup
-@@ -4738,9 +4738,9 @@
- endif
-
- if COND_i386_efi
--sbin_PROGRAMS += grub-sparc64-setup
-+sbin_PROGRAMS +=
- if COND_MAN_PAGES
--man_MANS += grub-sparc64-setup.8
-+man_MANS +=
-
- grub-sparc64-setup.8: grub-sparc64-setup
- chmod a+x grub-sparc64-setup
-@@ -4761,9 +4761,9 @@
- endif
-
- if COND_i386_qemu
--sbin_PROGRAMS += grub-sparc64-setup
-+sbin_PROGRAMS +=
- if COND_MAN_PAGES
--man_MANS += grub-sparc64-setup.8
-+man_MANS +=
-
- grub-sparc64-setup.8: grub-sparc64-setup
- chmod a+x grub-sparc64-setup
-@@ -4784,9 +4784,9 @@
- endif
-
- if COND_i386_coreboot
--sbin_PROGRAMS += grub-sparc64-setup
-+sbin_PROGRAMS +=
- if COND_MAN_PAGES
--man_MANS += grub-sparc64-setup.8
-+man_MANS +=
-
- grub-sparc64-setup.8: grub-sparc64-setup
- chmod a+x grub-sparc64-setup
-@@ -4807,9 +4807,9 @@
- endif
-
- if COND_i386_multiboot
--sbin_PROGRAMS += grub-sparc64-setup
-+sbin_PROGRAMS +=
- if COND_MAN_PAGES
--man_MANS += grub-sparc64-setup.8
-+man_MANS +=
-
- grub-sparc64-setup.8: grub-sparc64-setup
- chmod a+x grub-sparc64-setup
-@@ -4830,9 +4830,9 @@
- endif
-
- if COND_i386_ieee1275
--sbin_PROGRAMS += grub-sparc64-setup
-+sbin_PROGRAMS +=
- if COND_MAN_PAGES
--man_MANS += grub-sparc64-setup.8
-+man_MANS +=
-
- grub-sparc64-setup.8: grub-sparc64-setup
- chmod a+x grub-sparc64-setup
-@@ -4853,9 +4853,9 @@
- endif
-
- if COND_x86_64_efi
--sbin_PROGRAMS += grub-sparc64-setup
-+sbin_PROGRAMS +=
- if COND_MAN_PAGES
--man_MANS += grub-sparc64-setup.8
-+man_MANS +=
-
- grub-sparc64-setup.8: grub-sparc64-setup
- chmod a+x grub-sparc64-setup
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 \
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 7a900d02b2..493b6956ee 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