[OE-core] [PATCH] grub: split grub-editenv in both grub and grub-efi

[Burton, Ross]

If I build target grub-efi, this fails:

$ bitbake grub grub-efi
NOTE: Resolving any missing task queue dependencies
ERROR: Nothing RPROVIDES 'grub-editenv-native' (but
virtual:native:/home/ross/Yocto/poky/meta/recipes-bsp/grub/grub-efi_2.00.bb
RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'grub-editenv-native' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['grub-editenv-native']
ERROR: Required build target 'grub-efi' has no buildable providers.
Missing or unbuildable dependency chain was: ['grub-efi',
'grub-efi-native', 'grub-editenv-native']

Ross

On 15 December 2016 at 17:20, Ioan-Adrian Ratiu <adrian.ratiu at ni.com> wrote:

> We also need to split grub-editenv in grub-efi not just in grub, so move
> the logic from grub_2.00.bb to the .inc file where it's inherited by both.
>
> (grub-editenv is useful for editing the grub environment at runtime)
>
> Doing this also reduces packaging differences between grub and grub-efi.
>
> Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
> ---
>  meta/recipes-bsp/grub/grub2.inc    | 6 ++++++
>  meta/recipes-bsp/grub/grub_2.00.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 b69de9f..b8a2bb2 100644
> --- a/meta/recipes-bsp/grub/grub2.inc
> +++ b/meta/recipes-bsp/grub/grub2.inc
> @@ -71,3 +71,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"
> +
> +RDEPENDS_${PN} = "grub-editenv"
> +
> +PACKAGES =+ "grub-editenv"
> +
> +FILES_grub-editenv = "${bindir}/grub-editenv"
> diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/
> grub_2.00.bb
> index 07e1d10..778074a 100644
> --- a/meta/recipes-bsp/grub/grub_2.00.bb
> +++ b/meta/recipes-bsp/grub/grub_2.00.bb
> @@ -1,6 +1,6 @@
>  require grub2.inc
>
> -RDEPENDS_${PN} = "diffutils freetype grub-editenv"
> +RDEPENDS_${PN} = "diffutils freetype"
>  PR = "r1"
>
>  EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont
> --program-prefix="" \
> @@ -8,10 +8,6 @@ EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont
> --program-prefix="" \
>
>  EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile',
> '--enable-largefile', '--disable-largefile', d)}"
>
> -PACKAGES =+ "grub-editenv"
> -
> -FILES_grub-editenv = "${bindir}/grub-editenv"
> -
>  do_install_append () {
>      install -d ${D}${sysconfdir}/grub.d
>  }
> --
> 2.10.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20161220/53c2b581/attachment-0002.html>