summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2017-12-01 11:02:54 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-10 22:45:19 +0000
commit5719b37bcd25322b8d764b12b65e57877205cffb (patch)
tree98bb62daab9b2f08fa78b4bd546d8e89b20a1522 /meta
parentadd4b2aad12c44a7701eb244ae38020fc7447b4c (diff)
downloadpoky-5719b37bcd25322b8d764b12b65e57877205cffb.tar.gz
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: ebdd054ad85b19d47dd20eab0ba3f31ef5141140) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/grub/grub2.inc6
-rw-r--r--meta/recipes-bsp/grub/grub_2.02.bb6
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() {
70# grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are 70# grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are
71# conflicted, remove it since no one uses it. 71# conflicted, remove it since no one uses it.
72SYSROOT_DIRS_BLACKLIST += "${datadir}/grub/grub-mkconfig_lib" 72SYSROOT_DIRS_BLACKLIST += "${datadir}/grub/grub-mkconfig_lib"
73
74PACKAGES =+ "${PN}-editenv"
75
76FILES_${PN}-editenv = "${bindir}/grub-editenv"
77RDEPENDS_${PN} += "${PN}-editenv"
78RDEPENDS_${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 @@
1require grub2.inc 1require grub2.inc
2 2
3RDEPENDS_${PN} = "diffutils freetype grub-editenv" 3RDEPENDS_${PN} += "diffutils freetype"
4
5PACKAGES =+ "grub-editenv"
6
7FILES_grub-editenv = "${bindir}/grub-editenv"
8 4
9do_install_append () { 5do_install_append () {
10 install -d ${D}${sysconfdir}/grub.d 6 install -d ${D}${sysconfdir}/grub.d