[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5958/8267] grub: Update to 2.02

[Emmanuele Bassi <ebassi src gnome org>]

commit 67d7ea7c675910f4da548639cdee31073cdf59fa
Author: Khem Raj <raj khem gmail com>
Date:   Fri Apr 21 20:36:06 2017 +0000

    grub: Update to 2.02
    
    Drop git recipe, add arm bits to 2.02 itself
    
    (From OE-Core rev: 4f27e4042dfb39caa71c7c6eb0a327de6af4d563)
    
    Signed-off-by: Khem Raj <raj khem gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...-mfpmath-sse-as-well-when-SSE-is-disabled.patch |    0
 ...nforce-no-pie-if-the-compiler-supports-it.patch |   45 -------
 ...E-2015-8370-Grub2-user-pass-vulnerability.patch |   53 --------
 ...ct-_llseek-code-and-require-long-filesyst.patch |   81 ------------
 ...Use-AC_HEADER_MAJOR-to-find-device-macros.patch |   92 --------------
 ...ettext-gettext.c-main_context-secondary_c.patch |   39 ------
 ...ern-efi-mm.c-grub_efi_finish_boot_service.patch |   79 ------------
 ...1-grub.d-10_linux.in-add-oe-s-kernel-name.patch |    0
 ..._dhcp_vendor-Add-missing-const-qualifiers.patch |   33 -----
 ...ern-efi-mm.c-grub_efi_get_memory_map-Neve.patch |   43 -------
 .../{grub => files}/autogen.sh-exclude-pc.patch    |    0
 .../grub/files/check-if-liblzma-is-disabled.patch  |   33 -----
 .../grub/files/fix-endianness-problem.patch        |   44 -------
 .../grub/files/fix-issue-with-flex-2.5.37.patch    |   21 ---
 meta/recipes-bsp/grub/files/fix-texinfo.patch      |   32 -----
 .../grub/files/grub-2.00-add-oe-kernel.patch       |   53 --------
 .../grub-2.00-fix-enable_execute_stack-check.patch |   27 ----
 .../grub/files/grub-2.00-fpmath-sse-387-fix.patch  |   24 ----
 ...allow-a-compilation-without-mcmodel-large.patch |  131 --------------------
 .../grub/files/grub-efi-fix-with-glibc-2.20.patch  |   32 -----
 meta/recipes-bsp/grub/files/grub-install.in.patch  |   20 ---
 .../grub/files/grub-no-unused-result.patch         |   19 ---
 .../grub/files/grub2-fix-initrd-size-bug.patch     |   48 -------
 ...rub2-remove-sparc64-setup-from-x86-builds.patch |   44 -------
 meta/recipes-bsp/grub/files/remove-gets.patch      |   20 ---
 .../grub/{grub-efi_2.00.bb => grub-efi_2.02.bb}    |    9 +-
 meta/recipes-bsp/grub/grub2.inc                    |   50 ++++----
 meta/recipes-bsp/grub/grub_2.00.bb                 |   20 ---
 meta/recipes-bsp/grub/grub_2.02.bb                 |   14 ++
 meta/recipes-bsp/grub/grub_git.bb                  |   45 -------
 30 files changed, 40 insertions(+), 1111 deletions(-)
---
diff --git a/meta/recipes-bsp/grub/grub-git/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch 
b/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
similarity index 100%
rename from meta/recipes-bsp/grub/grub-git/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
rename to meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
diff --git a/meta/recipes-bsp/grub/grub-git/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch 
b/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
similarity index 100%
rename from meta/recipes-bsp/grub/grub-git/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
rename to meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
diff --git a/meta/recipes-bsp/grub/grub/autogen.sh-exclude-pc.patch 
b/meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch
similarity index 100%
rename from meta/recipes-bsp/grub/grub/autogen.sh-exclude-pc.patch
rename to meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch
diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.02.bb
similarity index 88%
rename from meta/recipes-bsp/grub/grub-efi_2.00.bb
rename to meta/recipes-bsp/grub/grub-efi_2.02.bb
index e12f1d7..9d494d5 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.00.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.02.bb
@@ -1,8 +1,9 @@
 require grub2.inc
 
