]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
grub/grub-efi: fix conflict
authorHongxu Jia <hongxu.jia@windriver.com>
Wed, 17 Jan 2018 08:25:58 +0000 (03:25 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 19 Jan 2018 12:37:14 +0000 (12:37 +0000)
commit4e9bb03238af48c70075037a77094a8c1bddf284
tree10da8ca3b125bdce90889612cccef8e5f532fb20
parent975591a8d6cbea068d52417df0dfdd20aa586175
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: 6fd0bc313c6035b7de5b7a62cbbcd1d6f546c7f9)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-bsp/grub/grub-efi_2.02.bb
meta/recipes-bsp/grub/grub2.inc
meta/recipes-bsp/grub/grub_2.02.bb