From ebdd054ad85b19d47dd20eab0ba3f31ef5141140 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 1 Dec 2017 11:02:54 -0200 Subject: 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. Signed-off-by: Otavio Salvador Signed-off-by: Ross Burton --- meta/recipes-bsp/grub/grub2.inc | 6 ++++++ meta/recipes-bsp/grub/grub_2.02.bb | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index a56fbe7bf8..28f96bb162 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 b8055e7537..3e61f6a16d 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 -- cgit 1.2.3-korg