Thanks, applied as 61143543fa1d18cfc6ec7340777bf64b5b54dc75. Michael
[sent from post-receive hook] On Sat, 23 Mar 2024 09:59:37 +0100, Lars Pedersen <lape...@gmail.com> wrote: > Signed-off-by: Lars Pedersen <lape...@gmail.com> > Message-Id: <20240321114423.1503313-1-lape...@gmail.com> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git a/rules/libqmi.in b/rules/libqmi.in > index 571bfa3a0aa6..1b4c8c88c146 100644 > --- a/rules/libqmi.in > +++ b/rules/libqmi.in > @@ -15,4 +15,7 @@ config LIBQMI_MBIM_QMUX > bool "enable mbim-qmux support" > default y if MODEMMANAGER > > +config LIBQMI_FIRMWARE_UPDATE > + bool "Add firmware update tool for QMI devices" > + > endif > diff --git a/rules/libqmi.make b/rules/libqmi.make > index 03487369cbdf..2cc6695cb061 100644 > --- a/rules/libqmi.make > +++ b/rules/libqmi.make > @@ -36,7 +36,7 @@ LIBQMI_LICENSE_FILES := \ > LIBQMI_CONF_TOOL := meson > LIBQMI_CONF_OPT := \ > $(CROSS_MESON_USR) \ > - -Dfirmware_update=false \ > + -Dfirmware_update=$(call ptx/truefalse, PTXCONF_LIBQMI_FIRMWARE_UPDATE) > \ > -Dcollection=full \ > -Dmbim_qmux=$(call ptx/truefalse, PTXCONF_LIBQMI_MBIM_QMUX) \ > -Dmm_runtime_check=false \ > @@ -65,6 +65,10 @@ $(STATEDIR)/libqmi.targetinstall: > @$(call install_copy, libqmi, 0, 0, 0755, -, /usr/bin/qmicli) > @$(call install_copy, libqmi, 0, 0, 0755, -, /usr/bin/qmi-network) > > +ifdef PTXCONF_LIBQMI_FIRMWARE_UPDATE > + @$(call install_copy, libqmi, 0, 0, 0755, -, > /usr/bin/qmi-firmware-update) > +endif > + > @$(call install_copy, libqmi, 0, 0, 0755, -, /usr/libexec/qmi-proxy) > @$(call install_lib, libqmi, 0, 0, 0644, libqmi-glib) >
