package/modem-manager: use libqmi and libmbim if they are selected
diff mbox series

Message ID 20191104124844.8112-1-unixmania@gmail.com
State New
Headers show
Series
  • package/modem-manager: use libqmi and libmbim if they are selected
Related show

Commit Message

Carlos Santos Nov. 4, 2019, 12:48 p.m. UTC
From: Carlos Santos <unixmania@gmail.com>

If we have a cnfiguration like this

    BR2_PACKAGE_MODEM_MANAGER=y
    # BR2_PACKAGE_MODEM_MANAGER_LIBMBIM is not set
    BR2_PACKAGE_MODEM_MANAGER_LIBQMI=y
    [...]
    BR2_PACKAGE_LIBMBIM=y

then libqmi is configured with --enable-mbim-qmux and requires libmbim
so ModemManager must be configured --with-mbim otherwise it fails to
link due to missing libmbim symbols required by libqmi:

    qmi-endpoint-mbim.c:(.text+0x158): undefined reference to `mbim_device_close_finish'

Prevent this kind of error by using a simpler approach:

- Always enable MBIM support if libmbim is selected
- Drop BR2_PACKAGE_MODEM_MANAGER_LIBMBIM and add a legacy option that
  selects BR2_PACKAGE_LIBMBIM
- Always enable QMI support if libqmi is selected
- Drop BR2_PACKAGE_MODEM_MANAGER_LIBQMI and add a legacy option that
  selects BR2_PACKAGE_LIBQMI
- Update the help text explaining how to enable MBIM and QMI

Fixes:
  http://autobuild.buildroot.net/results/9c6b8ec2b9cc31f1ab460532c378731ab455210c/

Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
 Config.in.legacy                       | 16 ++++++++++++++++
 package/modem-manager/Config.in        | 17 +++--------------
 package/modem-manager/modem-manager.mk |  4 ++--
 package/network-manager/Config.in      |  7 ++++---
 4 files changed, 25 insertions(+), 19 deletions(-)

Comments

Aleksander Morgado Nov. 4, 2019, 1:03 p.m. UTC | #1
Hey Carlos,

>
> If we have a cnfiguration like this
>
>     BR2_PACKAGE_MODEM_MANAGER=y
>     # BR2_PACKAGE_MODEM_MANAGER_LIBMBIM is not set
>     BR2_PACKAGE_MODEM_MANAGER_LIBQMI=y
>     [...]
>     BR2_PACKAGE_LIBMBIM=y
>
> then libqmi is configured with --enable-mbim-qmux and requires libmbim
> so ModemManager must be configured --with-mbim otherwise it fails to
> link due to missing libmbim symbols required by libqmi:
>
>     qmi-endpoint-mbim.c:(.text+0x158): undefined reference to `mbim_device_close_finish'
>

Wouldn't this Libs.private fix in libqmi solve this specific build
problem? See http://lists.busybox.net/pipermail/buildroot/2019-October/264787.html

> Prevent this kind of error by using a simpler approach:
>
> - Always enable MBIM support if libmbim is selected
> - Drop BR2_PACKAGE_MODEM_MANAGER_LIBMBIM and add a legacy option that
>   selects BR2_PACKAGE_LIBMBIM
> - Always enable QMI support if libqmi is selected
> - Drop BR2_PACKAGE_MODEM_MANAGER_LIBQMI and add a legacy option that
>   selects BR2_PACKAGE_LIBQMI
> - Update the help text explaining how to enable MBIM and QMI
>

It is true that the current setup may lead to a strange configuration
where ModemManager may be built with only QMI support and no explicit
MBIM support while at the same time libqmi is built with MBIM support.
That would not be any problem per se, it would just be weird.

