[oe] [meta-oe][PATCH 6/7] plymouth: Use plymouth_initrd DISTRO_FEATURE

[Khem Raj]

On Tue, Feb 26, 2019 at 1:55 AM Böszörményi Zoltán <zboszor at pr.hu> wrote:
>
> dracut conditionally depends plymouth-initrd using the same
> DISTRO_FEATURE knob.
>

cant apply this on top of master-next, can you rebase and resend

> Signed-off-by: Böszörményi Zoltán <zboszor at pr.hu>
> ---
>  meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb
> index a5b16c979..b7be9f04b 100644
> --- a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb
> +++ b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb
> @@ -36,7 +36,6 @@ PACKAGECONFIG_append_x86-64 = " drm"
>  PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm"
>  PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
>  PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
> -PACKAGECONFIG[initrd] = ",,,"
>
>  LOGO ??= "${datadir}/plymouth/bizcom.png"
>
> @@ -46,12 +45,12 @@ do_install_append() {
>      # Remove /var/run from package as plymouth will populate it on startup
>      rm -fr "${D}${localstatedir}/run"
>
> -    if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then
> +    if ! ${@bb.utils.contains('DISTRO_FEATURES', 'plymouth_initrd', 'true', 'false', d)}; then
>          rm -rf "${D}${libexecdir}"
>      fi
>  }
>
> -PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}"
> +PACKAGES =. "${@bb.utils.contains('DISTRO_FEATURES', 'plymouth_initrd', '${PN}-initrd ', '', d)}"
>  PACKAGES =+ "${PN}-set-default-theme"
>
>  FILES_${PN}-initrd = "${libexecdir}/plymouth/*"
> --
> 2.20.1
>