diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-04-28 09:57:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-07 15:57:37 +0100 |
commit | ce99882619e3fc68a70962e22055a36d1723f1c8 (patch) | |
tree | 6f7fe79318840ac0af113ae75ecffc1995872e17 /meta/recipes-bsp/grub/grub2.inc | |
parent | b0488ff67a0ced0b4db3653895a3b089dd855bb9 (diff) | |
download | poky-ce99882619e3fc68a70962e22055a36d1723f1c8.tar.gz |
grub/grub-efi: fix conflict
While installing grub and grub-efi, there are conflict files
in ${sysconfdir} ${datadir} ${bindir} ${sbindir}.
- Since all of the conflicted files are tools which is
common for grub and grub-efi, we split them (except
grub-editenv) to grub-common in grub.
- The package grub-common runtime depends grub-editenv
- The package grub-editenv runtime provides grub-efi-editenv
- Remove SYSROOT_DIRS_BLACKLIST
- The recipe grub-efi does not generate the duplicated files
and use runtime depends grub-common to instead
Debian and Fedora do the similar thing.
Debian use a common package grub-common for both of pc bios and efi,
and use package grub-pc-bin for pc bios, grub-efi-amd64-bin for efi.
Both of grub-pc-bin and grub-efi-amd64-bin requires grub-common.
https://packages.debian.org/sid/grub-common
https://packages.debian.org/jessie/grub-pc-bin
https://packages.debian.org/jessie/grub-efi-amd64-bin
Fedora use a common package grub2-tools for both of pc bios and efi,
and use package grub2 for pc bios, grub2-efi-modules for efi.
Both of grub2 and grub2-efi-modules requires grub2-tools.
https://www.rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/g/grub2-tools-2.02-0.34.fc24.x86_64.html
https://www.rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/g/grub2-2.02-0.34.fc24.x86_64.html
https://www.rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/g/grub2-efi-modules-2.02-0.34.fc24.x86_64.html
[YOCTO #11639]
(From OE-Core rev: 60c360c0561f1ff5ff2135c4557f5992f9485617)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub/grub2.inc')
-rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 28f96bb162..79a84e9ac5 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc | |||
@@ -67,12 +67,4 @@ do_configure_prepend() { | |||
67 | ${S}/autogen.sh ) | 67 | ${S}/autogen.sh ) |
68 | } | 68 | } |
69 | 69 | ||
70 | # grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are | ||
71 | # conflicted, remove it since no one uses it. | ||
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 = "" | 70 | RDEPENDS_${PN}_class-native = "" |