| Message ID | 20220707090653.2513017-3-adrian.freihofer@siemens.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | Armin Kuster |
| Headers | show |
| Series | networkmanager fixes | expand |
this was already backported and is in kirkstone-next. https://git.openembedded.org/meta-openembedded/commit/?h=kirkstone-next&id=7040cffbb06b2ae0a03b5353b2698a5c5ead9172 - armin On 7/7/22 02:06, Adrian Freihofer wrote: > From: Javier Viguera <javier.viguera@digi.com> > > 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> > Signed-off-by: Khem Raj <raj.khem@gmail.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 ab8fc136a..eb9e1553c 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" > +PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=${sbindir}/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 (#97767): https://lists.openembedded.org/g/openembedded-devel/message/97767 > Mute This Topic: https://lists.openembedded.org/mt/92224796/3616698 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [akuster808@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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 ab8fc136a..eb9e1553c 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" +PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=${sbindir}/pppd,-Dppp=false,ppp,ppp" PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf"