diff mbox series

[meta-oe] fwupd: fix uefi capsule update build error

Message ID 20240503061507.585375-1-mikko.rapeli@linaro.org
State Accepted
Headers show
Series [meta-oe] fwupd: fix uefi capsule update build error | expand

Commit Message

Mikko Rapeli May 3, 2024, 6:15 a.m. UTC
plugin_uefi_capsule_splash does not provide "enabled" or "disabled"
options but only basic bool "true" and "false". Fixes do_configure()
failure with
PACKAGECONFIG:append = " plugin_tpm plugin_uefi_pk plugin_uefi_capsule ":

| ../fwupd-1.9.18/meson.build:1:0: ERROR: Value disabled is not boolean (true or false).

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
 meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Fathi Boudra May 16, 2024, 7:22 a.m. UTC | #1
Hi Khem,

Can you cherry-pick this commit to the scarthgap branch?

https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb?id=80719a61a53dcabf7d114712ffdc8fc9c3428bd5

The issue is affecting the LTS release.Thanks.

On Fri, 3 May 2024 at 08:15, Mikko Rapeli via lists.openembedded.org
<mikko.rapeli=linaro.org@lists.openembedded.org> wrote:
>
> plugin_uefi_capsule_splash does not provide "enabled" or "disabled"
> options but only basic bool "true" and "false". Fixes do_configure()
> failure with
> PACKAGECONFIG:append = " plugin_tpm plugin_uefi_pk plugin_uefi_capsule ":
>
> | ../fwupd-1.9.18/meson.build:1:0: ERROR: Value disabled is not boolean (true or false).
>
> Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
> ---
>  meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb
> index d20d5ed2a..e6c276ba4 100644
> --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb
> +++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb
> @@ -104,7 +104,7 @@ PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=enabled,-Dplugin_s
>  PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=enabled,-Dplugin_synaptics_rmi=disabled"
>  PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=enabled,-Dplugin_tpm=disabled,tpm2-tss"
>  # Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported
> -PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=disabled,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi"
> +PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi"
>  PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=enabled,-Dplugin_uefi_pk=disabled"
>  PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=enabled,-Dplugin_uf2=disabled"
>  PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=enabled,-Dplugin_upower=disabled"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#110243): https://lists.openembedded.org/g/openembedded-devel/message/110243
> Mute This Topic: https://lists.openembedded.org/mt/105883191/900901
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [fathi.boudra@linaro.org]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Cheers,
diff mbox series

Patch

diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb
index d20d5ed2a..e6c276ba4 100644
--- a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb
+++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb
@@ -104,7 +104,7 @@  PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=enabled,-Dplugin_s
 PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=enabled,-Dplugin_synaptics_rmi=disabled"
 PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=enabled,-Dplugin_tpm=disabled,tpm2-tss"
 # Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported
-PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=disabled,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi"
+PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi"
 PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=enabled,-Dplugin_uefi_pk=disabled"
 PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=enabled,-Dplugin_uf2=disabled"
 PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=enabled,-Dplugin_upower=disabled"