I'm not totally sure how these settings are usually preferred in
buildroot, truth be told. Maybe someone with more experience in
buildroot itself could suggest how to best handle this? Is it better
to have a setting in the ModemManager package to enable/disable
features explicitly? Or is it better to implicitly enable/disable
those features based on whether some other packages are also included
in the build? I guess the question would be whether we want to have a
non-QMI non-MBIM capable ModemManager installed at the same time as
libqmi+qmicli/libmbim+mbimcli. I have absolutely no idea whether this
is a real usecase for anyone or not, truth be told. If it is (or may
be) a real usecase, then I don't think this patch should go in.
Carlos Santos Nov. 4, 2019, 1:27 p.m. UTC | #2
On Mon, Nov 4, 2019 at 10:03 AM Aleksander Morgado
<aleksander@aleksander.es> wrote:
>
> Hey Carlos,
>
> >
> > If we have a cnfiguration like this
> >
> >     BR2_PACKAGE_MODEM_MANAGER=y
> >     # BR2_PACKAGE_MODEM_MANAGER_LIBMBIM is not set
> >     BR2_PACKAGE_MODEM_MANAGER_LIBQMI=y
> >     [...]
> >     BR2_PACKAGE_LIBMBIM=y
> >
> > then libqmi is configured with --enable-mbim-qmux and requires libmbim
> > so ModemManager must be configured --with-mbim otherwise it fails to
> > link due to missing libmbim symbols required by libqmi:
> >
> >     qmi-endpoint-mbim.c:(.text+0x158): undefined reference to `mbim_device_close_finish'
> >
>
> Wouldn't this Libs.private fix in libqmi solve this specific build
> problem? See http://lists.busybox.net/pipermail/buildroot/2019-October/264787.html

Yes, but it passed below my radar due to ETOOMUCHMAIL. :-)

> > Prevent this kind of error by using a simpler approach:
> >
> > - Always enable MBIM support if libmbim is selected
> > - Drop BR2_PACKAGE_MODEM_MANAGER_LIBMBIM and add a legacy option that
> >   selects BR2_PACKAGE_LIBMBIM
> > - Always enable QMI support if libqmi is selected
> > - Drop BR2_PACKAGE_MODEM_MANAGER_LIBQMI and add a legacy option that
> >   selects BR2_PACKAGE_LIBQMI
> > - Update the help text explaining how to enable MBIM and QMI
> >
>
> It is true that the current setup may lead to a strange configuration
> where ModemManager may be built with only QMI support and no explicit
> MBIM support while at the same time libqmi is built with MBIM support.
> That would not be any problem per se, it would just be weird.
>
> I'm not totally sure how these settings are usually preferred in
> buildroot, truth be told. Maybe someone with more experience in
> buildroot itself could suggest how to best handle this? Is it better
> to have a setting in the ModemManager package to enable/disable
> features explicitly? Or is it better to implicitly enable/disable
> those features based on whether some other packages are also included
> in the build? I guess the question would be whether we want to have a
> non-QMI non-MBIM capable ModemManager installed at the same time as
> libqmi+qmicli/libmbim+mbimcli. I have absolutely no idea whether this
> is a real usecase for anyone or not, truth be told. If it is (or may
> be) a real usecase, then I don't think this patch should go in.
>
> --
> Aleksander
> https://aleksander.es

The main client of ModemManager is NetworkManager, which always
selects MBIM and QMI support, so I don't believe it would make much
difference, in practice.
Aleksander Morgado Nov. 4, 2019, 2:36 p.m. UTC | #3
Hey Carlos!

> > > If we have a cnfiguration like this
> > >
> > >     BR2_PACKAGE_MODEM_MANAGER=y
> > >     # BR2_PACKAGE_MODEM_MANAGER_LIBMBIM is not set
> > >     BR2_PACKAGE_MODEM_MANAGER_LIBQMI=y
> > >     [...]
> > >     BR2_PACKAGE_LIBMBIM=y
> > >
> > > then libqmi is configured with --enable-mbim-qmux and requires libmbim
> > > so ModemManager must be configured --with-mbim otherwise it fails to
> > > link due to missing libmbim symbols required by libqmi:
> > >
> > >     qmi-endpoint-mbim.c:(.text+0x158): undefined reference to `mbim_device_close_finish'
> > >
> >
> > Wouldn't this Libs.private fix in libqmi solve this specific build
> > problem? See http://lists.busybox.net/pipermail/buildroot/2019-October/264787.html
>
> Yes, but it passed below my radar due to ETOOMUCHMAIL. :-)
>
> > > Prevent this kind of error by using a simpler approach:
> > >
> > > - Always enable MBIM support if libmbim is selected
> > > - Drop BR2_PACKAGE_MODEM_MANAGER_LIBMBIM and add a legacy option that
> > >   selects BR2_PACKAGE_LIBMBIM
> > > - Always enable QMI support if libqmi is selected
> > > - Drop BR2_PACKAGE_MODEM_MANAGER_LIBQMI and add a legacy option that
> > >   selects BR2_PACKAGE_LIBQMI
> > > - Update the help text explaining how to enable MBIM and QMI
> > >
> >
> > It is true that the current setup may lead to a strange configuration
> > where ModemManager may be built with only QMI support and no explicit
> > MBIM support while at the same time libqmi is built with MBIM support.
> > That would not be any problem per se, it would just be weird.
> >
> > I'm not totally sure how these settings are usually preferred in
> > buildroot, truth be told. Maybe someone with more experience in
> > buildroot itself could suggest how to best handle this? Is it better
> > to have a setting in the ModemManager package to enable/disable
> > features explicitly? Or is it better to implicitly enable/disable
> > those features based on whether some other packages are also included
> > in the build? I guess the question would be whether we want to have a
> > non-QMI non-MBIM capable ModemManager installed at the same time as
> > libqmi+qmicli/libmbim+mbimcli. I have absolutely no idea whether this
> > is a real usecase for anyone or not, truth be told. If it is (or may
> > be) a real usecase, then I don't think this patch should go in.
>
> The main client of ModemManager is NetworkManager, which always
> selects MBIM and QMI support, so I don't believe it would make much
> difference, in practice.
>

