[meta-networking,kirkstone] networkmanager: fix build with enabled ppp

Message ID 20220627133914.14615-1-javier.viguera@digi.com
State Accepted
Delegated to: Armin Kuster
Headers show
Series [meta-networking,kirkstone] networkmanager: fix build with enabled ppp | expand

Commit Message

Viguera, Javier June 27, 2022, 1:39 p.m. UTC
If 'ppp' packageconfig option is enabled, but the build system does NOT
have pppd binary installed, the build fails with:

| Has header "pppd/pppd.h" : YES
| Program pppd /sbin/pppd /usr/sbin/pppd found: NO
|
| ../NetworkManager-1.36.2/meson.build:570:4: ERROR: Assert failed: pppd required but not found, please provide a valid pppd path or use -Dppp=false to disable it

This is due to meson trying to look for the 'pppd' binary in the build
system when it should not. If the build system does not contain pppd,
the build fails.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../networkmanager/networkmanager_1.36.2.bb                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Khem Raj June 29, 2022, 5:05 p.m. UTC | #1
do we need this patch on master too where we have networkmanager 1.38

On 6/27/22 9:39 AM, Javier Viguera via lists.openembedded.org wrote:
> If 'ppp' packageconfig option is enabled, but the build system does NOT
> have pppd binary installed, the build fails with:
>
> | Has header "pppd/pppd.h" : YES
> | Program pppd /sbin/pppd /usr/sbin/pppd found: NO
> |
> | ../NetworkManager-1.36.2/meson.build:570:4: ERROR: Assert failed: pppd required but not found, please provide a valid pppd path or use -Dppp=false to disable it
>
> This is due to meson trying to look for the 'pppd' binary in the build
> system when it should not. If the build system does not contain pppd,
> the build fails.
>
> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
> ---
>   .../networkmanager/networkmanager_1.36.2.bb                     | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb
> index 6c665d53bb50..e3b1296a6bc4 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb
> @@ -83,7 +83,7 @@ PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5"
>   # consolekit is not picked by shlibs, so add it to RDEPENDS too
>   PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit"
>   PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info"
> -PACKAGECONFIG[ppp] = "-Dppp=true,-Dppp=false,ppp,ppp"
> +PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=/usr/sbin/pppd,-Dppp=false,ppp,ppp"
>   PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq"
>   PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss"
>   PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf"
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#97600): https://lists.openembedded.org/g/openembedded-devel/message/97600
> Mute This Topic: https://lists.openembedded.org/mt/92020681/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Viguera, Javier June 30, 2022, 10:40 a.m. UTC | #2
Hi Raj,

Yes it failed exactly the same in *master*. For example building master for qemuarm fails with:

| Has header "pppd/pppd.h" : YES
| Program pppd /sbin/pppd /usr/sbin/pppd found: NO
| 
| ../NetworkManager-1.38.0/meson.build:571:4: ERROR: Assert failed: pppd required but not found, please provide a valid pppd path or use -Dppp=false to disable it

-- jviguera

-----Original Message-----
From: Khem Raj <raj.khem@gmail.com> 
Sent: Wednesday, June 29, 2022 19:06
To: Viguera, Javier <Javier.Viguera@digi.com>; openembedded-devel@lists.openembedded.org
Cc: akuster808@gmail.com
Subject: Re: [oe] [meta-networking][kirkstone][PATCH] networkmanager: fix build with enabled ppp

do we need this patch on master too where we have networkmanager 1.38
Otavio Salvador July 1, 2022, 11:44 a.m. UTC | #3
Em seg., 27 de jun. de 2022 às 10:39, Javier Viguera via
lists.openembedded.org <javier.viguera=digi.com@lists.openembedded.org>
escreveu:

> If 'ppp' packageconfig option is enabled, but the build system does NOT
> have pppd binary installed, the build fails with:
>
> | Has header "pppd/pppd.h" : YES
> | Program pppd /sbin/pppd /usr/sbin/pppd found: NO
> |
> | ../NetworkManager-1.36.2/meson.build:570:4: ERROR: Assert failed: pppd
> required but not found, please provide a valid pppd path or use -Dppp=false
> to disable it
>
> This is due to meson trying to look for the 'pppd' binary in the build
> system when it should not. If the build system does not contain pppd,
> the build fails.
>
> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
>

Please send it against master, first, then we can ask for backports.
Viguera, Javier July 1, 2022, 12:10 p.m. UTC | #4
From: Otavio Salvador <otavio.salvador@ossystems.com.br>
Sent: Friday, July 1, 2022 13:45
To: Viguera, Javier <Javier.Viguera@digi.com>
Cc: OpenEmbedded Devel List <openembedded-devel@lists.openembedded.org>; akuster808 <akuster808@gmail.com>
Subject: Re: [oe] [meta-networking][kirkstone][PATCH] networkmanager: fix build with enabled ppp

Please send it against master, first, then we can ask for backports.

It’s already on *master-next*

-- jviguera
Khem Raj July 1, 2022, 1:21 p.m. UTC | #5
On Fri, Jul 1, 2022 at 7:45 AM Otavio Salvador <
otavio.salvador@ossystems.com.br> wrote:

>
>
> Em seg., 27 de jun. de 2022 às 10:39, Javier Viguera via
> lists.openembedded.org <javier.viguera=digi.com@lists.openembedded.org>
> escreveu:
>
>> If 'ppp' packageconfig option is enabled, but the build system does NOT
>> have pppd binary installed, the build fails with:
>>
>> | Has header "pppd/pppd.h" : YES
>> | Program pppd /sbin/pppd /usr/sbin/pppd found: NO
>> |
>> | ../NetworkManager-1.36.2/meson.build:570:4: ERROR: Assert failed: pppd
>> required but not found, please provide a valid pppd path or use -Dppp=false
>> to disable it
>>
>> This is due to meson trying to look for the 'pppd' binary in the build
>> system when it should not. If the build system does not contain pppd,
>> the build fails.
>>
>> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
>>
>
> Please send it against master, first, then we can ask for backports.
>

I have staged it with a bit of editing


> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#97663):
> https://lists.openembedded.org/g/openembedded-devel/message/97663
> Mute This Topic: https://lists.openembedded.org/mt/92020681/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

Patch

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb
index 6c665d53bb50..e3b1296a6bc4 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb
@@ -83,7 +83,7 @@  PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5"
 # consolekit is not picked by shlibs, so add it to RDEPENDS too
 PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit"
 PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info"
-PACKAGECONFIG[ppp] = "-Dppp=true,-Dppp=false,ppp,ppp"
+PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=/usr/sbin/pppd,-Dppp=false,ppp,ppp"
 PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq"
 PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss"
 PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf"