[gnome-continuous-yocto/gnomeostree-3.28-rocko: 105/218] grub: Move grub-editenv packaging to grub2.inc

[Emmanuele Bassi <ebassi src gnome org>]

commit e49391d58cc938d02f8252de65ffa2ebab38fe03
Author: Otavio Salvador <otavio ossystems com br>
Date:   Tue Jan 23 14:56:25 2018 -0200

    grub: Move grub-editenv packaging to grub2.inc
    
    The editenv utility must be available on grub and grub-efi so we
    better have it inside the grub2.inc file to avoid the duplication of
    metadata.
    
    (From OE-Core rev: 80f340f25ffdf7b8ca7a6ccf2e12f28b46b3c70d)
    
    Signed-off-by: Otavio Salvador <otavio ossystems com br>
    Signed-off-by: Ross Burton <ross burton intel com>
    (cherry picked from commit ebdd054ad85b19d47dd20eab0ba3f31ef5141140)
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-bsp/grub/grub2.inc    |    6 ++++++
 meta/recipes-bsp/grub/grub_2.02.bb |    6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index a56fbe7..28f96bb 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -70,3 +70,9 @@ do_configure_prepend() {
 # grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are
 # conflicted, remove it since no one uses it.
 SYSROOT_DIRS_BLACKLIST += "${datadir}/grub/grub-mkconfig_lib"
+
+PACKAGES =+ "${PN}-editenv"
+
+FILES_${PN}-editenv = "${bindir}/grub-editenv"
+RDEPENDS_${PN} += "${PN}-editenv"
+RDEPENDS_${PN}_class-native = ""
diff --git a/meta/recipes-bsp/grub/grub_2.02.bb b/meta/recipes-bsp/grub/grub_2.02.bb
index b8055e7..3e61f6a 100644
--- a/meta/recipes-bsp/grub/grub_2.02.bb
+++ b/meta/recipes-bsp/grub/grub_2.02.bb
@@ -1,10 +1,6 @@
 require grub2.inc
 
-RDEPENDS_${PN} = "diffutils freetype grub-editenv"
-
-PACKAGES =+ "grub-editenv"
-
-FILES_grub-editenv = "${bindir}/grub-editenv"
+RDEPENDS_${PN} += "diffutils freetype"
 
 do_install_append () {
     install -d ${D}${sysconfdir}/grub.d