If you ask me, the NetworkManager package should not select
BR2_PACKAGE_MODEM_MANAGER_LIBMBIM or BR2_PACKAGE_MODEM_MANAGER_LIBQMI.
The ModemManager API that NetworkManager uses doesn't in any way
change based on whether QMI/MBIM support is enabled, it's really
orthogonal.
@Yegor Yefremov what's your take on this?
Yegor Yefremov Nov. 4, 2019, 5:30 p.m. UTC | #4
Hi Aleksander, Carlos,

On Mon, Nov 4, 2019 at 3:36 PM Aleksander Morgado
<aleksander@aleksander.es> wrote:
>
> Hey Carlos!
>
> > > > If we have a cnfiguration like this
> > > >
> > > >     BR2_PACKAGE_MODEM_MANAGER=y
> > > >     # BR2_PACKAGE_MODEM_MANAGER_LIBMBIM is not set
> > > >     BR2_PACKAGE_MODEM_MANAGER_LIBQMI=y
> > > >     [...]
> > > >     BR2_PACKAGE_LIBMBIM=y
> > > >
> > > > then libqmi is configured with --enable-mbim-qmux and requires libmbim
> > > > so ModemManager must be configured --with-mbim otherwise it fails to
> > > > link due to missing libmbim symbols required by libqmi:
> > > >
> > > >     qmi-endpoint-mbim.c:(.text+0x158): undefined reference to `mbim_device_close_finish'
> > > >
> > >
> > > Wouldn't this Libs.private fix in libqmi solve this specific build
> > > problem? See http://lists.busybox.net/pipermail/buildroot/2019-October/264787.html
> >
> > Yes, but it passed below my radar due to ETOOMUCHMAIL. :-)
> >
> > > > Prevent this kind of error by using a simpler approach:
> > > >
> > > > - Always enable MBIM support if libmbim is selected
> > > > - Drop BR2_PACKAGE_MODEM_MANAGER_LIBMBIM and add a legacy option that
> > > >   selects BR2_PACKAGE_LIBMBIM
> > > > - Always enable QMI support if libqmi is selected
> > > > - Drop BR2_PACKAGE_MODEM_MANAGER_LIBQMI and add a legacy option that
> > > >   selects BR2_PACKAGE_LIBQMI
> > > > - Update the help text explaining how to enable MBIM and QMI
> > > >
> > >
> > > It is true that the current setup may lead to a strange configuration
> > > where ModemManager may be built with only QMI support and no explicit
> > > MBIM support while at the same time libqmi is built with MBIM support.
> > > That would not be any problem per se, it would just be weird.
> > >
> > > I'm not totally sure how these settings are usually preferred in
> > > buildroot, truth be told. Maybe someone with more experience in
> > > buildroot itself could suggest how to best handle this? Is it better
> > > to have a setting in the ModemManager package to enable/disable
> > > features explicitly? Or is it better to implicitly enable/disable
> > > those features based on whether some other packages are also included
> > > in the build? I guess the question would be whether we want to have a
> > > non-QMI non-MBIM capable ModemManager installed at the same time as
> > > libqmi+qmicli/libmbim+mbimcli. I have absolutely no idea whether this
> > > is a real usecase for anyone or not, truth be told. If it is (or may
> > > be) a real usecase, then I don't think this patch should go in.
> >
> > The main client of ModemManager is NetworkManager, which always
> > selects MBIM and QMI support, so I don't believe it would make much
> > difference, in practice.
> >
>
> If you ask me, the NetworkManager package should not select
> BR2_PACKAGE_MODEM_MANAGER_LIBMBIM or BR2_PACKAGE_MODEM_MANAGER_LIBQMI.
> The ModemManager API that NetworkManager uses doesn't in any way
> change based on whether QMI/MBIM support is enabled, it's really
> orthogonal.
> @Yegor Yefremov what's your take on this?

I don't have a strong opinion here. I'm always using MM with both QMI
and MBIM libraries. As you already need glib2 for MM, one won't waste
too much disk space. Hence I would opt for MM to always enable both
libraries. This would simplify both MM and NM configuration.

Yegor
Thomas Petazzoni Nov. 4, 2019, 9:05 p.m. UTC | #5
Hello,

Adding our Config.in.legacy expert Arnout.

On Mon,  4 Nov 2019 09:48:44 -0300
unixmania@gmail.com wrote:

> diff --git a/Config.in.legacy b/Config.in.legacy
> index fcb10b1291..3336ef85d1 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,22 @@ endif
>  
>  comment "Legacy options removed in 2019.11"
>  
> +config BR2_PACKAGE_MODEM_MANAGER_LIBMBIM
> +	bool "BR2_PACKAGE_MODEM_MANAGER_LIBMBIM has been removed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_LIBMBIM
> +	help
> +	  Select BR2_PACKAGE_LIBMBIM to enable support for MBIM protocol
> +	  in ModemManager
> +
> +config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
> +	bool "BR2_PACKAGE_MODEM_MANAGER_LIBQMI has been removed"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_LIBQMI
> +	help
> +	  Select BR2_PACKAGE_LIBQMI to enable support for QMI protocol
> +	  in ModemManager

I think in this specific case, we don't need Config.in.legacy handling.
Indeed, a full .config that had BR2_PACKAGE_MODEM_MANAGER_LIBQMI
enabled will already have BR2_PACKAGE_LIBQMI, and since the .mk file
now relies on BR2_PACKAGE_LIBQMI to enable libqmi support in
modem-manager, I think we're good.

Of course, that won't work for defconfigs, but I believe updating with
a defconfig is not really guaranteed to give the right result. Arnout ?

Other than that, patch looks good to me. No need to resend, let's just
wait to see what Arnout says about the Config.in.legacy handling.

Best regards,

Thomas
Arnout Vandecappelle Nov. 6, 2019, 1:12 p.m. UTC | #6
On 04/11/2019 22:05, Thomas Petazzoni wrote:
> Hello,
> 
> Adding our Config.in.legacy expert Arnout.
> 
> On Mon,  4 Nov 2019 09:48:44 -0300
> unixmania@gmail.com wrote:
> 
>> diff --git a/Config.in.legacy b/Config.in.legacy
>> index fcb10b1291..3336ef85d1 100644
>> --- a/Config.in.legacy
>> +++ b/Config.in.legacy
>> @@ -146,6 +146,22 @@ endif
>>  
>>  comment "Legacy options removed in 2019.11"
>>  
>> +config BR2_PACKAGE_MODEM_MANAGER_LIBMBIM
>> +	bool "BR2_PACKAGE_MODEM_MANAGER_LIBMBIM has been removed"
>> +	select BR2_LEGACY
>> +	select BR2_PACKAGE_LIBMBIM
>> +	help
>> +	  Select BR2_PACKAGE_LIBMBIM to enable support for MBIM protocol
>> +	  in ModemManager
>> +
>> +config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
>> +	bool "BR2_PACKAGE_MODEM_MANAGER_LIBQMI has been removed"
>> +	select BR2_LEGACY
>> +	select BR2_PACKAGE_LIBQMI
>> +	help
>> +	  Select BR2_PACKAGE_LIBQMI to enable support for QMI protocol
>> +	  in ModemManager
> 
> I think in this specific case, we don't need Config.in.legacy handling.
> Indeed, a full .config that had BR2_PACKAGE_MODEM_MANAGER_LIBQMI
> enabled will already have BR2_PACKAGE_LIBQMI, and since the .mk file
> now relies on BR2_PACKAGE_LIBQMI to enable libqmi support in
> modem-manager, I think we're good.
> 
> Of course, that won't work for defconfigs, but I believe updating with
> a defconfig is not really guaranteed to give the right result. Arnout ?

 In my point of view, indeed it isn't, but this isn't documented anywhere I think.

 So indeed, I agree that no legacy handling is needed here. It will annoy many
users (because they have to go and disable it in the legacy menu), while being
of no benefit for most of them.

 Regards,
 Arnout


> Other than that, patch looks good to me. No need to resend, let's just
> wait to see what Arnout says about the Config.in.legacy handling.
> 
> Best regards,
> 
> Thomas
>
Carlos Santos Nov. 6, 2019, 8:45 p.m. UTC | #7
On Wed, Nov 6, 2019 at 10:12 AM Arnout Vandecappelle <arnout@mind.be> wrote:
>
>
>
> On 04/11/2019 22:05, Thomas Petazzoni wrote:
> > Hello,
> >
> > Adding our Config.in.legacy expert Arnout.
> >
> > On Mon,  4 Nov 2019 09:48:44 -0300
> > unixmania@gmail.com wrote:
> >
> >> diff --git a/Config.in.legacy b/Config.in.legacy
> >> index fcb10b1291..3336ef85d1 100644
> >> --- a/Config.in.legacy
> >> +++ b/Config.in.legacy
> >> @@ -146,6 +146,22 @@ endif
> >>
> >>  comment "Legacy options removed in 2019.11"
> >>
> >> +config BR2_PACKAGE_MODEM_MANAGER_LIBMBIM
> >> +    bool "BR2_PACKAGE_MODEM_MANAGER_LIBMBIM has been removed"
> >> +    select BR2_LEGACY
> >> +    select BR2_PACKAGE_LIBMBIM
> >> +    help
> >> +      Select BR2_PACKAGE_LIBMBIM to enable support for MBIM protocol
> >> +      in ModemManager
> >> +
> >> +config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
> >> +    bool "BR2_PACKAGE_MODEM_MANAGER_LIBQMI has been removed"
> >> +    select BR2_LEGACY
> >> +    select BR2_PACKAGE_LIBQMI
> >> +    help
> >> +      Select BR2_PACKAGE_LIBQMI to enable support for QMI protocol
> >> +      in ModemManager
> >
> > I think in this specific case, we don't need Config.in.legacy handling.
> > Indeed, a full .config that had BR2_PACKAGE_MODEM_MANAGER_LIBQMI
> > enabled will already have BR2_PACKAGE_LIBQMI, and since the .mk file
> > now relies on BR2_PACKAGE_LIBQMI to enable libqmi support in
> > modem-manager, I think we're good.
> >
> > Of course, that won't work for defconfigs, but I believe updating with
> > a defconfig is not really guaranteed to give the right result. Arnout ?
>
>  In my point of view, indeed it isn't, but this isn't documented anywhere I think.
>
>  So indeed, I agree that no legacy handling is needed here. It will annoy many
> users (because they have to go and disable it in the legacy menu), while being
> of no benefit for most of them.
>
>  Regards,
>  Arnout
>
>
> > Other than that, patch looks good to me. No need to resend, let's just
> > wait to see what Arnout says about the Config.in.legacy handling.
> >
> > Best regards,
> >
> > Thomas
> >

I suggest to apply https://patchwork.ozlabs.org/patch/1186596/ to
solve the build problem, then we can decide if modem-manager and
network-manager need additional changes.

Patch
diff mbox series

diff --git a/Config.in.legacy b/Config.in.legacy
index fcb10b1291..3336ef85d1 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,22 @@  endif
 
 comment "Legacy options removed in 2019.11"
 
+config BR2_PACKAGE_MODEM_MANAGER_LIBMBIM
+	bool "BR2_PACKAGE_MODEM_MANAGER_LIBMBIM has been removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LIBMBIM
+	help
+	  Select BR2_PACKAGE_LIBMBIM to enable support for MBIM protocol
+	  in ModemManager
+
+config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
+	bool "BR2_PACKAGE_MODEM_MANAGER_LIBQMI has been removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LIBQMI
+	help
+	  Select BR2_PACKAGE_LIBQMI to enable support for QMI protocol
+	  in ModemManager
+
 config BR2_PACKAGE_ALLJOYN
 	bool "alljoyn was removed"
 	select BR2_LEGACY
diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in
index c4c723776d..e7987ad1e6 100644
--- a/package/modem-manager/Config.in
+++ b/package/modem-manager/Config.in
@@ -10,22 +10,11 @@  config BR2_PACKAGE_MODEM_MANAGER
 	  ModemManager is a DBus-activated daemon which controls mobile
 	  broadband (2G/3G/4G) devices and connections.
 
-	  http://www.freedesktop.org/wiki/Software/ModemManager/
-
-if BR2_PACKAGE_MODEM_MANAGER
+	  Select BR2_PACKAGE_LIBMBIM to enable support for MBIM protocol
 
-config BR2_PACKAGE_MODEM_MANAGER_LIBMBIM
-	bool "MBIM support"
-	select BR2_PACKAGE_LIBMBIM
-	help
-	  This option enables support for MBIM protocol
+	  Select BR2_PACKAGE_LIBQMI to enable support for QMI protocol
 
-config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
-	bool "QMI support"
-	select BR2_PACKAGE_LIBQMI
-	help
-	  This option enables support for QMI protocol
-endif
+	  http://www.freedesktop.org/wiki/Software/ModemManager/
 
 comment "modemmanager needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
index dde841b80a..554d1a235e 100644
--- a/package/modem-manager/modem-manager.mk
+++ b/package/modem-manager/modem-manager.mk
@@ -13,7 +13,7 @@  MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES)
 MODEM_MANAGER_INSTALL_STAGING = YES
 MODEM_MANAGER_CONF_OPTS = --disable-more-warnings
 
-ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
+ifeq ($(BR2_PACKAGE_LIBQMI),y)
 MODEM_MANAGER_DEPENDENCIES += libqmi
 MODEM_MANAGER_CONF_OPTS += --with-qmi
 else
@@ -27,7 +27,7 @@  else
 MODEM_MANAGER_CONF_OPTS += --without-udev
 endif
 
-ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y)
+ifeq ($(BR2_PACKAGE_LIBMBIM),y)
 MODEM_MANAGER_DEPENDENCIES += libmbim
 MODEM_MANAGER_CONF_OPTS += --with-mbim
 else
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 1257e08e6f..79ad161f31 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -37,10 +37,11 @@  config BR2_PACKAGE_NETWORK_MANAGER_TUI
 config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER
 	bool "modem-manager support"
 	select BR2_PACKAGE_MODEM_MANAGER
-	select BR2_PACKAGE_MODEM_MANAGER_LIBMBIM
-	select BR2_PACKAGE_MODEM_MANAGER_LIBQMI
+	select BR2_PACKAGE_LIBMBIM
+	select BR2_PACKAGE_LIBQMI
 	help
-	  This option enables support for ModemManager
+	  This option enables support for ModemManager with support for
+	  MBIM and QMI protocols
 
 config BR2_PACKAGE_NETWORK_MANAGER_PPPD
 	bool "pppd support"