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>
This commit is contained in:
Otavio Salvador
2018-01-23 14:56:25 -02:00
committed by Richard Purdie
parent 8fde211b3e
commit e49391d58c
2 changed files with 7 additions and 5 deletions

View File

@@ -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 = ""

View File

@@ -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