diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-connectivity/libqmi')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch | 41 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb (renamed from meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb) | 11 |
2 files changed, 49 insertions, 3 deletions
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch new file mode 100644 index 000000000..d230d6803 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch @@ -0,0 +1,41 @@ +From 8269f4d86927fbe19e78776a12736680fe9169b6 Mon Sep 17 00:00:00 2001 +From: Adrian Bunk <bunk@stusta.de> +Date: Mon, 1 Oct 2018 16:53:31 +0300 +Subject: [PATCH] qmi-network: Don't create invalid --wds-start-network when + APN is not set + +In 1.20.2 the warning for this was turned into an error. + +(cherry picked from commit 289d8ad6419895e2e1fba3d78a54a0db65da521d) +--- +Upstream-Status: Backport + + utils/qmi-network.in | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/utils/qmi-network.in b/utils/qmi-network.in +index bf7bed9..a9e5299 100755 +--- a/utils/qmi-network.in ++++ b/utils/qmi-network.in +@@ -334,11 +334,13 @@ start_network () + + setup_data_format + +- START_NETWORK_ARGS="apn='$APN'" +- if [ -n "$APN_USER" ]; then +- START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'" +- if [ -n "$APN_PASS" ]; then +- START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'" ++ if [ -n "$APN" ]; then ++ START_NETWORK_ARGS="apn='$APN'" ++ if [ -n "$APN_USER" ]; then ++ START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'" ++ if [ -n "$APN_PASS" ]; then ++ START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'" ++ fi + fi + fi + +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb index 9301cbd5e..f0bc81cc9 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb @@ -7,12 +7,17 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " -DEPENDS = "glib-2.0 libgudev libmbim glib-2.0-native" +DEPENDS = "glib-2.0 glib-2.0-native" inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch \ file://0001-Detect-clang.patch \ " -SRC_URI[md5sum] = "797e365521df76b77b067e6317618b41" -SRC_URI[sha256sum] = "21428cd3749c56246565123f707fee51238651a22c60bdc85ebce97388626eb4" +SRC_URI[md5sum] = "584214476ab75c394160cb85fbccaa1d" +SRC_URI[sha256sum] = "c73459ca8bfe1213f8047858d4946fc1f58e164d4f488a7a6904edee25e2ca44" + +PACKAGECONFIG ??= "udev mbim" +PACKAGECONFIG[udev] = ",--without-udev,libgudev" +PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" |