+GRUBPLATFORM = "efi"
+
 DEPENDS_class-target = "grub-efi-native"
 RDEPENDS_${PN}_class-target = "diffutils freetype"
-PR = "r3"
 
 SRC_URI += " \
            file://cfg \
@@ -29,11 +30,7 @@ python __anonymous () {
 inherit deploy
 
 CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN="
-EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \
-                --enable-efiemu=no --program-prefix='' \
-                --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no \
-                --enable-largefile \
-"
+EXTRA_OECONF += "--enable-efiemu=no"
 
 # ldm.c:114:7: error: trampoline generated for nested function 'hook' [-Werror=trampolines]
 # and many other places in the grub code when compiled with some native gcc compilers (specifically, gentoo)
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index ef893b3..bb6ebdd 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -12,41 +12,37 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
-           file://grub-module-explicitly-keeps-symbole-.module_license.patch \
-           file://grub-2.00-fpmath-sse-387-fix.patch \
-           file://check-if-liblzma-is-disabled.patch \
-           file://fix-issue-with-flex-2.5.37.patch \
-           file://grub-2.00-add-oe-kernel.patch \
-           file://grub-install.in.patch \
-           file://remove-gets.patch \
-           file://fix-endianness-problem.patch \
-           file://grub2-remove-sparc64-setup-from-x86-builds.patch \
-           file://grub-2.00-fix-enable_execute_stack-check.patch \
-           file://grub-no-unused-result.patch \
-           file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \
-           file://grub-efi-fix-with-glibc-2.20.patch \
+           file://0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch \
            file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
-           file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \
-           file://grub2-fix-initrd-size-bug.patch \
-           file://0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch \
-           file://0001-Remove-direct-_llseek-code-and-require-long-filesyst.patch \
-           file://fix-texinfo.patch \
-           file://0001-grub-core-gettext-gettext.c-main_context-secondary_c.patch \
-           file://0001-Enforce-no-pie-if-the-compiler-supports-it.patch \
-           file://0001-grub-core-kern-efi-mm.c-grub_efi_finish_boot_service.patch \
-           file://0002-grub-core-kern-efi-mm.c-grub_efi_get_memory_map-Neve.patch \
-           file://0001-build-Use-AC_HEADER_MAJOR-to-find-device-macros.patch \
-            "
+           file://autogen.sh-exclude-pc.patch \
+           file://grub-module-explicitly-keeps-symbole-.module_license.patch \
+"
+SRC_URI[md5sum] = "1116d1f60c840e6dbd67abbc99acb45d"
+SRC_URI[sha256sum] = "660ee136fbcee08858516ed4de2ad87068bfe1b6b8b37896ce3529ff054a726d"
 
 DEPENDS = "flex-native bison-native autogen-native"
 
-SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
-SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)'
+COMPATIBLE_HOST_armv7a = 'null'
+COMPATIBLE_HOST_armv7ve = 'null'
 
-COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'
+# configure.ac has code to set this automagically from the target tuple
+# but the OE freeform one (core2-foo-bar-linux) don't work with that.
+
+GRUBPLATFORM_arm = "uboot"
+GRUBPLATFORM_aarch64 = "efi"
+GRUBPLATFORM ??= "pc"
 
 inherit autotools gettext texinfo
 
+EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} \
+                --disable-grub-mkfont \
+                --program-prefix="" \
+                --enable-liblzma=no \
+                --enable-libzfs=no \
+                --enable-largefile \
+"
+
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse"
 PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2"
diff --git a/meta/recipes-bsp/grub/grub_2.02.bb b/meta/recipes-bsp/grub/grub_2.02.bb
new file mode 100644
index 0000000..57c6559
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub_2.02.bb
@@ -0,0 +1,14 @@
+require grub2.inc
+
+RDEPENDS_${PN} = "diffutils freetype grub-editenv"
+
+PACKAGES =+ "grub-editenv"
+
+FILES_grub-editenv = "${bindir}/grub-editenv"
+
+do_install_append () {
+    install -d ${D}${sysconfdir}/grub.d
+}
+
+INSANE_SKIP_${PN} = "arch"
+INSANE_SKIP_${PN}-dbg = "arch"