aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2018-10-21 17:34:25 +0300
committerKhem Raj <raj.khem@gmail.com>2018-10-21 08:10:42 -0700
commitb8a8e65e03b7c8ffc3def864ea7324c49e89ca88 (patch)
tree06a368f909f246741cfa2b49041228b7f38221fd /meta-oe
parent42ab6b30ec52a12a6b9ce1c661d126a66b9ded9c (diff)
downloadmeta-openembedded-b8a8e65e03b7c8ffc3def864ea7324c49e89ca88.tar.gz
meta-openembedded-b8a8e65e03b7c8ffc3def864ea7324c49e89ca88.tar.bz2
meta-openembedded-b8a8e65e03b7c8ffc3def864ea7324c49e89ca88.zip
libqmi: Add upstream fix for a 1.20.2 regression
Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch41
-rw-r--r--meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb1
2 files changed, 42 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch b/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-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-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb
index 3e08c4f9e..6811ce020 100644
--- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb
+++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb
@@ -12,6 +12,7 @@ DEPENDS = "glib-2.0 libgudev libmbim 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] = "584214476ab75c394160cb85fbccaa1d"