summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Viguera <javier.viguera@digi.com>2022-06-27 15:39:14 +0200
committerKhem Raj <raj.khem@gmail.com>2022-07-02 11:37:02 -0400
commit105288aa55a597b45931f1fa0498bee390316a09 (patch)
tree8b2994da93302c637d1f168e751ba0269f604313
parent1657160a1abd19be0d15aeb7b06b06e5d77cf1a7 (diff)
downloadmeta-openembedded-105288aa55a597b45931f1fa0498bee390316a09.tar.gz
networkmanager: fix build with enabled ppp
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>
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb
index d52ad6e6ce..c8fea5dbb7 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb
@@ -86,7 +86,7 @@ PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5"
86# consolekit is not picked by shlibs, so add it to RDEPENDS too 86# consolekit is not picked by shlibs, so add it to RDEPENDS too
87PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit" 87PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit"
88PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info" 88PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info"
89PACKAGECONFIG[ppp] = "-Dppp=true,-Dppp=false,ppp" 89PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=${sbindir}/pppd,-Dppp=false,ppp,ppp"
90PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" 90PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq"
91PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" 91PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss"
92PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf" 92PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf"