diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2018-01-23 14:56:25 -0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-29 08:45:28 +0000 |
commit | e49391d58cc938d02f8252de65ffa2ebab38fe03 (patch) | |
tree | fe8aa56e5cf99c29fe79102e7e5aa4c00e9051c5 | |
parent | 8fde211b3e931b26671c13db04ae3284f98a8fe5 (diff) | |
download | poky-e49391d58cc938d02f8252de65ffa2ebab38fe03.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: 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>
-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() { | |||
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. |
72 | SYSROOT_DIRS_BLACKLIST += "${datadir}/grub/grub-mkconfig_lib" | 72 | SYSROOT_DIRS_BLACKLIST += "${datadir}/grub/grub-mkconfig_lib" |
73 | |||
74 | PACKAGES =+ "${PN}-editenv" | ||
75 | |||
76 | FILES_${PN}-editenv = "${bindir}/grub-editenv" | ||
77 | RDEPENDS_${PN} += "${PN}-editenv" | ||
78 | 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 @@ | |||
1 | require grub2.inc | 1 | require grub2.inc |
2 | 2 | ||
3 | RDEPENDS_${PN} = "diffutils freetype grub-editenv" | 3 | RDEPENDS_${PN} += "diffutils freetype" |
4 | |||
5 | PACKAGES =+ "grub-editenv" | ||
6 | |||
7 | FILES_grub-editenv = "${bindir}/grub-editenv" | ||
8 | 4 | ||
9 | do_install_append () { | 5 | do_install_append () { |
10 | install -d ${D}${sysconfdir}/grub.d | 6 | install -d ${D}${sysconfdir}/grub.d |