diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2017-12-01 11:02:54 -0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-10 22:41:41 +0000 |
| commit | ebdd054ad85b19d47dd20eab0ba3f31ef5141140 (patch) | |
| tree | fcd620c3acdc4754319f06fc0289f31480f06d4f /meta | |
| parent | b7c9a298801c828c06b6e7da47c35f592864ce74 (diff) | |
| download | openembedded-core-ebdd054ad85b19d47dd20eab0ba3f31ef5141140.tar.gz openembedded-core-ebdd054ad85b19d47dd20eab0ba3f31ef5141140.tar.bz2 openembedded-core-ebdd054ad85b19d47dd20eab0ba3f31ef5141140.zip | |
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 <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 6 | ||||
| -rw-r--r-- | 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 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 |